diff --git a/include/droptables.h b/include/droptables.h index 63213f98..1d7b2bcf 100644 --- a/include/droptables.h +++ b/include/droptables.h @@ -14,9 +14,9 @@ typedef union { s16 bombs; s16 arrows; s16 mysteriousShells; - s16 kinstoneGreen; - s16 kinstoneBlue; s16 kinstoneRed; + s16 kinstoneBlue; + s16 kinstoneGreen; s16 none2; s16 none3; s16 none4; diff --git a/src/droptables.c b/src/droptables.c index d239a80d..aafd0879 100644 --- a/src/droptables.c +++ b/src/droptables.c @@ -12,9 +12,9 @@ const Droptable gEnemyDroptables[] = { .bombs = -999, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -30,9 +30,9 @@ const Droptable gEnemyDroptables[] = { .bombs = -999, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -48,9 +48,9 @@ const Droptable gEnemyDroptables[] = { .bombs = -999, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -66,9 +66,9 @@ const Droptable gEnemyDroptables[] = { .bombs = -999, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -84,9 +84,9 @@ const Droptable gEnemyDroptables[] = { .bombs = -999, .arrows = -999, .mysteriousShells = 5, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -102,9 +102,9 @@ const Droptable gEnemyDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = -999, .none3 = 0, .none4 = 0, @@ -120,9 +120,9 @@ const Droptable gEnemyDroptables[] = { .bombs = 1, .arrows = 1, .mysteriousShells = 0, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -138,9 +138,9 @@ const Droptable gEnemyDroptables[] = { .bombs = -999, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, + .kinstoneRed = -999, .kinstoneBlue = -999, - .kinstoneRed = 10, + .kinstoneGreen = 10, .none2 = -999, .none3 = 0, .none4 = 0, @@ -156,9 +156,9 @@ const Droptable gEnemyDroptables[] = { .bombs = -999, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, + .kinstoneRed = -999, .kinstoneBlue = -999, - .kinstoneRed = 15, + .kinstoneGreen = 15, .none2 = -999, .none3 = 0, .none4 = 0, @@ -174,9 +174,9 @@ const Droptable gEnemyDroptables[] = { .bombs = -999, .arrows = 50, .mysteriousShells = 0, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -192,9 +192,9 @@ const Droptable gEnemyDroptables[] = { .bombs = 100, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -210,9 +210,9 @@ const Droptable gEnemyDroptables[] = { .bombs = -999, .arrows = -999, .mysteriousShells = 10, - .kinstoneGreen = 2, + .kinstoneRed = 2, .kinstoneBlue = 3, - .kinstoneRed = 10, + .kinstoneGreen = 10, .none2 = -999, .none3 = 0, .none4 = 0, @@ -228,9 +228,9 @@ const Droptable gEnemyDroptables[] = { .bombs = -999, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -246,9 +246,9 @@ const Droptable gEnemyDroptables[] = { .bombs = 1, .arrows = 1, .mysteriousShells = 0, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -264,9 +264,9 @@ const Droptable gEnemyDroptables[] = { .bombs = 20, .arrows = -999, .mysteriousShells = 0, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -282,9 +282,9 @@ const Droptable gEnemyDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = -999, .none3 = 0, .none4 = 0, @@ -300,9 +300,9 @@ const Droptable gEnemyDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 2, + .kinstoneRed = 2, .kinstoneBlue = 5, - .kinstoneRed = 10, + .kinstoneGreen = 10, .none2 = 0, .none3 = 0, .none4 = 0, @@ -318,9 +318,9 @@ const Droptable gEnemyDroptables[] = { .bombs = 9, .arrows = 9, .mysteriousShells = 40, - .kinstoneGreen = 9, + .kinstoneRed = 9, .kinstoneBlue = 12, - .kinstoneRed = 16, + .kinstoneGreen = 16, .none2 = 9, .none3 = 0, .none4 = 0, @@ -339,9 +339,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 10, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -357,9 +357,9 @@ const Droptable gAreaDroptables[] = { .bombs = 200, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = 0, .none3 = 0, .none4 = 0, @@ -375,9 +375,9 @@ const Droptable gAreaDroptables[] = { .bombs = 35, .arrows = 4, .mysteriousShells = 4, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 3, + .kinstoneGreen = 3, .none2 = 0, .none3 = 0, .none4 = 0, @@ -393,9 +393,9 @@ const Droptable gAreaDroptables[] = { .bombs = 7, .arrows = 25, .mysteriousShells = 3, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 9, + .kinstoneGreen = 9, .none2 = 0, .none3 = 0, .none4 = 0, @@ -411,9 +411,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = 23, .mysteriousShells = 2, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 28, + .kinstoneGreen = 28, .none2 = 0, .none3 = 0, .none4 = 0, @@ -429,9 +429,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 6, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 11, + .kinstoneGreen = 11, .none2 = 0, .none3 = 0, .none4 = 0, @@ -447,9 +447,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 33, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 6, + .kinstoneGreen = 6, .none2 = 0, .none3 = 0, .none4 = 0, @@ -465,9 +465,9 @@ const Droptable gAreaDroptables[] = { .bombs = 4, .arrows = 4, .mysteriousShells = 3, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 6, + .kinstoneGreen = 6, .none2 = 20, .none3 = 0, .none4 = 0, @@ -483,9 +483,9 @@ const Droptable gAreaDroptables[] = { .bombs = 1, .arrows = 1, .mysteriousShells = 1, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 6, + .kinstoneGreen = 6, .none2 = 0, .none3 = 0, .none4 = 0, @@ -501,9 +501,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 18, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 5, + .kinstoneGreen = 5, .none2 = 15, .none3 = 0, .none4 = 0, @@ -523,9 +523,9 @@ const Droptable gAreaDroptables[] = { .bombs = 1, .arrows = 1, .mysteriousShells = 40, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 5, + .kinstoneGreen = 5, .none2 = 0, .none3 = 0, .none4 = 0, @@ -541,9 +541,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 19, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 15, + .kinstoneGreen = 15, .none2 = 28, .none3 = 0, .none4 = 0, @@ -559,9 +559,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 9, + .kinstoneGreen = 9, .none2 = 0, .none3 = 0, .none4 = 0, @@ -577,9 +577,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 1, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 15, + .kinstoneGreen = 15, .none2 = 0, .none3 = 0, .none4 = 0, @@ -595,9 +595,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 25, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 4, + .kinstoneGreen = 4, .none2 = 0, .none3 = 0, .none4 = 0, @@ -613,9 +613,9 @@ const Droptable gAreaDroptables[] = { .bombs = 20, .arrows = 0, .mysteriousShells = 15, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 10, + .kinstoneGreen = 10, .none2 = -999, .none3 = 0, .none4 = 0, @@ -631,9 +631,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = -999, .mysteriousShells = 0, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 10, + .kinstoneGreen = 10, .none2 = -999, .none3 = 0, .none4 = 0, @@ -649,9 +649,9 @@ const Droptable gAreaDroptables[] = { .bombs = -999, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, + .kinstoneRed = 0, .kinstoneBlue = 0, - .kinstoneRed = 10, + .kinstoneGreen = 10, .none2 = -999, .none3 = 0, .none4 = 0, @@ -667,9 +667,9 @@ const Droptable gAreaDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -687,9 +687,9 @@ const Droptable gObjectDroptables[] = { .bombs = -100, .arrows = -100, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = -999, .none3 = 0, .none4 = 0, @@ -705,9 +705,9 @@ const Droptable gObjectDroptables[] = { .bombs = 1, .arrows = 1, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = 1, .none3 = 0, .none4 = 0, @@ -723,9 +723,9 @@ const Droptable gObjectDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 140, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = 20, .none3 = 0, .none4 = 0, @@ -741,9 +741,9 @@ const Droptable gObjectDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = 0, .none3 = 0, .none4 = 0, @@ -759,9 +759,9 @@ const Droptable gObjectDroptables[] = { .bombs = -999, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -777,9 +777,9 @@ const Droptable gObjectDroptables[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = -999, .none3 = 0, .none4 = 0, @@ -796,9 +796,9 @@ const Droptable gObjectDroptables[] = { .bombs = -999, .arrows = 250, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -815,9 +815,9 @@ const Droptable gObjectDroptables[] = { .bombs = -10, .arrows = -10, .mysteriousShells = 12, - .kinstoneGreen = 1, + .kinstoneRed = 1, .kinstoneBlue = 2, - .kinstoneRed = 10, + .kinstoneGreen = 10, .none2 = 30, .none3 = 0, .none4 = 0, @@ -833,9 +833,9 @@ const Droptable gObjectDroptables[] = { .bombs = -10, .arrows = -10, .mysteriousShells = 24, - .kinstoneGreen = 2, + .kinstoneRed = 2, .kinstoneBlue = 4, - .kinstoneRed = 20, + .kinstoneGreen = 20, .none2 = 10, .none3 = 0, .none4 = 0, @@ -854,9 +854,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = 0, .none3 = 0, .none4 = 0, @@ -872,9 +872,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = 0, .none3 = 0, .none4 = 0, @@ -890,9 +890,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = 0, .none3 = 0, .none4 = 0, @@ -908,9 +908,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = 0, .none3 = 0, .none4 = 0, @@ -927,9 +927,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 0, .arrows = 20, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -945,9 +945,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 0, .arrows = 20, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -964,9 +964,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = -999, .none3 = 0, .none4 = 0, @@ -982,9 +982,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = -999, .none3 = 0, .none4 = 0, @@ -1000,9 +1000,9 @@ const Droptable gUnk_0800191C[] = { .bombs = -999, .arrows = -999, .mysteriousShells = -999, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = -999, .none3 = 0, .none4 = 0, @@ -1018,9 +1018,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 250, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = -999, .none3 = 0, .none4 = 0, @@ -1036,9 +1036,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 125, .arrows = 125, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = -999, .none3 = 0, .none4 = 0, @@ -1054,9 +1054,9 @@ const Droptable gUnk_0800191C[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 20, + .kinstoneRed = 20, .kinstoneBlue = 40, - .kinstoneRed = 190, + .kinstoneGreen = 190, .none2 = -999, .none3 = 0, .none4 = 0, @@ -1077,9 +1077,9 @@ const Droptable gDroptableModifiers[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = 0, .none3 = 0, .none4 = 0, @@ -1096,9 +1096,9 @@ const Droptable gDroptableModifiers[] = { .bombs = 2, .arrows = 2, .mysteriousShells = -999, - .kinstoneGreen = 0, - .kinstoneBlue = 0, .kinstoneRed = 0, + .kinstoneBlue = 0, + .kinstoneGreen = 0, .none2 = 0, .none3 = 0, .none4 = 0, @@ -1115,9 +1115,9 @@ const Droptable gDroptableModifiers[] = { .bombs = 0, .arrows = 0, .mysteriousShells = 0, - .kinstoneGreen = -999, - .kinstoneBlue = -999, .kinstoneRed = -999, + .kinstoneBlue = -999, + .kinstoneGreen = -999, .none2 = 0, .none3 = 0, .none4 = 0,