dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync STEB_CB, WEATHER_SHADE

Browse Source
This commit is contained in:
GriffinR
2020-01-28 14:26:18 -05:00
parent eae373576d
commit 0ddd7ebb1d
9 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/NavelRock_Summit/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_NANADUNGEON", "music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK", "region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_4", "map_type": "MAP_TYPE_4",
"unknown_18": 0, "unknown_18": 0,
"unknown_19": 6, "unknown_19": 6,
data/maps/PokemonMansion_1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_POKEYASHI", "music": "MUS_POKEYASHI",
"region_map_section": "MAPSEC_POKEMON_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_8", "map_type": "MAP_TYPE_8",
"unknown_18": 0, "unknown_18": 0,
"unknown_19": 7, "unknown_19": 7,
data/maps/PokemonMansion_2F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_POKEYASHI", "music": "MUS_POKEYASHI",
"region_map_section": "MAPSEC_POKEMON_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_8", "map_type": "MAP_TYPE_8",
"unknown_18": 0, "unknown_18": 0,
"unknown_19": 7, "unknown_19": 7,
data/maps/PokemonMansion_3F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_POKEYASHI", "music": "MUS_POKEYASHI",
"region_map_section": "MAPSEC_POKEMON_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_8", "map_type": "MAP_TYPE_8",
"unknown_18": 0, "unknown_18": 0,
"unknown_19": 7, "unknown_19": 7,
data/maps/PokemonMansion_B1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_POKEYASHI", "music": "MUS_POKEYASHI",
"region_map_section": "MAPSEC_POKEMON_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_8", "map_type": "MAP_TYPE_8",
"unknown_18": 0, "unknown_18": 0,
"unknown_19": 7, "unknown_19": 7,
data/maps/ViridianForest/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_T_MORI", "music": "MUS_T_MORI",
"region_map_section": "MAPSEC_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_VIRIDIAN_FOREST",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_CLOUDY", "weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_3", "map_type": "MAP_TYPE_3",
"unknown_18": 1, "unknown_18": 1,
"unknown_19": 7, "unknown_19": 7,
include/constants/field_tasks.h
+13
View File
@@ -0,0 +1,13 @@
#ifndef GUARD_CONSTANTS_FIELD_TASKS_H
#define GUARD_CONSTANTS_FIELD_TASKS_H
#define STEP_CB_DUMMY 0
#define STEP_CB_ASH 1 // Unused
#define STEP_CB_FORTREE_BRIDGE 2 // Unused, dummied
#define STEP_CB_PACIFIDLOG_BRIDGE 3 // Unused, dummied
#define STEP_CB_ICE 4
#define STEP_CB_TRUCK 5 // Unused, dummied
#define STEP_CB_SECRET_BASE 6 // Unused, dummied
#define STEP_CB_CRACKED_FLOOR 7 // Unused
#endif // GUARD_CONSTANTS_FIELD_TASKS_H
include/constants/weather.h
+1 -1
View File
@@ -12,7 +12,7 @@
#define WEATHER_SANDSTORM 8 // unused #define WEATHER_SANDSTORM 8 // unused
#define WEATHER_FOG_DIAGONAL 9 // unused #define WEATHER_FOG_DIAGONAL 9 // unused
#define WEATHER_UNDERWATER 10 // unused #define WEATHER_UNDERWATER 10 // unused
#define WEATHER_CLOUDY 11 #define WEATHER_SHADE 11
#define WEATHER_DROUGHT 12 // unused and broken in overworld #define WEATHER_DROUGHT 12 // unused and broken in overworld
#define WEATHER_DOWNPOUR 13 // unused #define WEATHER_DOWNPOUR 13 // unused
#define WEATHER_UNDERWATER_BUBBLES 14 // unused #define WEATHER_UNDERWATER_BUBBLES 14 // unused
src/field_tasks.c
+11 -8
View File
@@ -11,10 +11,13 @@
#include "script.h" #include "script.h"
#include "sound.h" #include "sound.h"
#include "task.h" #include "task.h"
#include "constants/field_tasks.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/vars.h" #include "constants/vars.h"
// TODO: Metatile IDs in this file
static void DummyPerStepCallback(u8 taskId); static void DummyPerStepCallback(u8 taskId);
static void AshGrassPerStepCallback(u8 taskId); static void AshGrassPerStepCallback(u8 taskId);
static void IcefallCaveIcePerStepCallback(u8 taskId); static void IcefallCaveIcePerStepCallback(u8 taskId);
@@ -22,14 +25,14 @@ static void CrackedFloorPerStepCallback(u8 taskId);
static const TaskFunc sPerStepCallbacks[] = static const TaskFunc sPerStepCallbacks[] =
{ {
DummyPerStepCallback, [STEP_CB_DUMMY] = DummyPerStepCallback,
AshGrassPerStepCallback, [STEP_CB_ASH] = AshGrassPerStepCallback,
DummyPerStepCallback, [STEP_CB_FORTREE_BRIDGE] = DummyPerStepCallback,
DummyPerStepCallback, [STEP_CB_PACIFIDLOG_BRIDGE] = DummyPerStepCallback,
IcefallCaveIcePerStepCallback, [STEP_CB_ICE] = IcefallCaveIcePerStepCallback,
DummyPerStepCallback, [STEP_CB_TRUCK] = DummyPerStepCallback,
DummyPerStepCallback, [STEP_CB_SECRET_BASE] = DummyPerStepCallback,
CrackedFloorPerStepCallback [STEP_CB_CRACKED_FLOOR] = CrackedFloorPerStepCallback
}; };
static const u8 sIcefallCaveIceTileCoords[][2] = static const u8 sIcefallCaveIceTileCoords[][2] =