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

Merge pull request #57 from SatoMew/master

Browse Source 
Add weather labels and missing constants
This commit is contained in:
PikalaxALT
2019-05-19 12:10:26 -04:00
committed by GitHub
parent 6c2d5ea50d 333d2f37a8
commit 4661be7836
436 changed files with 901 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/battle.h
+4 -4
View File
@@ -207,12 +207,12 @@
#define WEATHER_SANDSTORM_TEMPORARY (1 << 3)
#define WEATHER_SANDSTORM_PERMANENT (1 << 4)
#define WEATHER_SANDSTORM_ANY (WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)
#define WEATHER_SUN_TEMPORARY (1 << 5)
#define WEATHER_SUN_PERMANENT (1 << 6)
#define WEATHER_SUN_ANY (WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)
#define WEATHER_SUNNY_TEMPORARY (1 << 5)
#define WEATHER_SUNNY_PERMANENT (1 << 6)
#define WEATHER_SUNNY_ANY (WEATHER_SUNNY_TEMPORARY | WEATHER_SUNNY_PERMANENT)
#define WEATHER_HAIL (1 << 7)
#define WEATHER_HAIL_ANY (WEATHER_HAIL)
#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)
#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUNNY_ANY | WEATHER_HAIL_ANY)
// Move Effects
#define MOVE_EFFECT_SLEEP 0x1
include/constants/battle_ai.h
+3 -3
View File
@@ -23,10 +23,10 @@
#define AI_EFFECTIVENESS_x0 0
// ai weather
#define AI_WEATHER_SUN 0
#define AI_WEATHER_RAIN 1
#define AI_WEATHER_SUNNY 0
#define AI_WEATHER_RAIN 1
#define AI_WEATHER_SANDSTORM 2
#define AI_WEATHER_HAIL 3
#define AI_WEATHER_HAIL 3
// get_how_powerful_move_is
#define MOVE_POWER_DISCOURAGED 0
include/constants/maps.h
-13
View File
@@ -40,17 +40,4 @@
#define MAP_TYPE_8 8
#define MAP_TYPE_9 9
#define WEATHER_0 0
#define WEATHER_1 1
#define WEATHER_2 2
#define WEATHER_3 3
#define WEATHER_4 4
#define WEATHER_5 5
#define WEATHER_6 6
#define WEATHER_7 7
#define WEATHER_8 8
#define WEATHER_9 9
#define WEATHER_10 10
#define WEATHER_11 11
#endif // GUARD_CONSTANTS_MAPS_H
include/constants/weather.h
+20
View File
@@ -0,0 +1,20 @@
#ifndef GUARD_CONSTANTS_WEATHER_H
#define GUARD_CONSTANTS_WEATHER_H
#define WEATHER_NONE 0
#define WEATHER_SUNNY_CLOUDS 1 // unused
#define WEATHER_SUNNY 2
#define WEATHER_RAIN 3 // unused
#define WEATHER_SNOW 4 // unused
#define WEATHER_RAIN_THUNDERSTORM 5 // unused
#define WEATHER_FOG_HORIZONTAL 6
#define WEATHER_VOLCANIC_ASH 7 // unused
#define WEATHER_SANDSTORM 8 // unused
#define WEATHER_FOG_DIAGONAL 9 // unused
#define WEATHER_UNDERWATER 10 // unused
#define WEATHER_CLOUDY 11
#define WEATHER_DROUGHT 12 // unused and broken in overworld
#define WEATHER_DOWNPOUR 13 // unused
#define WEATHER_UNDERWATER_BUBBLES 14 // unused
#endif // GUARD_CONSTANTS_WEATHER_H