diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-13 13:15:23 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-13 13:15:23 +0100 |
| commit | c0bc01d30150dae355b47bb3f42b71a7c00d0aec (patch) | |
| tree | 4b1d9c57f8d9e7c3c3660d796ece46e8fe431c52 /include | |
| parent | 11a49a7f0220ebbdfa43ebaa9158906cf38f6a4d (diff) | |
Move some vars to C
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/battle.h | 2 | ||||
| -rw-r--r-- | include/global.h | 4 | ||||
| -rw-r--r-- | include/strings.h | 12 | ||||
| -rw-r--r-- | include/trainer_hill.h | 6 |
4 files changed, 17 insertions, 7 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h index acb0f6689..346d5d9ea 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -174,7 +174,7 @@ #define HITMARKER_GRUDGE 0x01000000 #define HITMARKER_OBEYS 0x02000000 #define HITMARKER_x4000000 0x04000000 -#define HITMARKER_x8000000 0x08000000 +#define HITMARKER_CHARGING 0x08000000 #define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C) #define HITMARKER_UNK(battler) (0x10000000 << battler) diff --git a/include/global.h b/include/global.h index d6a57320d..f45d36f68 100644 --- a/include/global.h +++ b/include/global.h @@ -805,7 +805,7 @@ struct SaveTrainerHill /*0x3D6E*/ u16 field_3D6E_0d:1; // 8 /*0x3D6E*/ u16 field_3D6E_0e:1; // x10 /*0x3D6E*/ u16 field_3D6E_0f:1; // x20 - /*0x3D6E*/ u16 field_3D6E_1:2; // x40, x80 = xC0 + /*0x3D6E*/ u16 tag:2; // x40, x80 = xC0 }; struct SaveBlock1 @@ -886,7 +886,7 @@ struct SaveBlock1 /*0x31DC*/ struct Roamer roamer; /*0x31F8*/ struct EnigmaBerry enigmaBerry; /*0x322C*/ u8 field_322C[1260]; - /*0x3718*/ u32 field_3718[4]; + /*0x3718*/ u32 trainerHillTimes[4]; /*0x3728*/ struct RamScript ramScript; /*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B24*/ u8 seen2[DEX_FLAGS_NO]; diff --git a/include/strings.h b/include/strings.h index d16dd21f8..65f81024e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1231,10 +1231,14 @@ extern const u8 gText_MtPyre[]; extern const u8 gText_SkyPillar[]; extern const u8 gText_DontRemember[]; extern const u8 gUnknown_085EB597[]; -extern const u8 gUnknown_085EB32D[]; -extern const u8 gUnknown_085EB33E[]; -extern const u8 gUnknown_085EB350[]; -extern const u8 gUnknown_085EB361[]; +extern const u8 gText_NormalTagMatch[]; +extern const u8 gText_VarietyTagMatch[]; +extern const u8 gText_UniqueTagMatch[]; +extern const u8 gText_ExpertTagMatch[]; +extern const u8 gText_TrainerHill1F[]; +extern const u8 gText_TrainerHill2F[]; +extern const u8 gText_TrainerHill3F[]; +extern const u8 gText_TrainerHill4F[]; extern const u8 OldaleTown_PokemonCenter_2F_Text_277F1B[]; extern const u8 OldaleTown_PokemonCenter_2F_Text_277F5A[]; diff --git a/include/trainer_hill.h b/include/trainer_hill.h new file mode 100644 index 000000000..5e9947c85 --- /dev/null +++ b/include/trainer_hill.h @@ -0,0 +1,6 @@ +#ifndef GUARD_TRAINER_HILL_H +#define GUARD_TRAINER_HILL_H + +extern u32 *gUnknown_0203CF5C; + +#endif // GUARD_TRAINER_HILL_H |