summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-01-01 17:41:34 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-01-01 17:41:34 +0100
commitba176dfe0729e8c8c46a8f79c2f1b6e732ee13c8 (patch)
tree41aff22ba65727ac92f94da353a46e869e7d4a8a /include
parentad277a69dd468e25fa47585945c3df86be828ea7 (diff)
start working on battle transition
Diffstat (limited to 'include')
-rw-r--r--include/battle_transition.h2
-rw-r--r--include/overworld.h2
-rw-r--r--include/unk_transition.h13
3 files changed, 17 insertions, 0 deletions
diff --git a/include/battle_transition.h b/include/battle_transition.h
index 84b5e37ec..108b6232b 100644
--- a/include/battle_transition.h
+++ b/include/battle_transition.h
@@ -1,6 +1,7 @@
#ifndef GUARD_BATTLE_TRANSITION_H
#define GUARD_BATTLE_TRANSITION_H
+void TestBattleTransition(u8 transitionId);
void sub_8149DFC(u8 a1);
void BattleTransition_StartOnField(u8 transitionID);
void BattleTransition_Start(u8 transitionID);
@@ -52,5 +53,6 @@ bool8 IsBattleTransitionDone(void);
#define B_TRANSITION_39 39
#define B_TRANSITION_40 40
#define B_TRANSITION_41 41
+#define B_TRANSITION_COUNT 42
#endif // GUARD_BATTLE_TRANSITION_H
diff --git a/include/overworld.h b/include/overworld.h
index a5fba0c10..9f0f80a23 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -71,4 +71,6 @@ void mapldr_default(void);
void IncrementGameStat(u8);
u32 GetGameStat(u8);
+void CB2_OverworldBasic(void);
+
#endif //GUARD_ROM4_H
diff --git a/include/unk_transition.h b/include/unk_transition.h
new file mode 100644
index 000000000..ef7b33ed7
--- /dev/null
+++ b/include/unk_transition.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_UNK_TRANSITION_H
+#define GUARD_UNK_TRANSITION_H
+
+void Phase2Task_Transition_34(u8 taskId);
+void Phase2Task_Transition_35(u8 taskId);
+void Phase2Task_Transition_36(u8 taskId);
+void Phase2Task_Transition_37(u8 taskId);
+void Phase2Task_Transition_38(u8 taskId);
+void Phase2Task_Transition_39(u8 taskId);
+void Phase2Task_Transition_40(u8 taskId);
+void Phase2Task_Transition_41(u8 taskId);
+
+#endif // GUARD_UNK_TRANSITION_H