summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/battle_arena.h6
-rw-r--r--include/constants/battle_dome.h45
-rw-r--r--include/constants/battle_palace.h24
-rw-r--r--include/constants/battle_pike.h2
-rw-r--r--include/constants/battle_tower.h6
-rw-r--r--include/global.h16
6 files changed, 74 insertions, 25 deletions
diff --git a/include/constants/battle_arena.h b/include/constants/battle_arena.h
index f91a6f674..e04211115 100644
--- a/include/constants/battle_arena.h
+++ b/include/constants/battle_arena.h
@@ -5,11 +5,11 @@
#define BATTLE_ARENA_FUNC_GET_DATA 1
#define BATTLE_ARENA_FUNC_SET_DATA 2
#define BATTLE_ARENA_FUNC_SAVE 3
-#define BATTLE_ARENA_FUNC_SET_REWARD 4
-#define BATTLE_ARENA_FUNC_GIVE_REWARD 5
+#define BATTLE_ARENA_FUNC_SET_PRIZE 4
+#define BATTLE_ARENA_FUNC_GIVE_PRIZE 5
#define BATTLE_ARENA_FUNC_GET_TRAINER_NAME 6
-#define ARENA_DATA_REWARD 0
+#define ARENA_DATA_PRIZE 0
#define ARENA_DATA_WIN_STREAK 1
#define ARENA_DATA_WIN_STREAK_ACTIVE 2
diff --git a/include/constants/battle_dome.h b/include/constants/battle_dome.h
new file mode 100644
index 000000000..e0a008c75
--- /dev/null
+++ b/include/constants/battle_dome.h
@@ -0,0 +1,45 @@
+#ifndef GUARD_CONSTANTS_BATTLE_DOME_H
+#define GUARD_CONSTANTS_BATTLE_DOME_H
+
+#define BATTLE_DOME_FUNC_INIT 0
+#define BATTLE_DOME_FUNC_GET_DATA 1
+#define BATTLE_DOME_FUNC_SET_DATA 2
+#define BATTLE_DOME_FUNC_GET_ROUND_TEXT 3
+#define BATTLE_DOME_FUNC_GET_OPPONENT_NAME 4
+#define BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY 5
+#define BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO 6
+#define BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE 7
+#define BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE 8
+#define BATTLE_DOME_FUNC_SET_OPPONENT_ID 9
+#define BATTLE_DOME_FUNC_SET_OPPONENT_GFX 10
+#define BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE 11
+#define BATTLE_DOME_FUNC_RESOLVE_WINNERS 12
+#define BATTLE_DOME_FUNC_SAVE 13
+#define BATTLE_DOME_FUNC_INCREMENT_STREAK 14
+#define BATTLE_DOME_FUNC_SET_TRAINERS 15
+#define BATTLE_DOME_FUNC_RESET_SKETCH 16
+#define BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS 17
+#define BATTLE_DOME_FUNC_REDUCE_PARTY 18
+#define BATTLE_DOME_FUNC_COMPARE_SEEDS 19
+#define BATTLE_DOME_FUNC_GET_WINNER_NAME 20
+#define BATTLE_DOME_FUNC_21 21
+#define BATTLE_DOME_FUNC_INIT_TRAINERS 22
+
+#define DOME_DATA_STREAK 0
+#define DOME_DATA_STREAK_ACTIVE 1
+#define DOME_DATA_2 2
+#define DOME_DATA_3 3
+#define DOME_DATA_4 4
+#define DOME_DATA_5 5
+#define DOME_DATA_6 6
+#define DOME_DATA_7 7
+#define DOME_DATA_8 8
+#define DOME_DATA_9 9
+
+#define DOME_ROUND1 0
+#define DOME_ROUND2 1
+#define DOME_SEMIFINAL 2
+#define DOME_FINAL 3
+#define DOME_ROUNDS_COUNT 4
+
+#endif //GUARD_CONSTANTS_BATTLE_DOME_H
diff --git a/include/constants/battle_palace.h b/include/constants/battle_palace.h
index 027adf7c8..f5a76c871 100644
--- a/include/constants/battle_palace.h
+++ b/include/constants/battle_palace.h
@@ -1,15 +1,19 @@
#ifndef GUARD_CONSTANTS_BATTLE_PALACE_H
#define GUARD_CONSTANTS_BATTLE_PALACE_H
-#define BATTLE_PALACE_FUNC_0 0
-#define BATTLE_PALACE_FUNC_1 1
-#define BATTLE_PALACE_FUNC_2 2
-#define BATTLE_PALACE_FUNC_3 3
-#define BATTLE_PALACE_FUNC_4 4
-#define BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO 5
-#define BATTLE_PALACE_FUNC_6 6
-#define BATTLE_PALACE_FUNC_7 7
-#define BATTLE_PALACE_FUNC_8 8
-#define BATTLE_PALACE_FUNC_9 9
+#define BATTLE_PALACE_FUNC_INIT 0
+#define BATTLE_PALACE_FUNC_GET_DATA 1
+#define BATTLE_PALACE_FUNC_SET_DATA 2
+#define BATTLE_PALACE_FUNC_GET_COMMENT_ID 3
+#define BATTLE_PALACE_FUNC_SET_OPPONENT 4
+#define BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO 5
+#define BATTLE_PALACE_FUNC_INCREMENT_STREAK 6
+#define BATTLE_PALACE_FUNC_SAVE 7
+#define BATTLE_PALACE_FUNC_SET_PRIZE 8
+#define BATTLE_PALACE_FUNC_GIVE_PRIZE 9
+
+#define PALACE_DATA_PRIZE 0
+#define PALACE_DATA_STREAK 1
+#define PALACE_DATA_STREAK_ACTIVE 2
#endif //GUARD_CONSTANTS_BATTLE_PALACE_H
diff --git a/include/constants/battle_pike.h b/include/constants/battle_pike.h
index 4fb20550e..dabc9f540 100644
--- a/include/constants/battle_pike.h
+++ b/include/constants/battle_pike.h
@@ -35,7 +35,7 @@
#define BATTLE_PIKE_FUNC_GET_ROOM_TYPE 5
#define BATTLE_PIKE_FUNC_6 6
#define BATTLE_PIKE_FUNC_7 7
-#define BATTLE_PIKE_FUNC_8 8
+#define BATTLE_PIKE_FUNC_SAVE 8
#define BATTLE_PIKE_FUNC_NULL_9 9
#define BATTLE_PIKE_FUNC_NULL_10 10
#define BATTLE_PIKE_FUNC_GET_ROOM_STATUS 11
diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h
index 508656fab..126041a2c 100644
--- a/include/constants/battle_tower.h
+++ b/include/constants/battle_tower.h
@@ -1,9 +1,9 @@
#ifndef GUARD_CONSTANTS_BATTLE_TOWER_H
#define GUARD_CONSTANTS_BATTLE_TOWER_H
-#define BATTLE_TOWER_FUNC_0 0
-#define BATTLE_TOWER_FUNC_1 1
-#define BATTLE_TOWER_FUNC_2 2
+#define BATTLE_TOWER_FUNC_INIT 0
+#define BATTLE_TOWER_FUNC_GET_DATA 1
+#define BATTLE_TOWER_FUNC_SET_DATA 2
#define BATTLE_TOWER_FUNC_CHOOSE_TRAINER 3
#define BATTLE_TOWER_FUNC_4 4
#define BATTLE_TOWER_FUNC_GIVE_RIBBONS 5
diff --git a/include/global.h b/include/global.h
index 61186d084..557bdc1c5 100644
--- a/include/global.h
+++ b/include/global.h
@@ -363,18 +363,18 @@ struct BattleFrontier
/*0xD1C*/ u16 domeTotalChampionships[2][2];
/*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT];
/*0xD64*/ u16 domeMonIds[DOME_TOURNAMENT_TRAINERS_COUNT][FRONTIER_PARTY_SIZE];
- /*0xDC4*/ u16 field_DC4;
- /*0xDC6*/ u16 field_DC6;
+ /*0xDC4*/ u16 unused_DC4;
+ /*0xDC6*/ u16 palacePrize;
/*0xDC8*/ u16 palaceWinStreaks[2][2];
/*0xDD0*/ u16 palaceRecordWinStreaks[2][2];
- /*0xDD8*/ u16 arenaRewardItem;
+ /*0xDD8*/ u16 arenaPrize;
/*0xDDA*/ u16 arenaWinStreaks[2];
/*0xDDE*/ u16 arenaRecordStreaks[2];
/*0xDE2*/ u16 factoryWinStreaks[2][2];
/*0xDEA*/ u16 factoryRecordWinStreaks[2][2];
/*0xDF6*/ u16 factoryRentsCount[2][2];
/*0xDFA*/ u16 factoryRecordRentsCount[2][2];
- /*0xE02*/ u16 field_E02;
+ /*0xE02*/ u16 pikePrize;
/*0xE04*/ u16 pikeWinStreaks[2];
/*0xE08*/ u16 pikeRecordStreaks[2];
/*0xE0C*/ u16 pikeTotalStreaks[2];
@@ -382,16 +382,16 @@ struct BattleFrontier
/*0xE10*/ u8 pikeHintedRoomType:4;
/*0xE10*/ u8 pikeHealingRoomsDisabled:1;
/*0xE12*/ u16 pikeHeldItemsBackup[FRONTIER_PARTY_SIZE];
- /*0xE18*/ u16 pyramidRewardItem;
+ /*0xE18*/ u16 pyramidPrize;
/*0xE1A*/ u16 pyramidWinStreaks[2];
/*0xE1E*/ u16 pyramidRecordStreaks[2];
/*0xE22*/ u16 pyramidRandoms[4];
/*0xE2A*/ u8 pyramidTrainerFlags;
/*0xE2C*/ struct PyramidBag pyramidBag;
/*0xE68*/ u8 pyramidLightRadius;
- /*0xE6A*/ u16 field_E6A;
- /*0xE6C*/ u16 field_E6C;
- /*0xE6E*/ u16 field_E6E;
+ /*0xE6A*/ u16 verdanturfTentPrize;
+ /*0xE6C*/ u16 fallarborTentPrize;
+ /*0xE6E*/ u16 slateportTentPrize;
/*0xE70*/ struct RentalMon rentalMons[PARTY_SIZE];
/*0xEB8*/ u16 battlePoints;
/*0xEBA*/ u16 cardBattlePoints;