diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-09 20:45:02 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-09 20:45:02 -0400 |
| commit | a2f7701f3441c71b0734a28d44168576f6f28716 (patch) | |
| tree | 84fecc02816fc4fc31fdd172e8e79fc59947cedb /text.asm | |
| parent | 0d687ba25ae223f6de2c69d46fd1c3df6ad52da3 (diff) | |
| parent | 2a529796374f3798fb507931a7c8a9bad4281107 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'text.asm')
| -rw-r--r-- | text.asm | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -174,7 +174,6 @@ INCLUDE "text/maps/mt_moon_b2f.asm" INCLUDE "text/maps/ss_anne_1.asm" INCLUDE "text/maps/ss_anne_2.asm" INCLUDE "text/maps/ss_anne_3.asm" -INCLUDE "text/maps/ss_anne_4.asm" INCLUDE "text/maps/ss_anne_5.asm" INCLUDE "text/maps/ss_anne_6.asm" INCLUDE "text/maps/ss_anne_7.asm" @@ -214,8 +213,6 @@ INCLUDE "text/maps/safari_zone_secret_house.asm" INCLUDE "text/maps/safari_zone_rest_house_2.asm" INCLUDE "text/maps/safari_zone_rest_house_3.asm" INCLUDE "text/maps/safari_zone_rest_house_4.asm" -INCLUDE "text/maps/unknown_dungeon_1f.asm" -INCLUDE "text/maps/unknown_dungeon_2f.asm" INCLUDE "text/maps/unknown_dungeon_b1f.asm" INCLUDE "text/maps/victory_road_1f.asm" INCLUDE "text/maps/lance.asm" @@ -230,10 +227,6 @@ INCLUDE "text/maps/rock_tunnel_b2f_1.asm" SECTION "Text 3", ROMX, BANK[TEXT_3] INCLUDE "text/maps/rock_tunnel_b2f_2.asm" -INCLUDE "text/maps/seafoam_islands_1f.asm" -INCLUDE "text/maps/seafoam_islands_b1f.asm" -INCLUDE "text/maps/seafoam_islands_b2f.asm" -INCLUDE "text/maps/seafoam_islands_b3f.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" _AIBattleWithdrawText:: @@ -1948,7 +1941,6 @@ INCLUDE "text/maps/daycare_1.asm" SECTION "Text 4", ROMX, BANK[TEXT_4] INCLUDE "text/maps/daycare_2.asm" -INCLUDE "text/maps/underground_path_route_5_entrance.asm" INCLUDE "text/maps/underground_path_route_6_entrance.asm" INCLUDE "text/maps/underground_path_route_7_entrance.asm" INCLUDE "text/maps/underground_path_route_7_entrance_unused.asm" @@ -1969,9 +1961,6 @@ INCLUDE "text/maps/route_16_gate_upstairs.asm" INCLUDE "text/maps/route_16_house.asm" INCLUDE "text/maps/route_18_gate.asm" INCLUDE "text/maps/route_18_gate_upstairs.asm" -IF DEF(_OPTION_BEACH_HOUSE) -INCLUDE "text/maps/beach_house.asm" -ENDC INCLUDE "text/maps/pokemon_league_gate.asm" INCLUDE "text/maps/victory_road_2f.asm" INCLUDE "text/maps/bills_house.asm" |