Merge branch 'master' into decompile_trainer_see

2017-12-20 17:21:46 +01:00
parent 4abc2eea8a 7e6a68a99a
commit 504363f2a6
36 changed files with 2916 additions and 3845 deletions
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -39,7 +39,7 @@ enum
    MAP_BATTLE_SCENE_PHOEBE,       // 5
    MAP_BATTLE_SCENE_GLACIA,       // 6
    MAP_BATTLE_SCENE_DRAKE,        // 7
-    MAP_BATTLE_SCENE_BATTLE_TOWER, // 8
+    MAP_BATTLE_SCENE_FRONTIER,     // 8
 };

 typedef void (*TilesetCB)(void);