Merge branch 'master' into doc-wnews
This commit is contained in:
@@ -36,6 +36,7 @@
|
||||
|
||||
#define B_SIDE_PLAYER 0
|
||||
#define B_SIDE_OPPONENT 1
|
||||
#define NUM_BATTLE_SIDES 2
|
||||
|
||||
#define B_FLANK_LEFT 0
|
||||
#define B_FLANK_RIGHT 1
|
||||
|
||||
@@ -684,8 +684,6 @@
|
||||
#define METATILE_SecretBase_BigPlant_TopRight 0x2E6
|
||||
#define METATILE_SecretBase_BigPlant_BaseLeft1 0x2EC
|
||||
#define METATILE_SecretBase_BigPlant_BaseRight1 0x2ED
|
||||
#define METATILE_SecretBase_BigPlant_TopLeftWall 0x2E5
|
||||
#define METATILE_SecretBase_BigPlant_TopRightWall 0x2E6
|
||||
#define METATILE_SecretBase_BigPlant_BaseLeft2 0x2EE
|
||||
#define METATILE_SecretBase_BigPlant_BaseRight2 0x2EF
|
||||
#define METATILE_SecretBase_GorgeousPlant_TopLeft 0x2F0
|
||||
|
||||
Reference in New Issue
Block a user