merge with master, fix conflicts

This commit is contained in:
DizzyEggg committed 2017-10-20 10:49:21 +02:00
commit b65da491a9
60 files changed
+6252 -10191

No files matched your search

+2
View File
@@ -1,6 +1,8 @@
#ifndef GUARD_BATTLE_INTERFACE_H
#define GUARD_BATTLE_INTERFACE_H
#include "battle_controllers.h"
#define TAG_HEALTHBOX_PLAYER1_TILE 0xD6FF
#define TAG_HEALTHBOX_PLAYER2_TILE 0xD700
#define TAG_HEALTHBOX_OPPONENT1_TILE 0xD701