diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 00:46:02 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 00:46:02 +0100 |
commit | 4fb463377c0d4e46deda797af2eb0f661d26465b (patch) | |
tree | 3e280422860acf5c9a197a39854f941fe43b55b8 /include | |
parent | a4235c9ff85cc54f8cc1f4a832f19e64eda74b59 (diff) |
Start battle pike
Diffstat (limited to 'include')
-rw-r--r-- | include/battle_factory.h | 2 | ||||
-rw-r--r-- | include/fieldmap.h | 1 | ||||
-rw-r--r-- | include/global.h | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/battle_factory.h b/include/battle_factory.h index b2d3fc10f..2db041b06 100644 --- a/include/battle_factory.h +++ b/include/battle_factory.h @@ -9,4 +9,4 @@ u8 sub_81A6F70(u8 battleMode, u8 lvlMode); u32 GetAiScriptsInBattleFactory(void); void SetMonMoveAvoidReturn(struct Pokemon *mon, u16 moveArg, u8 moveSlot); -#endif //GUARD_BATTLE_FACTORY_H +#endif // GUARD_BATTLE_FACTORY_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 8287229ed..a50c79b43 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -35,6 +35,7 @@ bool8 sub_8088BF0(u16*, u16, u8); struct MapConnection *sub_8088950(u8 direction, int x, int y); bool8 sub_80889A8(u8 direction, int x, int y, struct MapConnection *connection); bool8 sub_8088A0C(int x, int src_width, int dest_width, int offset); +void save_serialize_map(void); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); diff --git a/include/global.h b/include/global.h index c2b139e7a..fd8284094 100644 --- a/include/global.h +++ b/include/global.h @@ -438,7 +438,10 @@ struct BattleFrontier /*0xE04*/ u16 pikeWinStreaks[2]; /*0xE08*/ u16 pikeRecordStreaks[2]; /*0xE0C*/ u16 pikeTotalStreaks[2]; - /*0xE10*/ u16 field_E10[5]; + /*0xE10*/ u16 field_E10_1:3; + /*0xE10*/ u16 field_E10_2:4; + /*0xE10*/ u16 field_E10_3:1; + /*0xE10*/ u8 field_E10[9]; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; /*0xE1E*/ u16 field_E1F[5]; |