Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-04-25 07:19:36 -05:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/NavelRock_Summit/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_CLOUDY",
"weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_4",
"unknown_18": 0,
"unknown_19": 6,

2
data/maps/PokemonMansion_1F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_POKEYASHI",
"region_map_section": "MAPSEC_POKEMON_MANSION",
"requires_flash": false,
"weather": "WEATHER_CLOUDY",
"weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_8",
"unknown_18": 0,
"unknown_19": 7,

2
data/maps/PokemonMansion_2F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_POKEYASHI",
"region_map_section": "MAPSEC_POKEMON_MANSION",
"requires_flash": false,
"weather": "WEATHER_CLOUDY",
"weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_8",
"unknown_18": 0,
"unknown_19": 7,

2
data/maps/PokemonMansion_3F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_POKEYASHI",
"region_map_section": "MAPSEC_POKEMON_MANSION",
"requires_flash": false,
"weather": "WEATHER_CLOUDY",
"weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_8",
"unknown_18": 0,
"unknown_19": 7,

2
data/maps/PokemonMansion_B1F/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_POKEYASHI",
"region_map_section": "MAPSEC_POKEMON_MANSION",
"requires_flash": false,
"weather": "WEATHER_CLOUDY",
"weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_8",
"unknown_18": 0,
"unknown_19": 7,

2
data/maps/ViridianForest/map.json
View File

@ -5,7 +5,7 @@
"music": "MUS_T_MORI",
"region_map_section": "MAPSEC_VIRIDIAN_FOREST",
"requires_flash": false,
"weather": "WEATHER_CLOUDY",
"weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_3",
"unknown_18": 1,
"unknown_19": 7,

13
include/constants/field_tasks.h Normal file
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

2
include/constants/weather.h
View File

@ -12,7 +12,7 @@
#define WEATHER_SANDSTORM 8 // unused
#define WEATHER_FOG_DIAGONAL 9 // 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_DOWNPOUR 13 // unused
#define WEATHER_UNDERWATER_BUBBLES 14 // unused

19
src/field_tasks.c
View File

@ -11,10 +11,13 @@
#include "script.h"
#include "sound.h"
#include "task.h"
#include "constants/field_tasks.h"
#include "constants/flags.h"
#include "constants/songs.h"
#include "constants/vars.h"
// TODO: Metatile IDs in this file
static void DummyPerStepCallback(u8 taskId);
static void AshGrassPerStepCallback(u8 taskId);
static void IcefallCaveIcePerStepCallback(u8 taskId);
@ -22,14 +25,14 @@ static void CrackedFloorPerStepCallback(u8 taskId);
static const TaskFunc sPerStepCallbacks[] =
{
DummyPerStepCallback,
AshGrassPerStepCallback,
DummyPerStepCallback,
DummyPerStepCallback,
IcefallCaveIcePerStepCallback,
DummyPerStepCallback,
DummyPerStepCallback,
CrackedFloorPerStepCallback
[STEP_CB_DUMMY] = DummyPerStepCallback,
[STEP_CB_ASH] = AshGrassPerStepCallback,
[STEP_CB_FORTREE_BRIDGE] = DummyPerStepCallback,
[STEP_CB_PACIFIDLOG_BRIDGE] = DummyPerStepCallback,
[STEP_CB_ICE] = IcefallCaveIcePerStepCallback,
[STEP_CB_TRUCK] = DummyPerStepCallback,
[STEP_CB_SECRET_BASE] = DummyPerStepCallback,
[STEP_CB_CRACKED_FLOOR] = CrackedFloorPerStepCallback
};
static const u8 sIcefallCaveIceTileCoords[][2] =