Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meta: included COLOR_MAP constants in field_effect_script. Credit: SDH

Browse Source
This commit is contained in:
Ariel A 2024-09-08 16:02:51 -04:00
parent 8795c15ab9
commit d3a4839808
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asm/macros/field_effect_script.inc
View File

@ -1,3 +1,4 @@
#include "constants/field_weather.h"
@ The first .byte argument of each macro below is an index into gFieldEffectScriptFuncs @ The first .byte argument of each macro below is an index into gFieldEffectScriptFuncs
.macro field_eff_loadtiles address:req .macro field_eff_loadtiles address:req
@ -5,8 +6,7 @@
.4byte \address .4byte \address
.endm .endm
@ 1 = COLOR_MAP_DARK_CONTRAST .macro field_eff_loadfadedpal address:req, color_map_type=COLOR_MAP_DARK_CONTRAST
.macro field_eff_loadfadedpal address:req, color_map_type=1
.byte 1 .byte 1
.4byte \address .4byte \address
.byte \color_map_type .byte \color_map_type
@ -26,8 +26,7 @@
.byte 4 .byte 4
.endm .endm
@ 1 = COLOR_MAP_DARK_CONTRAST .macro field_eff_loadgfx_callnative tiles_address:req, palette_address:req, function_address:req, color_map_type=COLOR_MAP_DARK_CONTRAST
.macro field_eff_loadgfx_callnative tiles_address:req, palette_address:req, function_address:req, color_map_type=1
.byte 5 .byte 5
.4byte \tiles_address .4byte \tiles_address
.4byte \palette_address .4byte \palette_address
@ -41,8 +40,7 @@
.4byte \function_address .4byte \function_address
.endm .endm
@ 1 = COLOR_MAP_DARK_CONTRAST .macro field_eff_loadfadedpal_callnative palette_address:req, function_address:req, color_map_type=COLOR_MAP_DARK_CONTRAST
.macro field_eff_loadfadedpal_callnative palette_address:req, function_address:req, color_map_type=1
.byte 7 .byte 7
.4byte \palette_address .4byte \palette_address
.byte \color_map_type .byte \color_map_type

5
include/constants/field_weather.h
View File

@ -1,6 +1,11 @@
#ifndef GUARD_CONSTANTS_FIELD_WEATHER_H #ifndef GUARD_CONSTANTS_FIELD_WEATHER_H
#define GUARD_CONSTANTS_FIELD_WEATHER_H #define GUARD_CONSTANTS_FIELD_WEATHER_H
// sPaletteColorMapTypes & field_effect_scripts
#define COLOR_MAP_NONE 0
#define COLOR_MAP_DARK_CONTRAST 1
#define COLOR_MAP_CONTRAST 2
#define MAX_RAIN_SPRITES 24 #define MAX_RAIN_SPRITES 24
#define NUM_CLOUD_SPRITES 3 #define NUM_CLOUD_SPRITES 3
#define NUM_FOG_HORIZONTAL_SPRITES 20 #define NUM_FOG_HORIZONTAL_SPRITES 20

7
src/field_weather.c
View File

@ -20,13 +20,6 @@
#define DROUGHT_COLOR_INDEX(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00)) #define DROUGHT_COLOR_INDEX(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00))
enum
{
COLOR_MAP_NONE,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_CONTRAST,
};
struct RGBColor struct RGBColor
{ {
u16 r:5; u16 r:5;