diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-04-14 13:22:37 +0200 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-04-14 10:15:18 -0500 |
| commit | dc764698c9026f79fe4a9b3891a5a5b373decd55 (patch) | |
| tree | f6430a1961e33fcaea225cdb01969625c0609dcf /include | |
| parent | 065c60544d4d059fdc9aa1bc50f1375a73782427 (diff) | |
Use implicilt berry indexes in arrays
Diffstat (limited to 'include')
| -rw-r--r-- | include/berry.h | 6 | ||||
| -rw-r--r-- | include/event_object_movement.h | 4 | ||||
| -rw-r--r-- | include/event_scripts.h | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/include/berry.h b/include/berry.h index ee581b9c1..9ff18e198 100644 --- a/include/berry.h +++ b/include/berry.h @@ -34,12 +34,6 @@ enum BERRY_STAGE_SPARKLING = 0xFF, }; -#define NUM_BERRIES 44 - -extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; -extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; -extern const u8 *const gBerryTreePaletteSlotTablePointers[]; - void ClearEnigmaBerries(void); void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 4f3f99cd1..93f73e635 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -64,6 +64,10 @@ extern const struct OamData gEventObjectBaseOam_32x32; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const u8 gReflectionEffectPaletteMap[]; +extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; +extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; +extern const u8 *const gBerryTreePaletteSlotTablePointers[]; + void ResetEventObjects(void); u8 GetMoveDirectionAnimNum(u8); u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); diff --git a/include/event_scripts.h b/include/event_scripts.h index da96d29d8..fc0b3cde0 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -18,6 +18,7 @@ extern const u8 EventScript_TryDoRematchBattle[]; extern const u8 SecretBase_EventScript_DollInteract[]; extern const u8 SecretBase_EventScript_CushionInteract[]; +extern const u8 BerryTreeScript[]; extern const u8 gTVBravoTrainerText00[]; extern const u8 gTVBravoTrainerText01[]; |