mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

Big cleanup (#775)

Browse source 
* Adult and child2 macros OK

* ICHAIN cleanup

* almost all overlay data

* format.sh

* func_8002FBAC NON_EQUIVALENT

* PR fixes (MZXrules)

* fix

* change //@ bug to //! @bug

* merge master and missed a //@bug

* fix ruto

* some more cleanup (#2)

* more `! @bug` formatting cleanup

* parenthesis cleanup

* hex naviEnemyId

* run formatter

* replace `IS_NOT_` macros with `!IS_`

* run formatter

* run formatter

* PR fixes (fig)

* Missed something

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103 2021-08-21 19:12:57 -04:00 • committed by GitHub
parent 17c79a8f60
commit 556cdad7eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
177 changed files with 902 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/overlays/ovl_map_mark_data/z_map_mark_data.c
View file

@ -1,6 +1,6 @@
#include "global.h"
MapMarkData sMapMarkDekuTree[] = {
static MapMarkData sMapMarkDekuTree[] = {
// Deku Tree minimap 0
{
{ MAP_MARK_CHEST,
@ -87,7 +87,7 @@ MapMarkData sMapMarkDekuTree[] = {
},
};
MapMarkData sMapMarkDodongosCavern[] = {
static MapMarkData sMapMarkDodongosCavern[] = {
// Dodongo's Cavern minimap 0
{
{ MAP_MARK_CHEST,
@ -197,7 +197,7 @@ MapMarkData sMapMarkDodongosCavern[] = {
},
};
MapMarkData sMapMarkJabuJabuBelly[] = {
static MapMarkData sMapMarkJabuJabuBelly[] = {
// Jabu-Jabu's Belly minimap 0
{
{ MAP_MARK_CHEST,
@ -308,7 +308,7 @@ MapMarkData sMapMarkJabuJabuBelly[] = {
},
};
MapMarkData sMapMarkForestTemple[] = {
static MapMarkData sMapMarkForestTemple[] = {
// Forest Temple minimap 0
{
{ MAP_MARK_NONE, 0, { 0 } },
@ -485,7 +485,7 @@ MapMarkData sMapMarkForestTemple[] = {
},
};
MapMarkData sMapMarkFireTemple[] = {
static MapMarkData sMapMarkFireTemple[] = {
// Fire Temple minimap 0
{
{ MAP_MARK_NONE, 0, { 0 } },
@ -687,7 +687,7 @@ MapMarkData sMapMarkFireTemple[] = {
},
};
MapMarkData sMapMarkWaterTemple[] = {
static MapMarkData sMapMarkWaterTemple[] = {
// Water Temple minimap 0
{
{ MAP_MARK_NONE, 0, { 0 } },
@ -896,7 +896,7 @@ MapMarkData sMapMarkWaterTemple[] = {
},
};
MapMarkData sMapMarkSpiritTemple[] = {
static MapMarkData sMapMarkSpiritTemple[] = {
// Spirit Temple minimap 0
{
{ MAP_MARK_CHEST,
@ -1112,7 +1112,7 @@ MapMarkData sMapMarkSpiritTemple[] = {
},
};
MapMarkData sMapMarkShadowTemple[] = {
static MapMarkData sMapMarkShadowTemple[] = {
// Shadow Temple minimap 0
{
{ MAP_MARK_NONE, 0, { 0 } },
@ -1314,7 +1314,7 @@ MapMarkData sMapMarkShadowTemple[] = {
},
};
MapMarkData sMapMarkBottomWell[] = {
static MapMarkData sMapMarkBottomWell[] = {
// Bottom of the Well minimap 0
{
{ MAP_MARK_CHEST,
@ -1372,7 +1372,7 @@ MapMarkData sMapMarkBottomWell[] = {
},
};
MapMarkData sMapMarkIceCavern[] = {
static MapMarkData sMapMarkIceCavern[] = {
// Ice Cavern minimap 0
{
{ MAP_MARK_NONE, 0, { 0 } },