diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/collision/collision_type_table.asm | 4 | ||||
-rw-r--r-- | data/items/attributes.asm | 4 | ||||
-rw-r--r-- | data/items/names.asm | 12 | ||||
-rw-r--r-- | data/maps/attributes.asm | 458 | ||||
-rw-r--r-- | data/maps/landmarks.asm | 4 | ||||
-rw-r--r-- | data/maps/maps.asm | 4 | ||||
-rw-r--r-- | data/moves/names.asm | 4 | ||||
-rw-r--r-- | data/moves/tmhm_moves.asm | 4 | ||||
-rw-r--r-- | data/pokemon/base_stats.asm | 4 | ||||
-rw-r--r-- | data/pokemon/dex_order_alpha.asm | 4 | ||||
-rw-r--r-- | data/pokemon/evos_attacks.asm | 4 | ||||
-rw-r--r-- | data/pokemon/names.asm | 4 | ||||
-rw-r--r-- | data/tileset_headers.asm | 12 | ||||
-rw-r--r-- | data/trainers/class_names.asm | 4 | ||||
-rw-r--r-- | data/trainers/parties.asm | 100 | ||||
-rw-r--r-- | data/types/names.asm | 4 | ||||
-rw-r--r-- | data/types/search_strings.asm | 4 | ||||
-rw-r--r-- | data/types/search_types.asm | 4 | ||||
-rw-r--r-- | data/types/type_matchups.asm | 4 | ||||
-rw-r--r-- | data/wild.asm | 4 |
20 files changed, 323 insertions, 323 deletions
diff --git a/data/collision/collision_type_table.asm b/data/collision/collision_type_table.asm index df3dc33..a4ec2ba 100644 --- a/data/collision/collision_type_table.asm +++ b/data/collision/collision_type_table.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Collision Type Table", ROMX[$4664], BANK[$03] +SECTION "data/collision/collision_type_table.asm", ROMX CollisionTypeTable: ; 03:4664 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $00 @@ -66,4 +66,4 @@ CollisionTypeTable: ; 03:4664 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $F4 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $F8 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $FC - db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, ALWAYS_SOLID ; $100 + db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, ALWAYS_SOLID ; $100
\ No newline at end of file diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 4308b44..1e54451 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -7,7 +7,7 @@ item_attribute: MACRO dn \6, \7 ENDM -SECTION "Item Attributes", ROMX [$68f3], BANK [$01] +SECTION "data/items/attributes.asm", ROMX ItemAttributes:: ; 68f3 ; ITEM_MASTER_BALL @@ -517,4 +517,4 @@ ItemAttributes:: ; 68f3 ; ITEM_HM06 item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ITEM_HM07 - item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY
\ No newline at end of file diff --git a/data/items/names.asm b/data/items/names.asm index 942af41..0036cd6 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "ItemNames", ROMX[$6FEC], BANK[$01] -else -SECTION "ItemNames", ROMX[$6FE9], BANK[$01] -endc +; if DEBUG +SECTION "data/items/names.asm", ROMX +; else +; SECTION "ItemNames", ROMX[$6FE9], BANK[$01] +; endc ItemNames:: db "マスターボール@" ; MASTER_BALL @@ -261,4 +261,4 @@ ItemNames:: db "ひでんマシン05@" ; HM05 db "ひでんマシン06@" ; HM06 db "ひでんマシン07@" ; HM07 - db "しようきんし@" ; FF + db "しようきんし@" ; FF
\ No newline at end of file diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 4ff1d0e..a902a09 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -67,770 +67,770 @@ elif "\1" == "east" endc ENDM -SECTION "Route2Gate1F", ROMX[$4000], BANK[$25] +SECTION "data/maps/attributes.asm@Route2Gate1F", ROMX map_attributes Route2Gate1F, ROUTE_2_GATE_1F, 0 -SECTION "Route2Gate2F", ROMX[$407C], BANK[$25] +SECTION "data/maps/attributes.asm@Route2Gate2F", ROMX map_attributes Route2Gate2F, ROUTE_2_GATE_2F, 0 -SECTION "Route2House", ROMX[$40DC], BANK[$25] +SECTION "data/maps/attributes.asm@Route2House", ROMX map_attributes Route2House, ROUTE_2_HOUSE, 0 -SECTION "OldCityMuseum", ROMX[$414A], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityMuseum", ROMX map_attributes OldCityMuseum, OLD_CITY_MUSEUM, 0 -SECTION "OldCityGym", ROMX[$41CD], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityGym", ROMX map_attributes OldCityGym, OLD_CITY_GYM, 0 -SECTION "OldCityTower1F", ROMX[$4289], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityTower1F", ROMX map_attributes OldCityTower1F, OLD_CITY_TOWER_1F, 0 -SECTION "OldCityTower2F", ROMX[$4319], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityTower2F", ROMX map_attributes OldCityTower2F, OLD_CITY_TOWER_2F, 0 -SECTION "OldCityTower3F", ROMX[$439E], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityTower3F", ROMX map_attributes OldCityTower3F, OLD_CITY_TOWER_3F, 0 -SECTION "OldCityTower4F", ROMX[$4423], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityTower4F", ROMX map_attributes OldCityTower4F, OLD_CITY_TOWER_4F, 0 -SECTION "OldCityTower5F", ROMX[$44A8], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityTower5F", ROMX map_attributes OldCityTower5F, OLD_CITY_TOWER_5F, 0 -SECTION "OldCityBillsHouse", ROMX[$44FC], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityBillsHouse", ROMX map_attributes OldCityBillsHouse, OLD_CITY_BILLS_HOUSE, 0 -SECTION "OldCityMart", ROMX[$456A], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityMart", ROMX map_attributes OldCityMart, OLD_CITY_MART, 0 -SECTION "OldCityHouse", ROMX[$45EE], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityHouse", ROMX map_attributes OldCityHouse, OLD_CITY_HOUSE, 0 -SECTION "OldCityPokecenter1F", ROMX[$466E], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityPokecenter1F", ROMX map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, 0 -SECTION "OldCityPokecenter2F", ROMX[$46FE], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityPokecenter2F", ROMX map_attributes OldCityPokecenter2F, OLD_CITY_POKECENTER_2F, 0 -SECTION "OldCityPokecenterTrade", ROMX[$4826], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityPokecenterTrade", ROMX map_attributes OldCityPokecenterTrade, OLD_CITY_POKECENTER_TRADE, 0 -SECTION "OldCityPokecenterBattle", ROMX[$48AC], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityPokecenterBattle", ROMX map_attributes OldCityPokecenterBattle, OLD_CITY_POKECENTER_BATTLE, 0 -SECTION "OldCityPokecenterTimeMachine", ROMX[$492F], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityPokecenterTimeMachine", ROMX map_attributes OldCityPokecenterTimeMachine, OLD_CITY_POKECENTER_TIME_MACHINE, 0 -SECTION "OldCityKurtsHouse", ROMX[$49AC], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityKurtsHouse", ROMX map_attributes OldCityKurtsHouse, OLD_CITY_KURTS_HOUSE, 0 -SECTION "OldCitySchool", ROMX[$4A26], BANK[$25] +SECTION "data/maps/attributes.asm@OldCitySchool", ROMX map_attributes OldCitySchool, OLD_CITY_SCHOOL, 0 -SECTION "Route1Gate1F", ROMX[$4000], BANK[$26] +SECTION "data/maps/attributes.asm@Route1Gate1F", ROMX map_attributes Route1Gate1F, ROUTE_1_GATE_1F, 0 -SECTION "Route1Gate2F", ROMX[$40DA], BANK[$26] +SECTION "data/maps/attributes.asm@Route1Gate2F", ROMX map_attributes Route1Gate2F, ROUTE_1_GATE_2F, 0 -SECTION "WestMart1F", ROMX[$4224], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart1F", ROMX map_attributes WestMart1F, WEST_MART_1F, 0 -SECTION "WestMart2F", ROMX[$42A0], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart2F", ROMX map_attributes WestMart2F, WEST_MART_2F, 0 -SECTION "WestMart3F", ROMX[$4374], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart3F", ROMX map_attributes WestMart3F, WEST_MART_3F, 0 -SECTION "WestMart4F", ROMX[$4433], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart4F", ROMX map_attributes WestMart4F, WEST_MART_4F, 0 -SECTION "WestMart5F", ROMX[$44F2], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart5F", ROMX map_attributes WestMart5F, WEST_MART_5F, 0 -SECTION "WestMart6F", ROMX[$4581], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart6F", ROMX map_attributes WestMart6F, WEST_MART_6F, 0 -SECTION "WestMartElevator", ROMX[$460E], BANK[$26] +SECTION "data/maps/attributes.asm@WestMartElevator", ROMX map_attributes WestMartElevator, WEST_MART_ELEVATOR, 0 -SECTION "WestRadioTower1F", ROMX[$464B], BANK[$26] +SECTION "data/maps/attributes.asm@WestRadioTower1F", ROMX map_attributes WestRadioTower1F, WEST_RADIO_TOWER_1F, 0 -SECTION "WestRadioTower2F", ROMX[$46CA], BANK[$26] +SECTION "data/maps/attributes.asm@WestRadioTower2F", ROMX map_attributes WestRadioTower2F, WEST_RADIO_TOWER_2F, 0 -SECTION "WestRadioTower3F", ROMX[$4772], BANK[$26] +SECTION "data/maps/attributes.asm@WestRadioTower3F", ROMX map_attributes WestRadioTower3F, WEST_RADIO_TOWER_3F, 0 -SECTION "WestRadioTower4F", ROMX[$4827], BANK[$26] +SECTION "data/maps/attributes.asm@WestRadioTower4F", ROMX map_attributes WestRadioTower4F, WEST_RADIO_TOWER_4F, 0 -SECTION "WestRadioTower5F", ROMX[$48E9], BANK[$26] +SECTION "data/maps/attributes.asm@WestRadioTower5F", ROMX map_attributes WestRadioTower5F, WEST_RADIO_TOWER_5F, 0 -SECTION "WestRocketRaidedHouse", ROMX[$499F], BANK[$26] +SECTION "data/maps/attributes.asm@WestRocketRaidedHouse", ROMX map_attributes WestRocketRaidedHouse, WEST_ROCKET_RAIDED_HOUSE, 0 -SECTION "WestPokecenter1F", ROMX[$4A49], BANK[$26] +SECTION "data/maps/attributes.asm@WestPokecenter1F", ROMX map_attributes WestPokecenter1F, WEST_POKECENTER_1F, 0 -SECTION "WestPokecenter2F", ROMX[$4AE1], BANK[$26] +SECTION "data/maps/attributes.asm@WestPokecenter2F", ROMX map_attributes WestPokecenter2F, WEST_POKECENTER_2F, 0 -SECTION "WestGym", ROMX[$4B5E], BANK[$26] +SECTION "data/maps/attributes.asm@WestGym", ROMX map_attributes WestGym, WEST_GYM, 0 -SECTION "WestHouse1", ROMX[$4C1A], BANK[$26] +SECTION "data/maps/attributes.asm@WestHouse1", ROMX map_attributes WestHouse1, WEST_HOUSE_1, 0 -SECTION "WestHouse2", ROMX[$4C9E], BANK[$26] +SECTION "data/maps/attributes.asm@WestHouse2", ROMX map_attributes WestHouse2, WEST_HOUSE_2, 0 -SECTION "HaitekuWestRouteGate", ROMX[$4000], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuWestRouteGate", ROMX map_attributes HaitekuWestRouteGate, HAITEKU_WEST_ROUTE_GATE, 0 -SECTION "HaitekuPokecenter1F", ROMX[$405B], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuPokecenter1F", ROMX map_attributes HaitekuPokecenter1F, HAITEKU_POKECENTER_1F, 0 -SECTION "HaitekuPokecenter2F", ROMX[$40EF], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuPokecenter2F", ROMX map_attributes HaitekuPokecenter2F, HAITEKU_POKECENTER_2F, 0 -SECTION "HaitekuLeague1F", ROMX[$4168], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuLeague1F", ROMX map_attributes HaitekuLeague1F, HAITEKU_LEAGUE_1F, 0 -SECTION "HaitekuLeague2F", ROMX[$4209], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuLeague2F", ROMX map_attributes HaitekuLeague2F, HAITEKU_LEAGUE_2F, 0 -SECTION "HaitekuMart", ROMX[$42A9], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuMart", ROMX map_attributes HaitekuMart, HAITEKU_MART, 0 -SECTION "HaitekuHouse1", ROMX[$4329], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuHouse1", ROMX map_attributes HaitekuHouse1, HAITEKU_HOUSE_1, 0 -SECTION "HaitekuHouse2", ROMX[$4383], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuHouse2", ROMX map_attributes HaitekuHouse2, HAITEKU_HOUSE_2, 0 -SECTION "HaitekuImposterOakHouse", ROMX[$43DD], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuImposterOakHouse", ROMX map_attributes HaitekuImposterOakHouse, HAITEKU_IMPOSTER_OAK_HOUSE, 0 -SECTION "HaitekuAquarium1F", ROMX[$4444], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuAquarium1F", ROMX map_attributes HaitekuAquarium1F, HAITEKU_AQUARIUM_1F, 0 -SECTION "HaitekuAquarium2F", ROMX[$44CB], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuAquarium2F", ROMX map_attributes HaitekuAquarium2F, HAITEKU_AQUARIUM_2F, 0 -SECTION "FontoRouteGate1", ROMX[$4537], BANK[$27] +SECTION "data/maps/attributes.asm@FontoRouteGate1", ROMX map_attributes FontoRouteGate1, FONTO_ROUTE_GATE_1, 0 -SECTION "FontoRouteGate2", ROMX[$4592], BANK[$27] +SECTION "data/maps/attributes.asm@FontoRouteGate2", ROMX map_attributes FontoRouteGate2, FONTO_ROUTE_GATE_2, 0 -SECTION "FontoRouteGate3", ROMX[$45ED], BANK[$27] +SECTION "data/maps/attributes.asm@FontoRouteGate3", ROMX map_attributes FontoRouteGate3, FONTO_ROUTE_GATE_3, 0 -SECTION "FontoRocketHouse", ROMX[$4648], BANK[$27] +SECTION "data/maps/attributes.asm@FontoRocketHouse", ROMX map_attributes FontoRocketHouse, FONTO_ROCKET_HOUSE, 0 -SECTION "FontoMart", ROMX[$46D5], BANK[$27] +SECTION "data/maps/attributes.asm@FontoMart", ROMX map_attributes FontoMart, FONTO_MART, 0 -SECTION "FontoHouse", ROMX[$4755], BANK[$27] +SECTION "data/maps/attributes.asm@FontoHouse", ROMX map_attributes FontoHouse, FONTO_HOUSE, 0 -SECTION "FontoPokecenter1F", ROMX[$47AF], BANK[$27] +SECTION "data/maps/attributes.asm@FontoPokecenter1F", ROMX map_attributes FontoPokecenter1F, FONTO_POKECENTER_1F, 0 -SECTION "FontoPokecenter2F", ROMX[$4843], BANK[$27] +SECTION "data/maps/attributes.asm@FontoPokecenter2F", ROMX map_attributes FontoPokecenter2F, FONTO_POKECENTER_2F, 0 -SECTION "FontoLab", ROMX[$48BC], BANK[$27] +SECTION "data/maps/attributes.asm@FontoLab", ROMX map_attributes FontoLab, FONTO_LAB, 0 -SECTION "BaadonMart", ROMX[$4923], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonMart", ROMX map_attributes BaadonMart, BAADON_MART, 0 -SECTION "BaadonPokecenter1F", ROMX[$49A3], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonPokecenter1F", ROMX map_attributes BaadonPokecenter1F, BAADON_POKECENTER_1F, 0 -SECTION "BaadonPokecenter2F", ROMX[$4A2A], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonPokecenter2F", ROMX map_attributes BaadonPokecenter2F, BAADON_POKECENTER_2F, 0 -SECTION "BaadonHouse1", ROMX[$4AA3], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonHouse1", ROMX map_attributes BaadonHouse1, BAADON_HOUSE_1, 0 -SECTION "BaadonWallpaperHouse", ROMX[$4AF9], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonWallpaperHouse", ROMX map_attributes BaadonWallpaperHouse, BAADON_WALLPAPER_HOUSE, 0 -SECTION "BaadonHouse2", ROMX[$4B42], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonHouse2", ROMX map_attributes BaadonHouse2, BAADON_HOUSE_2, 0 -SECTION "BaadonLeague1F", ROMX[$4B9C], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonLeague1F", ROMX map_attributes BaadonLeague1F, BAADON_LEAGUE_1F, 0 -SECTION "BaadonLeague2F", ROMX[$4C3D], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonLeague2F", ROMX map_attributes BaadonLeague2F, BAADON_LEAGUE_2F, 0 -SECTION "BaadonRouteGateWest", ROMX[$4CDD], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonRouteGateWest", ROMX map_attributes BaadonRouteGateWest, BAADON_ROUTE_GATE_WEST, 0 -SECTION "BaadonRouteGateNewtype", ROMX[$4D38], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonRouteGateNewtype", ROMX map_attributes BaadonRouteGateNewtype, BAADON_ROUTE_GATE_NEWTYPE, 0 -SECTION "NewtypePokecenter1F", ROMX[$4D93], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypePokecenter1F", ROMX map_attributes NewtypePokecenter1F, NEWTYPE_POKECENTER_1F, 0 -SECTION "NewtypePokecenter2F", ROMX[$4E27], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypePokecenter2F", ROMX map_attributes NewtypePokecenter2F, NEWTYPE_POKECENTER_2F, 0 -SECTION "NewtypeLeague1F", ROMX[$4EA0], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeLeague1F", ROMX map_attributes NewtypeLeague1F, NEWTYPE_LEAGUE_1F, 0 -SECTION "NewtypeLeague2F", ROMX[$4F41], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeLeague2F", ROMX map_attributes NewtypeLeague2F, NEWTYPE_LEAGUE_2F, 0 -SECTION "NewtypeSailorHouse", ROMX[$4FE1], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeSailorHouse", ROMX map_attributes NewtypeSailorHouse, NEWTYPE_SAILOR_HOUSE, 0 -SECTION "NewtypeMart", ROMX[$503B], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeMart", ROMX map_attributes NewtypeMart, NEWTYPE_MART, 0 -SECTION "NewtypeDojo", ROMX[$50BB], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeDojo", ROMX map_attributes NewtypeDojo, NEWTYPE_DOJO, 0 -SECTION "NewtypeHouse1", ROMX[$5155], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeHouse1", ROMX map_attributes NewtypeHouse1, NEWTYPE_HOUSE_1, 0 -SECTION "NewtypeDiner", ROMX[$51AF], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeDiner", ROMX map_attributes NewtypeDiner, NEWTYPE_DINER, 0 -SECTION "NewtypeHouse2", ROMX[$522C], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeHouse2", ROMX map_attributes NewtypeHouse2, NEWTYPE_HOUSE_2, 0 -SECTION "NewtypeHouse3", ROMX[$5286], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeHouse3", ROMX map_attributes NewtypeHouse3, NEWTYPE_HOUSE_3, 0 -SECTION "Route15Pokecenter1F", ROMX[$52E0], BANK[$27] +SECTION "data/maps/attributes.asm@Route15Pokecenter1F", ROMX map_attributes Route15Pokecenter1F, ROUTE_15_POKECENTER_1F, 0 -SECTION "Route15Pokecenter2F", ROMX[$5374], BANK[$27] +SECTION "data/maps/attributes.asm@Route15Pokecenter2F", ROMX map_attributes Route15Pokecenter2F, ROUTE_15_POKECENTER_2F, 0 -SECTION "NewtypeRouteGate", ROMX[$53C6], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeRouteGate", ROMX map_attributes NewtypeRouteGate, NEWTYPE_ROUTE_GATE, 0 -SECTION "Route18Pokecenter1F", ROMX[$5421], BANK[$27] +SECTION "data/maps/attributes.asm@Route18Pokecenter1F", ROMX map_attributes Route18Pokecenter1F, ROUTE_18_POKECENTER_1F, 0 -SECTION "Route18Pokecenter2F", ROMX[$54B5], BANK[$27] +SECTION "data/maps/attributes.asm@Route18Pokecenter2F", ROMX map_attributes Route18Pokecenter2F, ROUTE_18_POKECENTER_2F, 0 -SECTION "SugarRouteGate", ROMX[$5507], BANK[$27] +SECTION "data/maps/attributes.asm@SugarRouteGate", ROMX map_attributes SugarRouteGate, SUGAR_ROUTE_GATE, 0 -SECTION "SugarHouse", ROMX[$5562], BANK[$27] +SECTION "data/maps/attributes.asm@SugarHouse", ROMX map_attributes SugarHouse, SUGAR_HOUSE, 0 -SECTION "SugarHouse2", ROMX[$55E2], BANK[$27] +SECTION "data/maps/attributes.asm@SugarHouse2", ROMX map_attributes SugarHouse2, SUGAR_HOUSE_2, 0 -SECTION "SugarMart", ROMX[$5638], BANK[$27] +SECTION "data/maps/attributes.asm@SugarMart", ROMX map_attributes SugarMart, SUGAR_MART, 0 -SECTION "SugarPokecenter1F", ROMX[$56B8], BANK[$27] +SECTION "data/maps/attributes.asm@SugarPokecenter1F", ROMX map_attributes SugarPokecenter1F, SUGAR_POKECENTER_1F, 0 -SECTION "SugarPokecenter2F", ROMX[$574C], BANK[$27] +SECTION "data/maps/attributes.asm@SugarPokecenter2F", ROMX map_attributes SugarPokecenter2F, SUGAR_POKECENTER_2F, 0 -SECTION "BullForestRoute1House", ROMX[$57C5], BANK[$27] +SECTION "data/maps/attributes.asm@BullForestRoute1House", ROMX map_attributes BullForestRoute1House, BULL_FOREST_ROUTE_1_HOUSE, 0 -SECTION "BullForestRouteGateStand", ROMX[$581F], BANK[$27] +SECTION "data/maps/attributes.asm@BullForestRouteGateStand", ROMX map_attributes BullForestRouteGateStand, BULL_FOREST_ROUTE_GATE_STAND, 0 -SECTION "BullMart", ROMX[$587A], BANK[$27] +SECTION "data/maps/attributes.asm@BullMart", ROMX map_attributes BullMart, BULL_MART, 0 -SECTION "BullHouse1", ROMX[$58FA], BANK[$27] +SECTION "data/maps/attributes.asm@BullHouse1", ROMX map_attributes BullHouse1, BULL_HOUSE_1, 0 -SECTION "BullHouse2", ROMX[$5950], BANK[$27] +SECTION "data/maps/attributes.asm@BullHouse2", ROMX map_attributes BullHouse2, BULL_HOUSE_2, 0 -SECTION "BullHouse3", ROMX[$59AA], BANK[$27] +SECTION "data/maps/attributes.asm@BullHouse3", ROMX map_attributes BullHouse3, BULL_HOUSE_3, 0 -SECTION "BullPokecenter1F", ROMX[$5A04], BANK[$27] +SECTION "data/maps/attributes.asm@BullPokecenter1F", ROMX map_attributes BullPokecenter1F, BULL_POKECENTER_1F, 0 -SECTION "BullPokecenter2F", ROMX[$5A98], BANK[$27] +SECTION "data/maps/attributes.asm@BullPokecenter2F", ROMX map_attributes BullPokecenter2F, BULL_POKECENTER_2F, 0 -SECTION "BullLeague1F", ROMX[$5B11], BANK[$27] +SECTION "data/maps/attributes.asm@BullLeague1F", ROMX map_attributes BullLeague1F, BULL_LEAGUE_1F, 0 -SECTION "BullLeague2F", ROMX[$5BB2], BANK[$27] +SECTION "data/maps/attributes.asm@BullLeague2F", ROMX map_attributes BullLeague2F, BULL_LEAGUE_2F, 0 -SECTION "BullHouse4", ROMX[$5C52], BANK[$27] +SECTION "data/maps/attributes.asm@BullHouse4", ROMX map_attributes BullHouse4, BULL_HOUSE_4, 0 -SECTION "StandRouteGateKanto", ROMX[$5C9F], BANK[$27] +SECTION "data/maps/attributes.asm@StandRouteGateKanto", ROMX map_attributes StandRouteGateKanto, STAND_ROUTE_GATE_KANTO, 0 -SECTION "StandLab", ROMX[$5CFA], BANK[$27] +SECTION "data/maps/attributes.asm@StandLab", ROMX map_attributes StandLab, STAND_LAB, 0 -SECTION "StandPokecenter1F", ROMX[$5D50], BANK[$27] +SECTION "data/maps/attributes.asm@StandPokecenter1F", ROMX map_attributes StandPokecenter1F, STAND_POKECENTER_1F, 0 -SECTION "StandPokecenter2F", ROMX[$5DE4], BANK[$27] +SECTION "data/maps/attributes.asm@StandPokecenter2F", ROMX map_attributes StandPokecenter2F, STAND_POKECENTER_2F, 0 -SECTION "StandOffice", ROMX[$5E5D], BANK[$27] +SECTION "data/maps/attributes.asm@StandOffice", ROMX map_attributes StandOffice, STAND_OFFICE, 0 -SECTION "StandMart", ROMX[$5EDD], BANK[$27] +SECTION "data/maps/attributes.asm@StandMart", ROMX map_attributes StandMart, STAND_MART, 0 -SECTION "StandHouse", ROMX[$5F5D], BANK[$27] +SECTION "data/maps/attributes.asm@StandHouse", ROMX map_attributes StandHouse, STAND_HOUSE, 0 -SECTION "StandRocketHouse1F", ROMX[$5FB7], BANK[$27] +SECTION "data/maps/attributes.asm@StandRocketHouse1F", ROMX map_attributes StandRocketHouse1F, STAND_ROCKET_HOUSE_1F, 0 -SECTION "StandRocketHouse2F", ROMX[$6024], BANK[$27] +SECTION "data/maps/attributes.asm@StandRocketHouse2F", ROMX map_attributes StandRocketHouse2F, STAND_ROCKET_HOUSE_2F, 0 -SECTION "StandLeague1F", ROMX[$6083], BANK[$27] +SECTION "data/maps/attributes.asm@StandLeague1F", ROMX map_attributes StandLeague1F, STAND_LEAGUE_1F, 0 -SECTION "StandLeague2F", ROMX[$6124], BANK[$27] +SECTION "data/maps/attributes.asm@StandLeague2F", ROMX map_attributes StandLeague2F, STAND_LEAGUE_2F, 0 -SECTION "KantoCeruleanHouse", ROMX[$61C4], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeruleanHouse", ROMX map_attributes KantoCeruleanHouse, KANTO_CERULEAN_HOUSE, 0 -SECTION "KantoPokecenter1F", ROMX[$621E], BANK[$27] +SECTION "data/maps/attributes.asm@KantoPokecenter1F", ROMX map_attributes KantoPokecenter1F, KANTO_POKECENTER_1F, 0 -SECTION "KantoPokecenter2F", ROMX[$62B2], BANK[$27] +SECTION "data/maps/attributes.asm@KantoPokecenter2F", ROMX map_attributes KantoPokecenter2F, KANTO_POKECENTER_2F, 0 -SECTION "KantoLeague1F", ROMX[$632B], BANK[$27] +SECTION "data/maps/attributes.asm@KantoLeague1F", ROMX map_attributes KantoLeague1F, KANTO_LEAGUE_1F, 0 -SECTION "KantoLeague2F", ROMX[$63CC], BANK[$27] +SECTION "data/maps/attributes.asm@KantoLeague2F", ROMX map_attributes KantoLeague2F, KANTO_LEAGUE_2F, 0 -SECTION "KantoLavenderHouse", ROMX[$646C], BANK[$27] +SECTION "data/maps/attributes.asm@KantoLavenderHouse", ROMX map_attributes KantoLavenderHouse, KANTO_LAVENDER_HOUSE, 0 -SECTION "KantoCeladonMart1F", ROMX[$64D3], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonMart1F", ROMX map_attributes KantoCeladonMart1F, KANTO_CELADON_MART_1F, 0 -SECTION "KantoCeladonMart2F", ROMX[$6547], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonMart2F", ROMX map_attributes KantoCeladonMart2F, KANTO_CELADON_MART_2F, 0 -SECTION "KantoCeladonMart3F", ROMX[$65C1], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonMart3F", ROMX map_attributes KantoCeladonMart3F, KANTO_CELADON_MART_3F, 0 -SECTION "KantoCeladonMart4F", ROMX[$663B], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonMart4F", ROMX map_attributes KantoCeladonMart4F, KANTO_CELADON_MART_4F, 0 -SECTION "KantoCeladonMart5F", ROMX[$66C2], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonMart5F", ROMX map_attributes KantoCeladonMart5F, KANTO_CELADON_MART_5F, 0 -SECTION "KantoCeladonElevator", ROMX[$6742], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonElevator", ROMX map_attributes KantoCeladonElevator, KANTO_CELADON_ELEVATOR, 0 -SECTION "KantoMart", ROMX[$677F], BANK[$27] +SECTION "data/maps/attributes.asm@KantoMart", ROMX map_attributes KantoMart, KANTO_MART, 0 -SECTION "KantoGamefreakHQ1", ROMX[$67FF], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGamefreakHQ1", ROMX map_attributes KantoGamefreakHQ1, KANTO_GAMEFREAK_HQ_1, 0 -SECTION "KantoGamefreakHQ2", ROMX[$6899], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGamefreakHQ2", ROMX map_attributes KantoGamefreakHQ2, KANTO_GAMEFREAK_HQ_2, 0 -SECTION "KantoGamefreakHQ3", ROMX[$6905], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGamefreakHQ3", ROMX map_attributes KantoGamefreakHQ3, KANTO_GAMEFREAK_HQ_3, 0 -SECTION "KantoGamefreakHQ4", ROMX[$698B], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGamefreakHQ4", ROMX map_attributes KantoGamefreakHQ4, KANTO_GAMEFREAK_HQ_4, 0 -SECTION "KantoGamefreakHQ5", ROMX[$69E3], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGamefreakHQ5", ROMX map_attributes KantoGamefreakHQ5, KANTO_GAMEFREAK_HQ_5, 0 -SECTION "KantoSilphCo", ROMX[$6A2C], BANK[$27] +SECTION "data/maps/attributes.asm@KantoSilphCo", ROMX map_attributes KantoSilphCo, KANTO_SILPH_CO, 0 -SECTION "KantoViridianHouse", ROMX[$6ADF], BANK[$27] +SECTION "data/maps/attributes.asm@KantoViridianHouse", ROMX map_attributes KantoViridianHouse, KANTO_VIRIDIAN_HOUSE, 0 -SECTION "KantoGameCorner", ROMX[$6B46], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGameCorner", ROMX map_attributes KantoGameCorner, KANTO_GAME_CORNER, 0 -SECTION "KantoUnusedArea", ROMX[$6C55], BANK[$27] +SECTION "data/maps/attributes.asm@KantoUnusedArea", ROMX map_attributes KantoUnusedArea, KANTO_UNUSED_AREA, 0 -SECTION "KantoGameCornerPrizes", ROMX[$6C90], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGameCornerPrizes", ROMX map_attributes KantoGameCornerPrizes, KANTO_GAME_CORNER_PRIZES, 0 -SECTION "KantoDiner", ROMX[$6D04], BANK[$27] +SECTION "data/maps/attributes.asm@KantoDiner", ROMX map_attributes KantoDiner, KANTO_DINER, 0 -SECTION "KantoSchool", ROMX[$6D51], BANK[$27] +SECTION "data/maps/attributes.asm@KantoSchool", ROMX map_attributes KantoSchool, KANTO_SCHOOL, 0 -SECTION "KantoHospital", ROMX[$6DEB], BANK[$27] +SECTION "data/maps/attributes.asm@KantoHospital", ROMX map_attributes KantoHospital, KANTO_HOSPITAL, 0 -SECTION "KantoPokecenter21F", ROMX[$6E6B], BANK[$27] +SECTION "data/maps/attributes.asm@KantoPokecenter21F", ROMX map_attributes KantoPokecenter21F, KANTO_POKECENTER_2_1F, 0 -SECTION "KantoPokecenter22F", ROMX[$6EFF], BANK[$27] +SECTION "data/maps/attributes.asm@KantoPokecenter22F", ROMX map_attributes KantoPokecenter22F, KANTO_POKECENTER_2_2F, 0 -SECTION "KantoRedsHouse", ROMX[$6F78], BANK[$27] +SECTION "data/maps/attributes.asm@KantoRedsHouse", ROMX map_attributes KantoRedsHouse, KANTO_REDS_HOUSE, 0 -SECTION "KantoGreensHouse1F", ROMX[$6FDF], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGreensHouse1F", ROMX map_attributes KantoGreensHouse1F, KANTO_GREENS_HOUSE_1F, 0 -SECTION "KantoGreensHouse2F", ROMX[$703C], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGreensHouse2F", ROMX map_attributes KantoGreensHouse2F, KANTO_GREENS_HOUSE_2F, 0 -SECTION "KantoEldersHouse", ROMX[$707E], BANK[$27] +SECTION "data/maps/attributes.asm@KantoEldersHouse", ROMX map_attributes KantoEldersHouse, KANTO_ELDERS_HOUSE, 0 -SECTION "KantoOaksLab", ROMX[$70E5], BANK[$27] +SECTION "data/maps/attributes.asm@KantoOaksLab", ROMX map_attributes KantoOaksLab, KANTO_OAKS_LAB, 0 -SECTION "KantoLeague21F", ROMX[$713B], BANK[$27] +SECTION "data/maps/attributes.asm@KantoLeague21F", ROMX map_attributes KantoLeague21F, KANTO_LEAGUE_2_1F, 0 -SECTION "KantoLeague22F", ROMX[$71DC], BANK[$27] +SECTION "data/maps/attributes.asm@KantoLeague22F", ROMX map_attributes KantoLeague22F, KANTO_LEAGUE_2_2F, 0 -SECTION "KantoFishingGuru", ROMX[$727C], BANK[$27] +SECTION "data/maps/attributes.asm@KantoFishingGuru", ROMX map_attributes KantoFishingGuru, KANTO_FISHING_GURU, 0 -SECTION "SouthHouse1", ROMX[$72D6], BANK[$27] +SECTION "data/maps/attributes.asm@SouthHouse1", ROMX map_attributes SouthHouse1, SOUTH_HOUSE_1, 0 -SECTION "SouthPokecenter1F", ROMX[$7330], BANK[$27] +SECTION "data/maps/attributes.asm@SouthPokecenter1F", ROMX map_attributes SouthPokecenter1F, SOUTH_POKECENTER_1F, 0 -SECTION "SouthPokecenter2F", ROMX[$73C4], BANK[$27] +SECTION "data/maps/attributes.asm@SouthPokecenter2F", ROMX map_attributes SouthPokecenter2F, SOUTH_POKECENTER_2F, 0 -SECTION "SouthMart", ROMX[$743D], BANK[$27] +SECTION "data/maps/attributes.asm@SouthMart", ROMX map_attributes SouthMart, SOUTH_MART, 0 -SECTION "SouthHouse2", ROMX[$74BD], BANK[$27] +SECTION "data/maps/attributes.asm@SouthHouse2", ROMX map_attributes SouthHouse2, SOUTH_HOUSE_2, 0 -SECTION "NorthHouse1", ROMX[$7517], BANK[$27] +SECTION "data/maps/attributes.asm@NorthHouse1", ROMX map_attributes NorthHouse1, NORTH_HOUSE_1, 0 -SECTION "NorthMart", ROMX[$7571], BANK[$27] +SECTION "data/maps/attributes.asm@NorthMart", ROMX map_attributes NorthMart, NORTH_MART, 0 -SECTION "NorthHouse2", ROMX[$75F1], BANK[$27] +SECTION "data/maps/attributes.asm@NorthHouse2", ROMX map_attributes NorthHouse2, NORTH_HOUSE_2, 0 -SECTION "NorthPokecenter1F", ROMX[$764B], BANK[$27] +SECTION "data/maps/attributes.asm@NorthPokecenter1F", ROMX map_attributes NorthPokecenter1F, NORTH_POKECENTER_1F, 0 -SECTION "NorthPokecenter2F", ROMX[$76DF], BANK[$27] +SECTION "data/maps/attributes.asm@NorthPokecenter2F", ROMX map_attributes NorthPokecenter2F, NORTH_POKECENTER_2F, 0 -SECTION "PowerPlant1", ROMX[$4000], BANK[$2F] +SECTION "data/maps/attributes.asm@PowerPlant1", ROMX map_attributes PowerPlant1, POWER_PLANT_1, 0 -SECTION "PowerPlant2", ROMX[$407D], BANK[$2F] +SECTION "data/maps/attributes.asm@PowerPlant2", ROMX map_attributes PowerPlant2, POWER_PLANT_2, 0 -SECTION "PowerPlant3", ROMX[$40FA], BANK[$2F] +SECTION "data/maps/attributes.asm@PowerPlant3", ROMX map_attributes PowerPlant3, POWER_PLANT_3, 0 -SECTION "PowerPlant4", ROMX[$422B], BANK[$2F] +SECTION "data/maps/attributes.asm@PowerPlant4", ROMX map_attributes PowerPlant4, POWER_PLANT_4, 0 -SECTION "RuinsOfAlphEntrance", ROMX[$435C], BANK[$2F] +SECTION "data/maps/attributes.asm@RuinsOfAlphEntrance", ROMX map_attributes RuinsOfAlphEntrance, RUINS_OF_ALPH_ENTRANCE, 0 -SECTION "RuinsOfAlphMain", ROMX[$43D9], BANK[$2F] +SECTION "data/maps/attributes.asm@RuinsOfAlphMain", ROMX map_attributes RuinsOfAlphMain, RUINS_OF_ALPH_MAIN, 0 -SECTION "CaveMinecarts1", ROMX[$469F], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts1", ROMX map_attributes CaveMinecarts1, CAVE_MINECARTS_1, 0 -SECTION "CaveMinecarts2", ROMX[$482A], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts2", ROMX map_attributes CaveMinecarts2, CAVE_MINECARTS_2, 0 -SECTION "CaveMinecarts3", ROMX[$49B5], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts3", ROMX map_attributes CaveMinecarts3, CAVE_MINECARTS_3, 0 -SECTION "CaveMinecarts4", ROMX[$4B40], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts4", ROMX map_attributes CaveMinecarts4, CAVE_MINECARTS_4, 0 -SECTION "CaveMinecarts5", ROMX[$4CCB], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts5", ROMX map_attributes CaveMinecarts5, CAVE_MINECARTS_5, 0 -SECTION "CaveMinecarts6", ROMX[$4E56], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts6", ROMX map_attributes CaveMinecarts6, CAVE_MINECARTS_6, 0 -SECTION "CaveMinecarts7", ROMX[$4F2D], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts7", ROMX map_attributes CaveMinecarts7, CAVE_MINECARTS_7, 0 -SECTION "Office1", ROMX[$5004], BANK[$2F] +SECTION "data/maps/attributes.asm@Office1", ROMX map_attributes Office1, OFFICE_1, 0 -SECTION "Office2", ROMX[$5081], BANK[$2F] +SECTION "data/maps/attributes.asm@Office2", ROMX map_attributes Office2, OFFICE_2, 0 -SECTION "Office3", ROMX[$51B2], BANK[$2F] +SECTION "data/maps/attributes.asm@Office3", ROMX map_attributes Office3, OFFICE_3, 0 -SECTION "SlowpokeWellEntrance", ROMX[$5289], BANK[$2F] +SECTION "data/maps/attributes.asm@SlowpokeWellEntrance", ROMX map_attributes SlowpokeWellEntrance, SLOWPOKE_WELL_ENTRANCE, 0 -SECTION "SlowpokeWellMain", ROMX[$5306], BANK[$2F] +SECTION "data/maps/attributes.asm@SlowpokeWellMain", ROMX map_attributes SlowpokeWellMain, SLOWPOKE_WELL_MAIN, 0 -SECTION "ShizukanaOka", ROMX[$53DD], BANK[$2F] +SECTION "data/maps/attributes.asm@ShizukanaOka", ROMX map_attributes ShizukanaOka, SHIZUKANA_OKA, 0 -SECTION "RouteSilentEastGate", ROMX[$4000], BANK[$34] +SECTION "data/maps/attributes.asm@RouteSilentEastGate", ROMX map_attributes RouteSilentEastGate, ROUTE_SILENT_EAST_GATE, 0 -SECTION "PlayerHouse1F", ROMX[$4042], BANK[$34] +SECTION "data/maps/attributes.asm@PlayerHouse1F", ROMX map_attributes PlayerHouse1F, PLAYER_HOUSE_1F, 0 -SECTION "PlayerHouse2F", ROMX[$4132], BANK[$34] +SECTION "data/maps/attributes.asm@PlayerHouse2F", ROMX map_attributes PlayerHouse2F, PLAYER_HOUSE_2F, 0 -SECTION "SilentPokecenter", ROMX[$45FF], BANK[$34] +SECTION "data/maps/attributes.asm@SilentPokecenter", ROMX map_attributes SilentPokecenter, SILENT_POKECENTER, 0 -SECTION "SilentHillHouse", ROMX[$47D5], BANK[$34] +SECTION "data/maps/attributes.asm@SilentHillHouse", ROMX map_attributes SilentHillHouse, SILENT_HILL_HOUSE, 0 -SECTION "SilentHillLab", ROMX[$4AAC], BANK[$34] +SECTION "data/maps/attributes.asm@SilentHillLab", ROMX map_attributes SilentHillLab, SILENT_HILL_LAB, 0 -SECTION "SilentHillLab2", ROMX[$5BE6], BANK[$34] +SECTION "data/maps/attributes.asm@SilentHillLab2", ROMX map_attributes SilentHillLab2, SILENT_HILL_LAB_2, 0 -SECTION "Unused13", ROMX[$605D], BANK[$34] +SECTION "data/maps/attributes.asm@Unused13", ROMX map_attributes Unused13, UNUSED_13, 0 -SECTION "SilentHill", ROMX[$4014], BANK[$36] +SECTION "data/maps/attributes.asm@SilentHill", ROMX map_attributes SilentHill, SILENT_HILL, NORTH | WEST | EAST connection north, PrinceRoute, PRINCE_ROUTE, 0, 0, 10 connection west, Route1P1, ROUTE_1_P1, 0, 0, 9 connection east, RouteSilentEast, ROUTE_SILENT_EAST, 0, 0, 9 -SECTION "OldCity", ROMX[$410D], BANK[$36] +SECTION "data/maps/attributes.asm@OldCity", ROMX map_attributes OldCity, OLD_CITY, SOUTH | WEST connection south, Route1P2, ROUTE_1_P2, 5, 0, 10 connection west, Route2, ROUTE_2, 5, 0, 9 -SECTION "West", ROMX[$4372], BANK[$36] +SECTION "data/maps/attributes.asm@West", ROMX map_attributes West, WEST, NORTH | EAST connection north, BaadonRoute1, BAADON_ROUTE_1, 5, 0, 10 connection east, Route2, ROUTE_2, 5, 0, 9 -SECTION "Haiteku", ROMX[$45D2], BANK[$36] +SECTION "data/maps/attributes.asm@Haiteku", ROMX map_attributes Haiteku, HAITEKU, WEST connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0, 0, 9 -SECTION "Fonto", ROMX[$47F8], BANK[$36] +SECTION "data/maps/attributes.asm@Fonto", ROMX map_attributes Fonto, FONTO, NORTH | WEST | EAST connection north, FontoRoute2, FONTO_ROUTE_2, 0, 0, 10 connection west, FontoRoute1, FONTO_ROUTE_1, 0, 0, 9 connection east, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9 -SECTION "Baadon", ROMX[$48F3], BANK[$36] +SECTION "data/maps/attributes.asm@Baadon", ROMX map_attributes Baadon, BAADON, NORTH | SOUTH | EAST connection north, FontoRoute4, FONTO_ROUTE_4, 0, 0, 10 connection south, BaadonRoute1, BAADON_ROUTE_1, 0, 0, 10 connection east, BaadonRoute2, BAADON_ROUTE_2, 0, 0, 9 -SECTION "Newtype", ROMX[$49F9], BANK[$36] +SECTION "data/maps/attributes.asm@Newtype", ROMX map_attributes Newtype, NEWTYPE, NORTH | WEST | EAST connection north, SugarRoute, SUGAR_ROUTE, 5, 0, 10 connection west, Route15, ROUTE_15, 0, 0, 9 connection east, NewtypeRoute, NEWTYPE_ROUTE, 9, 0, 9 -SECTION "Sugar", ROMX[$4C3A], BANK[$36] +SECTION "data/maps/attributes.asm@Sugar", ROMX map_attributes Sugar, SUGAR, SOUTH connection south, SugarRoute, SUGAR_ROUTE, 0, 0, 10 -SECTION "BullForest", ROMX[$4D05], BANK[$36] +SECTION "data/maps/attributes.asm@BullForest", ROMX map_attributes BullForest, BULL_FOREST, NORTH | SOUTH | WEST connection north, BullForestRoute3, BULL_FOREST_ROUTE_3, 5, 0, 10 connection south, BullForestRoute2, BULL_FOREST_ROUTE_2, 5, 0, 10 connection west, BullForestRoute1, BULL_FOREST_ROUTE_1, 9, 0, 9 -SECTION "Stand", ROMX[$4F28], BANK[$36] +SECTION "data/maps/attributes.asm@Stand", ROMX map_attributes Stand, STAND, NORTH | SOUTH connection north, BullForestRoute2, BULL_FOREST_ROUTE_2, 10, 0, 10 connection south, StandRoute, STAND_ROUTE, 10, 0, 10 -SECTION "Kanto", ROMX[$519D], BANK[$36] +SECTION "data/maps/attributes.asm@Kanto", ROMX map_attributes Kanto, KANTO, WEST | EAST connection west, RouteSilentEast, ROUTE_SILENT_EAST, 9, 0, 9 connection east, KantoEastRoute, KANTO_EAST_ROUTE, 9, 0, 9 -SECTION "Prince", ROMX[$55F3], BANK[$36] +SECTION "data/maps/attributes.asm@Prince", ROMX map_attributes Prince, PRINCE, NORTH | SOUTH connection north, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10 connection south, PrinceRoute, PRINCE_ROUTE, 0, 0, 10 -SECTION "MtFuji", ROMX[$5677], BANK[$36] +SECTION "data/maps/attributes.asm@MtFuji", ROMX map_attributes MtFuji, MT_FUJI, SOUTH connection south, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10 -SECTION "South", ROMX[$56EF], BANK[$36] +SECTION "data/maps/attributes.asm@South", ROMX map_attributes South, SOUTH, NORTH | SOUTH | EAST connection north, FontoRoute5, FONTO_ROUTE_5, 10, 0, 10 connection south, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, 10, 0, 10 connection east, FontoRoute1, FONTO_ROUTE_1, 0, 0, 9 -SECTION "North", ROMX[$5914], BANK[$36] +SECTION "data/maps/attributes.asm@North", ROMX map_attributes North, NORTH, SOUTH connection south, BullForestRoute3, BULL_FOREST_ROUTE_3, 0, 0, 10 -SECTION "Route1P1", ROMX[$59DF], BANK[$36] +SECTION "data/maps/attributes.asm@Route1P1", ROMX map_attributes Route1P1, ROUTE_1_P1, WEST | EAST connection west, Route1P2, ROUTE_1_P2, -3, 6, 12 connection east, SilentHill, SILENT_HILL, 0, 0, 9 -SECTION "Route1P2", ROMX[$5ABE], BANK[$36] +SECTION "data/maps/attributes.asm@Route1P2", ROMX map_attributes Route1P2, ROUTE_1_P2, NORTH | EAST connection north, OldCity, OLD_CITY, -3, 2, 16 connection east, Route1P1, ROUTE_1_P1, 9, 0, 9 -SECTION "Route2", ROMX[$5BD4], BANK[$36] +SECTION "data/maps/attributes.asm@Route2", ROMX map_attributes Route2, ROUTE_2, WEST | EAST connection west, West, WEST, -3, 2, 15 connection east, OldCity, OLD_CITY, -3, 2, 15 -SECTION "HaitekuWestRoute", ROMX[$5CC6], BANK[$36] +SECTION "data/maps/attributes.asm@HaitekuWestRoute", ROMX map_attributes HaitekuWestRoute, HAITEKU_WEST_ROUTE, WEST | EAST connection west, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, -3, 15, 12 connection east, Haiteku, HAITEKU, 0, 0, 12 -SECTION "HaitekuWestRouteOcean", ROMX[$5DD1], BANK[$36] +SECTION "data/maps/attributes.asm@HaitekuWestRouteOcean", ROMX map_attributes HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, NORTH | EAST connection north, South, SOUTH, -3, 7, 13 connection east, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 18, 0, 9 -SECTION "FontoRoute1", ROMX[$5F17], BANK[$36] +SECTION "data/maps/attributes.asm@FontoRoute1", ROMX map_attributes FontoRoute1, FONTO_ROUTE_1, WEST | EAST connection west, South, SOUTH, 0, 0, 12 connection east, Fonto, FONTO, 0, 0, 9 -SECTION "FontoRoute6", ROMX[$6083], BANK[$36] +SECTION "data/maps/attributes.asm@FontoRoute6", ROMX map_attributes FontoRoute6, FONTO_ROUTE_6, WEST | EAST connection west, FontoRoute5, FONTO_ROUTE_5, 0, 0, 12 connection east, FontoRoute2, FONTO_ROUTE_2, 0, 0, 12 -SECTION "FontoRoute2", ROMX[$61E8], BANK[$36] +SECTION "data/maps/attributes.asm@FontoRoute2", ROMX map_attributes FontoRoute2, FONTO_ROUTE_2, SOUTH | WEST connection south, Fonto, FONTO, 0, 0, 10 connection west, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9 -SECTION "FontoRoute4", ROMX[$62C6], BANK[$36] +SECTION "data/maps/attributes.asm@FontoRoute4", ROMX map_attributes FontoRoute4, FONTO_ROUTE_4, SOUTH | WEST connection south, Baadon, BAADON, 0, 0, 10 connection west, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9 -SECTION "FontoRoute3", ROMX[$63B2], BANK[$36] +SECTION "data/maps/attributes.asm@FontoRoute3", ROMX map_attributes FontoRoute3, FONTO_ROUTE_3, WEST | EAST connection west, Fonto, FONTO, 0, 0, 9 connection east, FontoRoute4, FONTO_ROUTE_4, 0, 0, 12 -SECTION "BaadonRoute1", ROMX[$64BD], BANK[$36] +SECTION "data/maps/attributes.asm@BaadonRoute1", ROMX map_attributes BaadonRoute1, BAADON_ROUTE_1, NORTH | SOUTH connection north, Baadon, BAADON, 0, 0, 10 connection south, West, WEST, -3, 2, 16 -SECTION "BaadonRoute2", ROMX[$6603], BANK[$36] +SECTION "data/maps/attributes.asm@BaadonRoute2", ROMX map_attributes BaadonRoute2, BAADON_ROUTE_2, WEST | EAST connection west, Baadon, BAADON, 0, 0, 9 connection east, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 12 -SECTION "BaadonRoute3", ROMX[$67EF], BANK[$36] +SECTION "data/maps/attributes.asm@BaadonRoute3", ROMX map_attributes BaadonRoute3, BAADON_ROUTE_3, SOUTH | WEST connection south, Route15, ROUTE_15, 0, 0, 13 connection west, BaadonRoute2, BAADON_ROUTE_2, 0, 0, 9 -SECTION "Route15", ROMX[$68DB], BANK[$36] +SECTION "data/maps/attributes.asm@Route15", ROMX map_attributes Route15, ROUTE_15, NORTH | EAST connection north, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 10 connection east, Newtype, NEWTYPE, 0, 0, 12 -SECTION "NewtypeRoute", ROMX[$69BD], BANK[$36] +SECTION "data/maps/attributes.asm@NewtypeRoute", ROMX map_attributes NewtypeRoute, NEWTYPE_ROUTE, WEST | EAST connection west, Newtype, NEWTYPE, -3, 6, 12 connection east, Route18, ROUTE_18, -3, 33, 12 -SECTION "Route18", ROMX[$6A6E], BANK[$36] +SECTION "data/maps/attributes.asm@Route18", ROMX map_attributes Route18, ROUTE_18, NORTH | WEST connection north, BullForestRoute1, BULL_FOREST_ROUTE_1, 0, 0, 13 connection west, NewtypeRoute, NEWTYPE_ROUTE, 36, 0, 9 -SECTION "BullForestRoute1", ROMX[$6C6F], BANK[$36] +SECTION "data/maps/attributes.asm@BullForestRoute1", ROMX map_attributes BullForestRoute1, BULL_FOREST_ROUTE_1, SOUTH | EAST connection south, Route18, ROUTE_18, 0, 0, 10 connection east, BullForest, BULL_FOREST, -3, 6, 12 -SECTION "SugarRoute", ROMX[$6D8F], BANK[$36] +SECTION "data/maps/attributes.asm@SugarRoute", ROMX map_attributes SugarRoute, SUGAR_ROUTE, NORTH | SOUTH connection north, Sugar, SUGAR, 0, 0, 10 connection south, Newtype, NEWTYPE, -3, 2, 16 -SECTION "BullForestRoute2", ROMX[$6ED5], BANK[$36] +SECTION "data/maps/attributes.asm@BullForestRoute2", ROMX map_attributes BullForestRoute2, BULL_FOREST_ROUTE_2, NORTH | SOUTH connection north, BullForest, BULL_FOREST, -3, 2, 16 connection south, Stand, STAND, -3, 7, 13 -SECTION "StandRoute", ROMX[$701B], BANK[$36] +SECTION "data/maps/attributes.asm@StandRoute", ROMX map_attributes StandRoute, STAND_ROUTE, NORTH | SOUTH connection north, Stand, STAND, -3, 7, 13 connection south, KantoEastRoute, KANTO_EAST_ROUTE, -3, 7, 13 -SECTION "KantoEastRoute", ROMX[$7161], BANK[$36] +SECTION "data/maps/attributes.asm@KantoEastRoute", ROMX map_attributes KantoEastRoute, KANTO_EAST_ROUTE, NORTH | WEST connection north, StandRoute, STAND_ROUTE, 10, 0, 10 connection west, Kanto, KANTO, -3, 6, 15 -SECTION "RouteSilentEast", ROMX[$724D], BANK[$36] +SECTION "data/maps/attributes.asm@RouteSilentEast", ROMX map_attributes RouteSilentEast, ROUTE_SILENT_EAST, WEST | EAST connection west, SilentHill, SILENT_HILL, 0, 0, 9 connection east, Kanto, KANTO, -3, 6, 15 -SECTION "PrinceRoute", ROMX[$738C], BANK[$36] +SECTION "data/maps/attributes.asm@PrinceRoute", ROMX map_attributes PrinceRoute, PRINCE_ROUTE, NORTH | SOUTH connection north, Prince, PRINCE, 0, 0, 10 connection south, SilentHill, SILENT_HILL, 0, 0, 10 -SECTION "MtFujiRoute", ROMX[$73E8], BANK[$36] +SECTION "data/maps/attributes.asm@MtFujiRoute", ROMX map_attributes MtFujiRoute, MT_FUJI_ROUTE, NORTH | SOUTH connection north, MtFuji, MT_FUJI, 0, 0, 10 connection south, Prince, PRINCE, 0, 0, 10 -SECTION "FontoRoute5", ROMX[$7444], BANK[$36] +SECTION "data/maps/attributes.asm@FontoRoute5", ROMX map_attributes FontoRoute5, FONTO_ROUTE_5, SOUTH | EAST connection south, South, SOUTH, -3, 7, 13 connection east, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9 -SECTION "BullForestRoute3", ROMX[$7530], BANK[$36] +SECTION "data/maps/attributes.asm@BullForestRoute3", ROMX map_attributes BullForestRoute3, BULL_FOREST_ROUTE_3, NORTH | SOUTH connection north, North, NORTH, 0, 0, 10 - connection south, BullForest, BULL_FOREST, -3, 2, 16 + connection south, BullForest, BULL_FOREST, -3, 2, 16
\ No newline at end of file diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index bc05bd3..e53d1e0 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "LandmarkNames", ROMX[$4AAF], BANK[$3F] +SECTION "data/maps/landmarks.asm", ROMX LandmarkNames:: db "サイレント@" ; SILENT @@ -47,4 +47,4 @@ LandmarkNames:: db "#りーぐ6@" ; POKEMON_LEAGUE_6 db "#りーぐ7@" ; POKEMON_LEAGUE_7 db "#りーぐ7@" ; POKEMON_LEAGUE_7_2 - db "しずかなおか@" ; SILENT_HILL + db "しずかなおか@" ; SILENT_HILL
\ No newline at end of file diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 1332a0e..6f8f896 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -11,7 +11,7 @@ map: MACRO db 0, 0 ; ??? ENDM -SECTION "Map Data", ROMX[$4000], BANK[$04] +SECTION "data/maps/maps.asm", ROMX db 0 ; ??? @@ -294,4 +294,4 @@ MapGroup_Misc: map SlowpokeWellEntrance, TILESET_CAVE, CAVE, LANDMARK_NONE map SlowpokeWellMain, TILESET_CAVE, CAVE, LANDMARK_NONE -MapGroup_Empty: +MapGroup_Empty:
\ No newline at end of file diff --git a/data/moves/names.asm b/data/moves/names.asm index db98d65..7936696 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "MoveNames", ROMX[$52A1], BANK[$10] +SECTION "data/moves/names.asm", ROMX MoveNames:: db "はたく@" ; POUND @@ -253,4 +253,4 @@ MoveNames:: db "てつわん@" ; STRONG_ARM db "ひかりゴケ@" ; BRIGHT_MOSS db "うずしお@" ; WHIRLPOOL - db "とびはねる@" ; BOUNCE + db "とびはねる@" ; BOUNCE
\ No newline at end of file diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index e62f1d5..84183ac 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "TM/HM Moves", ROMX[$52D1], BANK[$04] +SECTION "data/moves/tmhm_moves.asm", ROMX ; This is a nearly-sequential table of new moves. ; It was probably meant for easy testing, not as @@ -65,4 +65,4 @@ TMHMMoves: ; 04:52d1 db MOVE_STRONG_ARM ; HM04 db MOVE_BRIGHT_MOSS ; HM05 db MOVE_WHIRLPOOL ; HM06 - db MOVE_BOUNCE ; HM07 + db MOVE_BOUNCE ; HM07
\ No newline at end of file diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 7b3a07e..6da691e 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Base Data", ROMX[$4F10], BANK[$14] +SECTION "data/pokemon/base_stats.asm", ROMX tmhm: MACRO ; used in data/pokemon/base_stats/*.asm @@ -288,4 +288,4 @@ BaseStats_Houou:: INCLUDE "data/pokemon/base_stats/houou.inc" BaseStats_Togepy:: INCLUDE "data/pokemon/base_stats/togepy.inc" BaseStats_Bulu:: INCLUDE "data/pokemon/base_stats/bulu.inc" BaseStats_Tail:: INCLUDE "data/pokemon/base_stats/tail.inc" -BaseStats_Leafy:: INCLUDE "data/pokemon/base_stats/leafy.inc" +BaseStats_Leafy:: INCLUDE "data/pokemon/base_stats/leafy.inc"
\ No newline at end of file diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 1e6a6b5..6f0b804 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Alphabetical Pokedex Order", ROMX[$4943], BANK[$10] +SECTION "data/pokemon/dex_order_alpha.asm", ROMX ; Every Pokémon sorted alphabetically by name (gojūon order). @@ -255,4 +255,4 @@ AlphabeticalPokedexOrder: ; 0x40943 db DEX_ROKON db DEX_WARWOLF db DEX_WATANEKO - db DEX_WANRIKY + db DEX_WANRIKY
\ No newline at end of file diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index c18757b..fb94284 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Evolutions and Attacks", ROMX[$6493], BANK[$10] +SECTION "data/pokemon/evos_attacks.asm", ROMX ; Evolutions for Pokémon available in the demo were removed, ; and have been left in comments. @@ -3296,4 +3296,4 @@ LeafyEvosAttacks: ; 43aa4 db 49, MOVE_MORNING_SUN db 56, MOVE_WRAP db 63, MOVE_SOLARBEAM - db 0 ; no more level-up moves + db 0 ; no more level-up moves
\ No newline at end of file diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 54d5263..15475c9 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "PokemonNames", ROMX[$6D75], BANK[$14] +SECTION "data/pokemon/names.asm", ROMX PokemonNames:: db "フシギダネ" ; FUSHIGIDANE @@ -253,4 +253,4 @@ PokemonNames:: db "トゲピー@" ; TOGEPY db "ブルー@@" ; BULU db "テイル@@" ; TAIL - db "りーフィ@" ; LEAFY + db "りーフィ@" ; LEAFY
\ No newline at end of file diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 47b0c38..82d3d7e 100644 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Tileset Headers", ROMX[$488D], BANK[$03] -else -SECTION "Tileset Headers", ROMX[$4875], BANK[$03] -endc +; if DEBUG +SECTION "data/tileset_headers.asm", ROMX +; else +; SECTION "Tileset Headers", ROMX[$4875], BANK[$03] +; endc Tileset_00: ; 0xc88d db $06 ; bank @@ -285,4 +285,4 @@ Tileset_1b: ; 0xc9b6 db $77 ; talking over tile 1 db $40 ; talking over tile 2 db $00 ; talking over tile 3 - db $00 ; unknown + db $00 ; unknown
\ No newline at end of file diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index 8e130f8..02c8203 100644 --- a/data/trainers/class_names.asm +++ b/data/trainers/class_names.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "TrainerClassNames", ROMX[$4D90], BANK[$0E] +SECTION "data/trainers/class_names.asm", ROMX TrainerClassNames:: ; 38d90 db "ハヤト@" ; HAYATO @@ -66,4 +66,4 @@ TrainerClassNames:: ; 38d90 db "ふたごちゃん@" ; TWINS db "ゲルゲだんいん♂@" ; GERUGE_MEMBER_M_2 db "してんのう♂@" ; ELITE_FOUR_M - db "してんのう♀@" ; ELITE_FOUR_F + db "してんのう♀@" ; ELITE_FOUR_F
\ No newline at end of file diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 013cf58..b8d8a20 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -9,7 +9,7 @@ INCLUDE "constants.asm" ; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves ; - db -1 ; end -SECTION "Trainer Parties", ROMX[$5110], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties", ROMX INCLUDE "data/trainers/party_pointers.inc" @@ -622,7 +622,7 @@ KimonoGirlGroup:: else -SECTION "Trainer Parties 1 TEMPORARY", ROMX[$51BF], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 1 TEMPORARY", ROMX AkaneGroup:: BugCatcherBoyGroup:: ; BUG_CATCHER_BOY_KENJI @@ -635,47 +635,47 @@ BugCatcherBoyGroup:: db 7, DEX_KONGPANG, ITEM_NONE, MOVE_STUN_SPORE, MOVE_LEECH_LIFE, MOVE_NONE, MOVE_NONE db -1 ; end -SECTION "Trainer Parties 2 TEMPORARY", ROMX[$52B4], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 2 TEMPORARY", ROMX MikanGroup:: -SECTION "Trainer Parties 3 TEMPORARY", ROMX[$53BC], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 3 TEMPORARY", ROMX OkidoGroup:: -SECTION "Trainer Parties 4 TEMPORARY", ROMX[$54BA], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 4 TEMPORARY", ROMX WataruGroup:: -SECTION "Trainer Parties 5 TEMPORARY", ROMX[$54E0], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 5 TEMPORARY", ROMX GerugeMemberMGroup:: -SECTION "Trainer Parties 6 TEMPORARY", ROMX[$54FE], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 6 TEMPORARY", ROMX Trio1Group:: BeautyGroup:: -SECTION "Trainer Parties 7 TEMPORARY", ROMX[$55EB], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 7 TEMPORARY", ROMX FledglingGroup:: -SECTION "Trainer Parties 8 TEMPORARY", ROMX[$56CE], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 8 TEMPORARY", ROMX PokeManiacGroup:: -SECTION "Trainer Parties 9 TEMPORARY", ROMX[$57BC], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 9 TEMPORARY", ROMX GentlemanGroup:: -SECTION "Trainer Parties 10 TEMPORARY", ROMX[$57E0], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 10 TEMPORARY", ROMX TeacherMGroup:: -SECTION "Trainer Parties 11 TEMPORARY", ROMX[$57EC], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 11 TEMPORARY", ROMX TeacherFGroup:: -SECTION "Trainer Parties 12 TEMPORARY", ROMX[$57F2], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 12 TEMPORARY", ROMX ManchildGroup:: -SECTION "Trainer Parties 13 TEMPORARY", ROMX[$58C3], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 13 TEMPORARY", ROMX RockerGroup:: -SECTION "Trainer Parties 14 TEMPORARY", ROMX[$58F2], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 14 TEMPORARY", ROMX HikerGroup:: -SECTION "Trainer Parties 15 TEMPORARY", ROMX[$5995], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 15 TEMPORARY", ROMX KimonoGirlGroup:: ; KIMONO_GIRL_KOUME db "こうめ@", TRAINERTYPE_ITEM_MOVES @@ -687,112 +687,112 @@ KimonoGirlGroup:: db 10, DEX_PURIN, ITEM_NONE, MOVE_CHARM, MOVE_POUND, MOVE_ENCORE, MOVE_NONE db -1 ; end -SECTION "Trainer Parties 16 TEMPORARY", ROMX[$518A], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 16 TEMPORARY", ROMX HayatoGroup:: -SECTION "Trainer Parties 17 TEMPORARY", ROMX[$5216], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 17 TEMPORARY", ROMX TsukishiGroup:: LassGroup:: -SECTION "Trainer Parties 18 TEMPORARY", ROMX[$526F], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 18 TEMPORARY", ROMX EnokiGroup:: -SECTION "Trainer Parties 19 TEMPORARY", ROMX[$528F], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 19 TEMPORARY", ROMX OkeraGroup:: -SECTION "Trainer Parties 20 TEMPORARY", ROMX[$533D], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 20 TEMPORARY", ROMX GamaGroup:: -SECTION "Trainer Parties 21 TEMPORARY", ROMX[$5542], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 21 TEMPORARY", ROMX Trio2Group:: -SECTION "Trainer Parties 22 TEMPORARY", ROMX[$5554], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 22 TEMPORARY", ROMX Trio3Group:: -SECTION "Trainer Parties 23 TEMPORARY", ROMX[$5673], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 23 TEMPORARY", ROMX ProfessionalMGroup:: ProfessionalFGroup:: -SECTION "Trainer Parties 24 TEMPORARY", ROMX[$5812], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 24 TEMPORARY", ROMX SwimmerMGroup:: -SECTION "Trainer Parties 25 TEMPORARY", ROMX[$5821], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 25 TEMPORARY", ROMX SuperNerdGroup:: -SECTION "Trainer Parties 26 TEMPORARY", ROMX[$5833], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 26 TEMPORARY", ROMX EngineerGroup:: -SECTION "Trainer Parties 27 TEMPORARY", ROMX[$5965], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 27 TEMPORARY", ROMX JugglerGroup:: -SECTION "Trainer Parties 28 TEMPORARY", ROMX[$5971], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 28 TEMPORARY", ROMX TwinsGroup:: -SECTION "Trainer Parties 29 TEMPORARY", ROMX[$5976], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 29 TEMPORARY", ROMX SchoolboyGroup:: ; SCHOOLBOY_TETSUYA db "てつや@", TRAINERTYPE_ITEM db 8, DEX_YADOKING, ITEM_NONE db -1 ; end -SECTION "Trainer Parties 30 TEMPORARY", ROMX[$597F], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 30 TEMPORARY", ROMX FirebreatherGroup:: ; FIREBREATHER_AKITO db "あきと@", TRAINERTYPE_ITEM db 8, DEX_BOOBY, ITEM_NONE db -1 ; end -SECTION "Trainer Parties 31 TEMPORARY", ROMX[$5320], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 31 TEMPORARY", ROMX BlueGroup:: -SECTION "Trainer Parties 32 TEMPORARY", ROMX[$5375], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 32 TEMPORARY", ROMX RivalGroup:: -SECTION "Trainer Parties 33 TEMPORARY", ROMX[$5404], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 33 TEMPORARY", ROMX SakakiGroup:: -SECTION "Trainer Parties 34 TEMPORARY", ROMX[$5427], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 34 TEMPORARY", ROMX ProtagonistGroup:: -SECTION "Trainer Parties 35 TEMPORARY", ROMX[$5433], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 35 TEMPORARY", ROMX SibaGroup:: KasumiGroup:: FisherGroup:: -SECTION "Trainer Parties 36 TEMPORARY", ROMX[$5476], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 36 TEMPORARY", ROMX KannaGroup:: -SECTION "Trainer Parties 37 TEMPORARY", ROMX[$555D], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 37 TEMPORARY", ROMX RocketFGroup:: -SECTION "Trainer Parties 38 TEMPORARY", ROMX[$557E], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 38 TEMPORARY", ROMX YoungsterGroup:: -SECTION "Trainer Parties 39 TEMPORARY", ROMX[$564F], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 39 TEMPORARY", ROMX ProdigyGroup:: -SECTION "Trainer Parties 40 TEMPORARY", ROMX[$578C], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 40 TEMPORARY", ROMX RocketMGroup:: -SECTION "Trainer Parties 41 TEMPORARY", ROMX[$5808], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 41 TEMPORARY", ROMX SwimmerFGroup:: -SECTION "Trainer Parties 42 TEMPORARY", ROMX[$5817], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 42 TEMPORARY", ROMX SailorGroup:: -SECTION "Trainer Parties 43 TEMPORARY", ROMX[$58FE], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 43 TEMPORARY", ROMX BikerGroup:: -SECTION "Trainer Parties 44 TEMPORARY", ROMX[$594D], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 44 TEMPORARY", ROMX RockClimberGroup:: -SECTION "Trainer Parties 45 TEMPORARY", ROMX[$5959], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 45 TEMPORARY", ROMX BurglarGroup:: -SECTION "Trainer Parties 46 TEMPORARY", ROMX[$5969], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 46 TEMPORARY", ROMX BlackbeltGroup:: -SECTION "Trainer Parties 47 TEMPORARY", ROMX[$596D], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 47 TEMPORARY", ROMX PsychicGroup:: KungFuMasterGroup:: FortuneTellerGroup:: @@ -802,11 +802,11 @@ MediumGroup:: SoldierGroup:: GerugeMemberFGroup:: -SECTION "Trainer Parties 48 TEMPORARY", ROMX[$5988], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 48 TEMPORARY", ROMX SportsmanGroup:: ; SPORTSMAN_SHIGEKI db "てつじ@", TRAINERTYPE_ITEM_MOVES db 9, DEX_DONPHAN, ITEM_NONE, MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_NONE, MOVE_NONE db -1 ; end -endc +endc
\ No newline at end of file diff --git a/data/types/names.asm b/data/types/names.asm index 07ebec7..7036847 100644 --- a/data/types/names.asm +++ b/data/types/names.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "TypeNames", ROMX[$40DD], BANK[$14] +SECTION "data/types/names.asm", ROMX TypeNames:: dw .Normal ; NORMAL @@ -50,4 +50,4 @@ TypeNames:: .Ghost: db "ゴースト@" .Metal: db "メタル@" .Dragon: db "ドラゴン@" -.Dark: db "あく@" +.Dark: db "あく@"
\ No newline at end of file diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm index c36a249..905f478 100644 --- a/data/types/search_strings.asm +++ b/data/types/search_strings.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "PokedexTypeSearchStrings", ROMX[$4ECC], BANK[$10] +SECTION "data/types/search_strings.asm", ROMX PokedexTypeSearchStrings:: db "ノーマル@" ; NORMAL @@ -17,4 +17,4 @@ PokedexTypeSearchStrings:: db "むし @" ; BUG db "いわ @" ; ROCK db "ゴースト@" ; GHOST - db "ドラゴン@" ; DRAGON + db "ドラゴン@" ; DRAGON
\ No newline at end of file diff --git a/data/types/search_types.asm b/data/types/search_types.asm index fbaa70d..ed41650 100644 --- a/data/types/search_types.asm +++ b/data/types/search_types.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "PokedexTypeSearchConversionTable", ROMX[$5068], BANK[$10] +SECTION "data/types/search_types.asm", ROMX PokedexTypeSearchConversionTable:: db TYPE_NORMAL @@ -17,4 +17,4 @@ PokedexTypeSearchConversionTable:: db TYPE_BUG db TYPE_ROCK db TYPE_GHOST - db TYPE_DRAGON + db TYPE_DRAGON
\ No newline at end of file diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index 8923a80..e23227a 100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Type Matchups", ROMX[$506D], BANK[$0D] +SECTION "data/types/type_matchups.asm", ROMX TypeMatchups: ; 3506d ; attacker, defender, *= @@ -110,4 +110,4 @@ TypeMatchups: ; 3506d db TYPE_NORMAL, TYPE_GHOST, NO_EFFECT db -1 ; end -; 3519b +; 3519b
\ No newline at end of file diff --git a/data/wild.asm b/data/wild.asm index d1cea5c..2796e91 100644 --- a/data/wild.asm +++ b/data/wild.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Wild Pokémon", ROMX[$6A3C], BANK[$0F] +SECTION "data/wild.asm", ROMX GrassWildMons:: ; f:6a3c @@ -642,4 +642,4 @@ endc db 5, DEX_PIKACHU db -1 ; end -; f:6e3e +; f:6e3e
\ No newline at end of file |