diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-19 13:09:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 13:09:16 -0400 |
| commit | edb624c20ceb50eef9d73a5df0ac041cc156dd32 (patch) | |
| tree | 44e584f918b28e4be2fd58798dd43e34cf0001dd /main.asm | |
| parent | 094fe56cb67e2363afb12016ca4b9ddedc333065 (diff) | |
| parent | 0e0f43747db3b55f21218d8ead5a9364564b8a96 (diff) | |
Merge pull request #550 from mid-kid/master
Misc things
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -57,6 +57,7 @@ INCLUDE "engine/events/whiteout.asm" INCLUDE "engine/events/forced_movement.asm" INCLUDE "engine/events/itemfinder.asm" INCLUDE "engine/menus/start_menu.asm" +INCLUDE "engine/pokemon/mon_menu.asm" INCLUDE "engine/overworld/select_menu.asm" INCLUDE "engine/events/elevator.asm" INCLUDE "engine/events/bug_contest/contest.asm" @@ -109,7 +110,7 @@ INCLUDE "engine/overworld/map_objects_2.asm" INCLUDE "engine/menus/scrolling_menu.asm" INCLUDE "engine/items/switch_items.asm" INCLUDE "engine/menus/menu_2.asm" -INCLUDE "engine/pokemon/mon_menu.asm" +INCLUDE "engine/pokemon/mon_submenu.asm" INCLUDE "engine/battle/menu.asm" INCLUDE "engine/items/buy_sell_toss.asm" INCLUDE "engine/menus/trainer_card.asm" @@ -144,6 +145,7 @@ INCLUDE "engine/battle/ai/redundant.asm" INCLUDE "engine/events/move_deleter.asm" INCLUDE "engine/link/mystery_gift_2.asm" INCLUDE "engine/items/tmhm.asm" +INCLUDE "engine/pokemon/print_move_description.asm" INCLUDE "data/moves/descriptions.asm" INCLUDE "engine/events/pokerus/pokerus.asm" INCLUDE "engine/battle/start_battle.asm" |