diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-21 17:31:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-21 17:31:28 -0500 |
| commit | 68e47a6fa0b56451223c22dc9a759534c988db5b (patch) | |
| tree | 75ce6402ba5af694c533f2aa1ae7e4b92a63725f /src/field_map_obj.c | |
| parent | c1a82f1aabc93e5b3c5f2729f70f4a11fc8a5748 (diff) | |
| parent | 4b3cdd869264ed2705558a7c74d521e2a290a86e (diff) | |
Merge pull request #370 from drifloony/ram_variables
map out ram variables
Diffstat (limited to 'src/field_map_obj.c')
| -rw-r--r-- | src/field_map_obj.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c index d94c97ff3..f60b1b233 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -1902,8 +1902,11 @@ extern void CameraObjectReset1(void); extern struct LinkPlayerMapObject gLinkPlayerMapObjects[]; extern u8 gReservedSpritePaletteCount; extern struct Camera gUnknown_0202E844; -extern u8 gUnknown_030005A4; -extern u16 gUnknown_030005A6; + +static u8 gUnknown_030005A4; +static u16 gUnknown_030005A6; + +struct MapObject gMapObjects[16]; void npc_clear_ids_and_state(struct MapObject *mapObj) { @@ -3881,8 +3884,6 @@ u8 sub_805D314(struct MapObject *mapObject, struct Sprite *sprite) return gUnknown_083752D0[sprite->data1](mapObject, sprite); } -extern u32 gUnknown_0202FF84[]; - u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sprite) { u8 berryTreeStage; |