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

Style fixes; attempt to match help_system NONMATCHING

Browse Source
This commit is contained in:
PikalaxALT
2021-03-21 20:28:42 -04:00
parent 30c265118c
commit f6565a15d4
18 changed files with 116 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/flags.h
+1 -1
View File
@@ -1324,7 +1324,7 @@
#define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6)
#define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7)
#define FLAG_QL_DEPARTED (SYS_FLAGS + 0x8)
#define FLAG_SYS_QL_DEPARTED (SYS_FLAGS + 0x8)
#define FLAG_0x809 (SYS_FLAGS + 0x9)
#define FLAG_0x80A (SYS_FLAGS + 0xA)
#define FLAG_0x80B (SYS_FLAGS + 0xB)
include/constants/metatile_behaviors.h
+2 -2
View File
@@ -107,11 +107,11 @@
#define MB_CUP 0x9B
#define MB_PORTHOLE 0x9C
#define MB_BLINKING_LIGHTS 0x9E
#define MB_9F 0x9F
#define MB_NEATLY_LINED_UP_TOOLS 0x9F
#define MB_IMPRESSIVE_MACHINE 0xA0
#define MB_VIDEO_GAME 0xA1
#define MB_BURGLARY 0xA2
#define MB_A3 0xA3
#define MB_TRAINER_TOWER_MONITOR 0xA3
#define MB_CYCLING_ROAD_PULL_DOWN 0xD0
#define MB_CYCLING_ROAD_PULL_DOWN_GRASS 0xD1
include/constants/pokemon.h
+10 -10
View File
@@ -198,16 +198,16 @@
#define MON_FEMALE 0xFE
#define MON_GENDERLESS 0xFF
#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0
#define FRIENDSHIP_EVENT_VITAMIN 0x1
#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2
#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3
#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4
#define FRIENDSHIP_EVENT_WALKING 0x5
#define FRIENDSHIP_EVENT_MASSAGE 0x6
#define FRIENDSHIP_EVENT_FAINT_SMALL 0x7
#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x8
#define FRIENDSHIP_EVENT_FAINT_LARGE 0x9
#define FRIENDSHIP_EVENT_GROW_LEVEL 0
#define FRIENDSHIP_EVENT_VITAMIN 1
#define FRIENDSHIP_EVENT_BATTLE_ITEM 2
#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3
#define FRIENDSHIP_EVENT_LEARN_TMHM 4
#define FRIENDSHIP_EVENT_WALKING 5
#define FRIENDSHIP_EVENT_MASSAGE 6
#define FRIENDSHIP_EVENT_FAINT_SMALL 7
#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 8
#define FRIENDSHIP_EVENT_FAINT_LARGE 9
#define PARTY_SIZE 6
#define MAX_TOTAL_EVS 510
include/constants/vars.h
+1 -1
View File
@@ -122,7 +122,7 @@
#define VAR_EGG_BRAG_STATE 0x404A
#define VAR_LINK_WIN_BRAG_STATE 0x404B
#define VAR_POKELOT_RND2 0x404C
#define VAR_QL_ENTRANCE 0x404D
#define VAR_QL_ENTRANCE 0x404D
#define VAR_0x404E 0x404E
#define VAR_LOTAD_SIZE_RECORD 0x404F
include/field_weather.h
+2 -2
View File
@@ -35,8 +35,8 @@ struct Weather
u8 fadeScreenCounter;
bool8 readyForInit;
u8 taskId;
u8 fade_in_active;
u8 fade_in_counter;
u8 fadeInActive;
u8 fadeInCounter;
u16 initStep;
u16 finishStep;
u8 currWeather;
include/metatile_behavior.h
+1 -1
View File
@@ -146,7 +146,7 @@ bool8 MetatileBehavior_IsCup(u8 metatileBehavior);
bool8 MetatileBehavior_IsPolishedWindow(u8 metatileBehavior);
bool8 MetatileBehavior_IsBeautifulSkyWindow(u8 metatileBehavior);
bool8 MetatileBehavior_IsBlinkingLights(u8 metatileBehavior);
bool8 MetatileBehavior_IsIsNeatlyLinedUpTools(u8 metatileBehavior);
bool8 MetatileBehavior_IsNeatlyLinedUpTools(u8 metatileBehavior);
bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior);
bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior);
bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior);
include/quest_log.h
+4 -3
View File
@@ -6,6 +6,10 @@
#include "constants/quest_log.h"
#include "field_control_avatar.h"
// Parameter to QuestLog_OnEscalatorWarp
#define QL_ESCALATOR_OUT 1
#define QL_ESCALATOR_IN 2
struct QuestLogEntry
{
// When command == 2, these fields have different meanings
@@ -57,9 +61,6 @@ void SetQuestLogRecordAndPlaybackPointers(void *oldSave);
void sub_811246C(struct Sprite *sprite);
void QuestLogRecordNPCStep(u8 a0, u8 a1, u8 a2, u8 a3);
bool8 sub_8111C2C(void);
#define QL_ESCALATOR_OUT 1
#define QL_ESCALATOR_IN 2
void QuestLog_OnEscalatorWarp(u8 direction);
void QuestLogRecordPlayerAvatarGfxTransitionWithDuration(u8 movementActionId, u8 duration);
void Special_UpdateTrainerFansAfterLinkBattle(void);