diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 35 | ||||
| -rw-r--r-- | include/global.h | 12 | ||||
| -rw-r--r-- | include/new_game.h | 8 | ||||
| -rw-r--r-- | include/rom4.h | 10 |
4 files changed, 50 insertions, 15 deletions
diff --git a/include/battle.h b/include/battle.h index 14cbb3a1b..2f52fd986 100644 --- a/include/battle.h +++ b/include/battle.h @@ -32,4 +32,39 @@ struct Trainer /*0x24*/ void *party; }; +struct AI_ThinkingStruct /* 0x2016800 */ +{ +/* 0x00 */ u8 unk0; +/* 0x01 */ u8 moveConsidered; +/* 0x02 */ u16 unk2; +/* 0x04 */ s8 score[4]; // score? +/* 0x08 */ u32 unk8; +/* 0x0C */ u32 aiFlags; +/* 0x10 */ u8 unk10; +/* 0x11 */ u8 aiLogicId; +/* 0x12 */ u8 filler12[6]; +/* 0x18 */ u8 unk18[4]; +}; + +struct SmallBattleStruct1 +{ + u8 unk1; + u8 unk2; + u8 unk3; + u8 unk4; +}; + +struct BattleStruct /* 0x2000000 */ +{ + u8 filler0[0x1601C]; + struct SmallBattleStruct1 unk; + u8 filler1[0xAB]; // 0x2016020 + /* 0x160CB */ u8 linkPlayerIndex; + u8 filler2[0x734]; + struct AI_ThinkingStruct ai; +}; + +extern struct BattleStruct unk_2000000; +extern struct AI_ThinkingStruct gAIThinkingSpace; + #endif // GUARD_BATTLE_H diff --git a/include/global.h b/include/global.h index 30f935521..846673dd7 100644 --- a/include/global.h +++ b/include/global.h @@ -397,12 +397,12 @@ struct SaveBlock2 /* 0x02024EA4 */ /*0x11*/ u8 playTimeSeconds; /*0x12*/ u8 playTimeVBlanks; /*0x13*/ u8 optionsButtonMode; // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A] - u16 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST] - u16 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes - u16 optionsSound:1; // OPTIONS_SOUND_[MONO/STEREO] - u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET] - u16 optionsBattleSceneOff:1; // whether battle animations are disabled - u16 regionMapZoom:1; // whether the map is zoomed in + u16 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST] + u16 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes + u16 optionsSound:1; // OPTIONS_SOUND_[MONO/STEREO] + u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET] + u16 optionsBattleSceneOff:1; // whether battle animations are disabled + u16 regionMapZoom:1; // whether the map is zoomed in /*0x18*/ struct Pokedex pokedex; /*0x90*/ u8 filler_90[0x8]; /*0x98*/ struct Time localTimeOffset; diff --git a/include/new_game.h b/include/new_game.h index dce42bf52..62e83f8f0 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -1,14 +1,14 @@ #ifndef GUARD_NEW_GAME_H #define GUARD_NEW_GAME_H -void write_word_to_mem(u32 a1, u8 *a2); -void sub_8052D10(u8 *a1, u8 *a2); +void write_word_to_mem(u32 var, u8 *dataPtr); +void copy_word_to_mem(u8 *copyTo, u8 *copyFrom); void set_player_trainer_id(void); void SetDefaultOptions(void); -void sub_8052D78(void); +void ClearPokedexFlags(void); void sub_8052DA8(void); void sub_8052DE4(void); -void sub_8052E04(void); +void WarpToTruck(void); void ClearSav2(void); void sub_8052E4C(void); void NewGameInitData(void); diff --git a/include/rom4.h b/include/rom4.h index a182a0bff..0fe80a82b 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -22,10 +22,10 @@ struct LinkPlayerMapObject { // sub_8053014 void sub_8053050(void); // sub_805308C -void sub_80530AC(void); -void sav12_xor_increment(u8 index); -u32 sub_8053108(u8 index); -// sav12_xor_set +void ResetGameStats(void); +void IncrementGameStat(u8 index); +u32 GetGameStat(u8 index); +// SetGameStat // sub_8053154 // sub_8053198 void update_saveblock1_field_object_coords(u8, s16, s16); @@ -117,7 +117,7 @@ void c2_overworld(void); // sub_80543DC // sub_80543E8 void CB2_NewGame(void); -void c2_whiteout(void); +void CB2_WhiteOut(void); void CB2_LoadMap(void); void CB2_LoadMap2(void); // sub_8054534 |