diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-11-24 03:57:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 03:57:20 -0500 |
| commit | 083d51fd588d9752b8f7c5d104cffc3896d51b5b (patch) | |
| tree | bd4653897d7454551000479e374584351f3e8578 /main.asm | |
| parent | 5e104de3f5bdff54efd5ee562345236c0cdab5b5 (diff) | |
| parent | 0e311ad709ec65ce65dea962666d014f825da869 (diff) | |
Merge pull request #662 from Rangi42/master
Resolve miscellaneous issue #658
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 18 |
1 files changed, 13 insertions, 5 deletions
@@ -87,7 +87,6 @@ INCLUDE "engine/events/daycare.asm" INCLUDE "engine/events/print_unown.asm" INCLUDE "engine/events/print_photo.asm" INCLUDE "engine/pokemon/breeding.asm" -INCLUDE "gfx/tilesets.asm" SECTION "Roofs", ROMX @@ -518,6 +517,8 @@ INCLUDE "engine/events/npc_trade.asm" INCLUDE "engine/events/mom_phone.asm" +SECTION "mobile40", ROMX + INCLUDE "mobile/mobile_40.asm" @@ -532,7 +533,7 @@ INCLUDE "mobile/mobile_41.asm" INCLUDE "engine/gfx/load_overworld_font.asm" -SECTION "Mobile 42", ROMX +SECTION "mobile42", ROMX INCLUDE "mobile/mobile_42.asm" @@ -549,8 +550,15 @@ INCLUDE "engine/movie/unused_title.asm" INCLUDE "engine/movie/title.asm" +SECTION "mobile45", ROMX + INCLUDE "mobile/mobile_45.asm" +INCLUDE "mobile/mobile_45_sprite_engine.asm" +INCLUDE "mobile/mobile_45_2.asm" +INCLUDE "mobile/mobile_45_stadium.asm" + +SECTION "mobile46", ROMX INCLUDE "mobile/mobile_46.asm" @@ -566,7 +574,7 @@ INCLUDE "mobile/mobile_5b.asm" INCLUDE "engine/link/link_trade.asm" -SECTION "Mobile 5C", ROMX +SECTION "mobile5C", ROMX INCLUDE "mobile/mobile_5c.asm" @@ -595,12 +603,12 @@ SECTION "UpdateBattleHUDs", ROMX INCLUDE "engine/battle/update_battle_huds.asm" -SECTION "Mobile 5E", ROMX +SECTION "mobile5E", ROMX INCLUDE "mobile/mobile_5e.asm" -SECTION "Mobile 5F", ROMX +SECTION "mobile5F", ROMX INCLUDE "mobile/mobile_5f.asm" |