diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 25 | ||||
| -rw-r--r-- | include/battle_tower.h | 2 | ||||
| -rw-r--r-- | include/berry_blender.h | 2 | ||||
| -rw-r--r-- | include/global.h | 5 | ||||
| -rw-r--r-- | include/mossdeep_gym.h | 9 | ||||
| -rw-r--r-- | include/new_game.h | 3 | ||||
| -rw-r--r-- | include/overworld.h | 4 | ||||
| -rw-r--r-- | include/pokedex.h | 3 | ||||
| -rw-r--r-- | include/start_menu.h | 2 | ||||
| -rw-r--r-- | include/string_util.h | 5 |
10 files changed, 39 insertions, 21 deletions
diff --git a/include/battle.h b/include/battle.h index 70b1856a8..c4a0fe9a5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -664,6 +664,18 @@ struct MonSpritesGfx }; // All battle variables are declared in battle_main.c +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG3_X; +extern u16 gBattle_BG3_Y; +extern u16 gBattle_WIN0H; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1H; +extern u16 gBattle_WIN1V; extern u8 gDisplayedStringBattle[300]; extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; @@ -769,17 +781,4 @@ extern u8 gMultiUsePlayerCursor; extern u8 gNumberOfMovesToChoose; extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; -extern u16 gBattle_WIN0H; -extern u16 gBattle_WIN0V; -extern u16 gBattle_WIN1H; -extern u16 gBattle_WIN1V; -extern u16 gBattle_BG0_X; -extern u16 gBattle_BG0_Y; -extern u16 gBattle_BG1_X; -extern u16 gBattle_BG1_Y; -extern u16 gBattle_BG2_X; -extern u16 gBattle_BG2_Y; -extern u16 gBattle_BG3_X; -extern u16 gBattle_BG3_Y; - #endif // GUARD_BATTLE_H diff --git a/include/battle_tower.h b/include/battle_tower.h index 90c22c982..b6adcec0c 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -38,6 +38,8 @@ extern const u8 gTowerMaleTrainerGfxIds[30]; extern const u8 gTowerFemaleFacilityClasses[20]; extern const u8 gTowerFemaleTrainerGfxIds[20]; +extern u16 gUnknown_03006298[]; + extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; diff --git a/include/berry_blender.h b/include/berry_blender.h index fb62e3fa3..e8f7bb83d 100644 --- a/include/berry_blender.h +++ b/include/berry_blender.h @@ -1,6 +1,8 @@ #ifndef GUARD_BERRY_BLENDER_H #define GUARD_BERRY_BLENDER_H +extern u8 gInGameOpponentsNo; + void DoBerryBlending(void); u16 GetBlenderArrowPosition(void); void ShowBerryBlenderRecordWindow(void); diff --git a/include/global.h b/include/global.h index 3da68185f..cc8df049f 100644 --- a/include/global.h +++ b/include/global.h @@ -61,11 +61,6 @@ #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) >= (b) ? (a) : (b)) -extern u8 gStringVar1[]; -extern u8 gStringVar2[]; -extern u8 gStringVar3[]; -extern u8 gStringVar4[]; - // There are many quirks in the source code which have overarching behavioral differences from // a number of other files. For example, diploma.c seems to declare rodata before each use while // other files declare out of order and must be at the beginning. There are also a number of diff --git a/include/mossdeep_gym.h b/include/mossdeep_gym.h new file mode 100644 index 000000000..c16730094 --- /dev/null +++ b/include/mossdeep_gym.h @@ -0,0 +1,9 @@ +#ifndef GUARD_MOSSDEEP_GYM_H +#define GUARD_MOSSDEEP_GYM_H + +void InitMossdeepGymTiles(bool8 arg0); +void FinishMossdeepGymTiles(void); +u16 MossdeepGym_MoveEvents(u8 arg0); +void MossdeepGym_TurnEvents(void); + +#endif // GUARD_MOSSDEEP_GYM_H diff --git a/include/new_game.h b/include/new_game.h index 7032647ea..f4d69cbce 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -1,6 +1,9 @@ #ifndef GUARD_NEW_GAME_H #define GUARD_NEW_GAME_H +extern bool8 gDifferentSaveFile; +extern bool8 gUnknown_020322D5; // The purpose of this variable is unknown as it's read only 3 times(2 times in contest.c and 1 time in berry_blender.c), never written to. + void SetTrainerId(u32 trainerId, u8 *dst); u32 GetTrainerId(u8 *trainerId); void CopyTrainerId(u8 *dst, u8 *src); diff --git a/include/overworld.h b/include/overworld.h index 3e9d42a22..6f7801905 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -22,9 +22,9 @@ extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; extern u16 *gBGTilemapBuffers3; - +extern u16 gUnknown_03005DA8; extern void (*gFieldCallback)(void); - +extern bool8 (*gFieldCallback2)(void); extern u8 gUnknown_03005DB4; extern u8 gFieldLinkPlayerCount; diff --git a/include/pokedex.h b/include/pokedex.h index f9e236588..11e39997c 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -1,6 +1,9 @@ #ifndef GUARD_POKEDEX_H #define GUARD_POKEDEX_H +extern u8 gUnknown_030060B0; +extern void (*gUnknown_030060B4)(void); + void ResetPokedex(void); void CopyMonCategoryText(u32 species, u8 *dst); u16 GetPokedexHeightWeight(u16 dexNum, u8 data); diff --git a/include/start_menu.h b/include/start_menu.h index 5551b149d..2fdb3e652 100644 --- a/include/start_menu.h +++ b/include/start_menu.h @@ -1,7 +1,7 @@ #ifndef GUARD_START_MENU_H #define GUARD_START_MENU_H -extern bool8 (*gMenuCallback)(void); // Defined in sym_common.txt +extern bool8 (*gMenuCallback)(void); void sub_809FA18(void); void sub_809FA34(u8 taskId); diff --git a/include/string_util.h b/include/string_util.h index 7b685fcea..67149bca0 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -1,6 +1,11 @@ #ifndef GUARD_STRING_UTIL_H #define GUARD_STRING_UTIL_H +extern u8 gStringVar1[]; +extern u8 gStringVar2[]; +extern u8 gStringVar3[]; +extern u8 gStringVar4[]; + enum StringConvertMode { STR_CONV_MODE_LEFT_ALIGN, |