diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-14 21:04:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-14 21:04:11 -0400 |
| commit | 37537e38f99e2d0ad055d8d72e244f9f83ea8125 (patch) | |
| tree | a259730235bf3e2e8795a5e078104fbc30fde1cd /src | |
| parent | 31f4edbe503134eba4f7fee8ca9ecc85099c51bd (diff) | |
| parent | 5075067ecd8718ab96a063946662c71fe3ef5369 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer
Diffstat (limited to 'src')
| -rw-r--r-- | src/berry.c | 4 | ||||
| -rw-r--r-- | src/credits.c | 4 | ||||
| -rw-r--r-- | src/event_object_movement.c | 4 | ||||
| -rw-r--r-- | src/help_system.c | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/src/berry.c b/src/berry.c index ef6999e9a..d4ea0dae3 100644 --- a/src/berry.c +++ b/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[] = _("そとの かわの ぶぶんも なかみも すべてが"); diff --git a/src/credits.c b/src/credits.c index fc45781ad..ba57947c8 100644 --- a/src/credits.c +++ b/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, diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 7f6785e37..271d60bf5 100644 --- a/src/event_object_movement.c +++ b/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); diff --git a/src/help_system.c b/src/help_system.c index 946da55be..196053274 100644 --- a/src/help_system.c +++ b/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; |