summaryrefslogtreecommitdiff
path: root/include/asm.inc.h
diff options
context:
space:
mode:
authorMarijn van der Werf <marijn.vanderwerf@gmail.com>2017-05-08 22:06:49 +0200
committerYamaArashi <YamaArashi@users.noreply.github.com>2017-05-08 14:19:49 -0700
commit00c64ddd66d1cf733f71d4e2104ae9f12108486d (patch)
tree1f87eb353aa8891b218e021fc882f131695a62c7 /include/asm.inc.h
parent3cc8c2044525a483ba80f8730f8f6376e5f6c935 (diff)
Decompile sub_803037C
Diffstat (limited to 'include/asm.inc.h')
-rw-r--r--include/asm.inc.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h
index da5c02113..582c3ebb7 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -10,20 +10,23 @@ void sub_80157C4(u8 index);
u8 sub_8015A98(u8, u8, u8);
u8 sub_8018324(u8, u8, u8, u8, u16);
+// asm/battle_5.o
+void sub_802C098();
+void sub_802E3E4(u8, int);
+void nullsub_8(u8);
+
// asm/battle_7.o
void sub_8032AA8(u8 index, int i);
// src/pokemon_3.o
u16 SpeciesToNationalPokedexNum(u16);
-
-// asm/pokemon_3.o
void DrawSpindaSpots(u16, u32, u8 *, u8);
u8 sub_803FC58(u16);
void AdjustFriendship(struct Pokemon *, u8);
void sub_80408BC();
void current_map_music_set__default_for_battle(u16);
-// asm/util.o
+// src/util.o
void StoreWordInTwoHalfwords(u16 *, u32);
void LoadWordFromTwoHalfwords(u16 *, u32 *);
@@ -157,7 +160,7 @@ void sub_806FA18(u8 taskId);
// src/party_menu.o
void sub_806E834();
-// asm/rom_8077ABC.o
+// src/rom_8077ABC.o
u8 battle_side_get_owner(u8);
u8 battle_get_per_side_status(u8);
u8 battle_get_side_with_given_state(u8);
@@ -211,6 +214,9 @@ void sub_8089A70(void);
void sub_808A004();
void sub_808AB90(void);
+// asm/rom_8094928.o
+u8 pokemon_order_func(u8);
+
// asm/pokemon_storage_system.o
void sub_80961D8(void);
@@ -354,7 +360,7 @@ s16 sub_810CAE4(u8, struct Pokeblock *);
// asm/fldeff_flash.o
void sub_810CC80(void);
-// asm/time_events.o
+// src/time_events.o
u8 IsMirageIslandPresent(void);
// asm/field_specials.o
@@ -374,6 +380,10 @@ void sub_811AABC(u8);
void sub_811AAD8(u8);
u8 sub_811AAE8(void);
+// asm/battle_message.o
+void get_battle_strings_(u8 *);
+void sub_8120FFC(const u8 *, u8 *);
+
// src/mystery_event_script.o
u32 sub_812613C(u8 *);
void sub_8126160(u8);