Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer

include/config.h

@@ -41,9 +41,6 @@
 #ifndef BUGFIX
 #define BUGFIX
 #endif // BUGFIX
-#ifndef NONMATCHING
-#define NONMATCHING
-#endif // NONMATCHING
 #endif // MODERN
 
 #endif // GUARD_CONFIG_H

src/berry.c

@@ -3,6 +3,10 @@
 #include "text.h"
 #include "constants/items.h"
 
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
+
 static const u8 sBerryDescriptionPart1_Cheri[] = _("とても かわいい はなが さく.");
 static const u8 sBerryDescriptionPart2_Cheri[] = _("まっかな みは とても からい.");
 static const u8 sBerryDescriptionPart1_Chesto[] = _("そとの かわの ぶぶんも なかみも すべてが");

src/credits.c

@@ -22,6 +22,10 @@ asm(".set TITLE_TEXT, gString_PokemonFireRed_Staff");
 asm(".set TITLE_TEXT, gString_PokemonLeafGreen_Staff");
 #endif
 
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
+
 enum CreditsSceneIdx
 {
     CREDITSSCENE_INIT_WIN0 = 0,

src/event_object_movement.c

@@ -20,6 +20,10 @@
 
 #define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51
 
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
+
 static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16);
 static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *, struct Sprite *);
 static u8 GetCollisionInDirection(struct ObjectEvent *, u8);

src/help_system.c

@@ -9,6 +9,10 @@
 #include "event_data.h"
 #include "constants/songs.h"
 
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
+
 extern u8 gGlyphInfo[];
 
 bool8 gHelpSystemEnabled;