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

Merge branch 'master' into doc-tilesets

Browse Source
This commit is contained in:
GriffinR
2020-02-16 11:18:30 -05:00
committed by GitHub
parent 1d006c2661 51b7b11a55
commit 659afd708b
68 changed files with 1716 additions and 1745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/coins.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_CONSTANTS_COINS_H
#define GUARD_CONSTANTS_COINS_H
#define MAX_COINS 9999
#endif // GUARD_CONSTANTS_COINS_H
include/constants/field_effects.h
+1 -1
View File
@@ -65,7 +65,7 @@
#define FLDEFF_PCTURN_ON 61
#define FLDEFF_HALL_OF_FAME_RECORD 62
#define FLDEFF_USE_TELEPORT 63
#define FLDEFF_UNK_40 64
#define FLDEFF_UNK_40 64 // TODO: game corner smile icon?
#define FLDEFF_UNK_41 65 // TODO: related to vs_seeker
#define FLDEFF_UNK_42 66 // TODO: related to trainer see
#define FLDEFF_UNK_43 67 // TODO: related to deoxys
include/constants/metatile_labels.h
+10 -1
View File
@@ -39,6 +39,15 @@
#define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn 0x2C6
#define METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn 0x2C7
// gTileset_GameCorner
#define METATILE_GameCorner_Floor_ShadeFull 0x292
#define METATILE_GameCorner_Floor_StairsTop 0x29D
#define METATILE_GameCorner_StairsTop 0x29E
#define METATILE_GameCorner_StairsBottom 0x29F
#define METATILE_GameCorner_PurpleWall_Floor 0x2CF
#define METATILE_GameCorner_PurpleWall_StairsTop 0x2A6
#define METATILE_GameCorner_PurpleWall_stairsBottom 0x2A7
// gTileset_PokemonMansion
#define METATILE_PokemonMansion_Floor 0x284
#define METATILE_PokemonMansion_Floor_ShadeFull 0x285
@@ -85,7 +94,7 @@
// gTileset_MtEmber
#define METATILE_MtEmber_CaveEntrance 0x346
// Trainer Tower
// gTileset_TrainerTower
#define METATILE_TrainerTower_Floor_ShadeBottomLeft 0x287
#define METATILE_TrainerTower_CounterBarrier 0x2B4