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

Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system

Browse Source
This commit is contained in:
PikalaxALT
2020-03-16 07:51:21 -04:00
parent 9c2e157123 f44f89a463
commit 0367cc7d78
41 changed files with 10009 additions and 25762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/event_objects.h
+22 -16
View File
@@ -154,22 +154,28 @@
#define OBJ_EVENT_GFX_DEOXYS_N 150
#define OBJ_EVENT_GFX_SS_ANNE 151
#define OBJ_EVENT_GFX_VAR_0 240
#define OBJ_EVENT_GFX_VAR_1 241
#define OBJ_EVENT_GFX_VAR_2 242
#define OBJ_EVENT_GFX_VAR_3 243
#define OBJ_EVENT_GFX_VAR_4 244
#define OBJ_EVENT_GFX_VAR_5 245
#define OBJ_EVENT_GFX_VAR_6 246
#define OBJ_EVENT_GFX_VAR_7 247
#define OBJ_EVENT_GFX_VAR_8 248
#define OBJ_EVENT_GFX_VAR_9 249
#define OBJ_EVENT_GFX_VAR_A 250
#define OBJ_EVENT_GFX_VAR_B 251
#define OBJ_EVENT_GFX_VAR_C 252
#define OBJ_EVENT_GFX_VAR_D 253
#define OBJ_EVENT_GFX_VAR_E 254
#define OBJ_EVENT_GFX_VAR_F 255
#define NUM_OBJ_EVENT_GFX 239
// These are dynamic object gfx ids.
// They correspond with the values of the VAR_OBJ_GFX_ID_X vars.
// More info about them in include/constants/vars.h
#define OBJ_EVENT_GFX_VARS (NUM_OBJ_EVENT_GFX + 1)
#define OBJ_EVENT_GFX_VAR_0 (OBJ_EVENT_GFX_VARS + 0x0) // 240
#define OBJ_EVENT_GFX_VAR_1 (OBJ_EVENT_GFX_VARS + 0x1)
#define OBJ_EVENT_GFX_VAR_2 (OBJ_EVENT_GFX_VARS + 0x2)
#define OBJ_EVENT_GFX_VAR_3 (OBJ_EVENT_GFX_VARS + 0x3)
#define OBJ_EVENT_GFX_VAR_4 (OBJ_EVENT_GFX_VARS + 0x4)
#define OBJ_EVENT_GFX_VAR_5 (OBJ_EVENT_GFX_VARS + 0x5)
#define OBJ_EVENT_GFX_VAR_6 (OBJ_EVENT_GFX_VARS + 0x6)
#define OBJ_EVENT_GFX_VAR_7 (OBJ_EVENT_GFX_VARS + 0x7)
#define OBJ_EVENT_GFX_VAR_8 (OBJ_EVENT_GFX_VARS + 0x8)
#define OBJ_EVENT_GFX_VAR_9 (OBJ_EVENT_GFX_VARS + 0x9)
#define OBJ_EVENT_GFX_VAR_A (OBJ_EVENT_GFX_VARS + 0xA)
#define OBJ_EVENT_GFX_VAR_B (OBJ_EVENT_GFX_VARS + 0xB)
#define OBJ_EVENT_GFX_VAR_C (OBJ_EVENT_GFX_VARS + 0xC)
#define OBJ_EVENT_GFX_VAR_D (OBJ_EVENT_GFX_VARS + 0xD)
#define OBJ_EVENT_GFX_VAR_E (OBJ_EVENT_GFX_VARS + 0xE)
#define OBJ_EVENT_GFX_VAR_F (OBJ_EVENT_GFX_VARS + 0xF) // 255
#define SHADOW_SIZE_S 0
#define SHADOW_SIZE_M 1
include/constants/field_effects.h
+1 -1
View File
@@ -1,6 +1,6 @@
#ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H
#define GUARD_CONSTANTS_FIELD_EFFECTS_H
#define FLDEFF_EXCLAMATION_MARK_ICON 0
#define FLDEFF_USE_CUT_ON_GRASS 1
#define FLDEFF_USE_CUT_ON_TREE 2
include/constants/global.h
+1
View File
@@ -31,6 +31,7 @@
#define BAG_POKEBALLS_COUNT 13
#define BAG_TMHM_COUNT 58
#define BAG_BERRIES_COUNT 43
#define OBJECT_EVENT_TEMPLATES_COUNT 64
#define QUEST_LOG_SCENE_COUNT 4
include/constants/metatile_behaviors.h
+4 -4
View File
@@ -13,21 +13,21 @@
#define MB_SEMI_DEEP_WATER 0x11
#define MB_DEEP_WATER 0x12
#define MB_WATERFALL 0x13
#define MB_SPLASHING_WATER 0x15
#define MB_OCEAN_WATER 0x15
#define MB_PUDDLE 0x16
#define MB_WATERFALL_BOTTOM 0x17
#define MB_SHALLOW_WATER 0x17
#define MB_19 0x19
#define MB_1A 0x1A
#define MB_1B 0x1B
#define MB_STRENGTH_BUTTON 0x20
#define MB_21 0x21
#define MB_SAND 0x21
#define MB_22 0x22
#define MB_ICE 0x23
#define MB_THIN_ICE 0x26
#define MB_CRACKED_ICE 0x27
#define MB_HOT_SPRINGS 0x28
#define MB_ROCK_STAIRS 0x2A
#define MB_SAND 0x2B
#define MB_SAND_CAVE 0x2B
#define MB_IMPASSABLE_EAST 0x30
#define MB_IMPASSABLE_WEST 0x31
#define MB_IMPASSABLE_NORTH 0x32