Merge branch 'master' of github.com:pret/pokeemerald

sym_ewram.txt

@@ -174,9 +174,7 @@ gBattle_WIN1H: @ 2022E28
 gBattle_WIN1V: @ 2022E2A
 	.space 0x2
 
-    .include "src/battle_message.o"
 	.include "src/battle_main.o"
-
 	.include "src/pokemon.o"
 	.include "src/random.o"
 	.include "src/daycare.o"
@@ -288,9 +286,6 @@ gUnknown_02038BC6: @ 2038BC6
     .include "src/field_effect.o"
     .include "src/scanline_effect.o"
     .include "src/option_menu.o"
-	
-	.align 2
-
     .include "src/pokedex.o"
 
 gTrainerCards: @ 2039B58
@@ -681,12 +676,7 @@ gUnknown_0203AB98: @ 203AB98
 
     .include "src/coins.o"
     .include "src/battle_transition.o"
-
-gBattlerAbilities: @ 203ABA4
-	.space 0x4
-
-gStringInfo: @ 203ABA8
-	.space 0x4
+    .include "src/battle_message.o"
 
 gUnknown_0203ABAC: @ 203ABAC
 	.space 0x4
@@ -737,10 +727,6 @@ gUnknown_0203BC8C: @ 203BC8C
 	.include "src/player_pc.o"
 	.include "src/intro.o"
 	.include "src/field_region_map.o"
-
-gUnknown_0203BCD4: @ 203BCD4
-	.space 0x4
-
     .include "src/hall_of_fame.o"
     .include "src/credits.o"
     .include "src/lottery_corner.o"
@@ -748,10 +734,7 @@ gUnknown_0203BCD4: @ 203BCD4
     .include "src/berry_tag_screen.o"
     .include "src/mystery_event_menu.o"
     .include "src/save_failed_screen.o"
-
-gBraillePuzzleCallbackFlag: @ 203BD14
-	.space 0x4
-
+    .include "src/braille_puzzles.o"
 	.include "src/pokeblock_feed.o"
 	.include "src/intro_credits_graphics.o"
     .include "src/recorded_battle.o"