Merge remote-tracking branch 'pret/master' into script_menu

This commit is contained in:
Diegoisawesome
2018-11-06 20:20:56 -06:00
236 changed files with 78716 additions and 84453 deletions
+1 -7
View File
@@ -466,13 +466,7 @@ gUnknown_0203ABB5: @ 203ABB5
.include "src/learn_move.o"
.include "src/decoration_inventory.o"
.include "src/roamer.o"
gFacilityTrainers: @ 203BC88
.space 0x4
gFacilityTrainerMons: @ 203BC8C
.space 0x4
.include "src/battle_tower.o"
.include "src/use_pokeblock.o"
.include "src/player_pc.o"
.include "src/intro.o"