diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-05-06 13:51:41 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-05-06 13:51:41 -0400 |
| commit | 15b66d82c6aa5dc8872b8a1ff16ba75b446a66f4 (patch) | |
| tree | 2b6c565e50d21658ca0ca1db88891de1a1a9ed45 /src | |
| parent | 6f0a4b22152bcefac4bcd5f2532d8452583973d0 (diff) | |
Sync surf.inc, dynamic_npc_graphics.inc
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_control_avatar.c | 4 | ||||
| -rw-r--r-- | src/main.c | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index e237904fb..081d506ab 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -70,7 +70,7 @@ extern u8 ShopShelfScript[]; extern u8 BlueprintScript[]; extern u8 SecretBase_EventScript_SandOrnament[]; extern u8 SecretBase_EventScript_ShieldOrToyTV[]; -extern u8 UseSurfScript[]; +extern u8 EventScript_UseSurf[]; extern u8 S_UseWaterfall[]; extern u8 S_CannotUseWaterfall[]; extern u8 UseDiveScript[]; @@ -502,7 +502,7 @@ static u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatile static u8 *GetInteractedWaterScript(struct MapPosition *unused1, u8 metatileBehavior, u8 direction) { if (FlagGet(FLAG_BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE) - return UseSurfScript; + return EventScript_UseSurf; if (MetatileBehavior_IsWaterfall(metatileBehavior) == TRUE) { diff --git a/src/main.c b/src/main.c index b778631f3..433143b38 100644 --- a/src/main.c +++ b/src/main.c @@ -24,14 +24,7 @@ static void VCountIntr(void); static void SerialIntr(void); static void IntrDummy(void); -#ifdef SAPPHIRE -#define GAME_VERSION VERSION_SAPPHIRE -#else -#define GAME_VERSION VERSION_RUBY -#endif - const u8 gGameVersion = GAME_VERSION; - const u8 gGameLanguage = GAME_LANGUAGE; // The debug menu expects this exact format. With the English build string, it |