diff options
| author | YamaArashi <shadow962@live.com> | 2017-05-08 13:55:31 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-05-08 15:47:45 -0700 |
| commit | e6868bbdb2b9a0f00085029817d3a451781973cd (patch) | |
| tree | a67f4e64f6850944f5b25c94df415923b1c325a5 /include | |
| parent | f6e3598f5efbda472c6605c94b5597d1196ea619 (diff) | |
decompile roamer.s
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.inc.h | 8 | ||||
| -rw-r--r-- | include/global.h | 4 | ||||
| -rw-r--r-- | include/roamer.h | 11 |
3 files changed, 13 insertions, 10 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 23156e756..eb3cec985 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -416,14 +416,6 @@ u8 IsThereStorageSpaceForDecoration(u8); u8 sub_8134074(u8); s8 sub_81340A8(u8); -// asm/roamer.o -void sub_81341F8(void); -void sub_813420C(void); -void mapnumbers_history_shift_sav1_0_2_4_out(void); -void sub_8134348(void); -void sub_8134394(); -u8 sub_81344CC(void); - // asm/battle_tower.o void sub_8134AC0(void *); diff --git a/include/global.h b/include/global.h index ce17d78a1..ca5335697 100644 --- a/include/global.h +++ b/include/global.h @@ -156,7 +156,8 @@ struct Roamer /*0x10*/ u8 cute; /*0x11*/ u8 smart; /*0x12*/ u8 tough; - /*0x13*/ u8 active; + /*0x13*/ bool8 active; + /*0x14*/ u8 filler[0x8]; }; struct RamScriptData @@ -408,7 +409,6 @@ struct SaveBlock1 /* 0x02025734 */ /*0x3110*/ u8 giftRibbons[7]; /*0x3117*/ u8 filler_311B[0x2D]; /*0x3144*/ struct Roamer roamer; - /*0x3158*/ u8 filler_3158[0x8]; /*0x3160*/ struct EnigmaBerry enigmaBerry; /*0x3690*/ struct RamScript ramScript; /*0x3A7C*/ u8 filler_3A7C[0x10]; diff --git a/include/roamer.h b/include/roamer.h new file mode 100644 index 000000000..9d5f3c4ed --- /dev/null +++ b/include/roamer.h @@ -0,0 +1,11 @@ +#ifndef GUARD_ROAMER_H +#define GUARD_ROAMER_H + +void ClearRoamerData(void); +void ClearRoamerLocationData(void); +void UpdateLocationHistoryForRoamer(void); +void RoamerMoveToOtherLocationSet(void); +void RoamerMove(); +u8 TryStartRoamerEncounter(void); + +#endif |