mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-09-16 18:20:50 +12:00
lol serves me right
This commit is contained in:
Llinos Evans
parent
2b2a5617b8
commit
70fd4e37fa
|
|
@ -672,18 +672,18 @@ ENDM
|
|||
map_const SAVOY_CITY, 20, 18 ; 1
|
||||
map_const ROUTE_50_SAVOY_CITY_GATE, 5, 4 ; 2
|
||||
map_const SAVOY_CITY_POKECENTER_1F, 10, 4 ; 3
|
||||
map_const SAVOY_CITY_BIG_HOUSE_1 5, 4 ; 4
|
||||
map_const SAVOY_CITY_BIG_HOUSE_2 5, 4 ; 4
|
||||
map_const SAVOY_CITY_ROCKED_BLOCKED_HOUSE 5, 4 ; 4
|
||||
map_const SAVOY_CITY_BIG_HOUSE_1, 5, 4 ; 4
|
||||
map_const SAVOY_CITY_BIG_HOUSE_2, 5, 4 ; 5
|
||||
map_const SAVOY_CITY_ROCKET_BLOCKED_HOUSE, 5, 4 ; 6
|
||||
endgroup
|
||||
|
||||
newgroup CORAL_CITY ; 38
|
||||
map_const CORAL_CITY, 20, 18 ; 1
|
||||
map_const CORAL_CITY_POKECENTER_1F, 10, 4 ; 2
|
||||
map_const CORAL_MART, 8, 4 ; 3
|
||||
map_const CORAL_CITY_OAK_HOUSE 5, 4 ; 4
|
||||
map_const CORAL_CITY_FISHING_GURU_HOUSE 5, 4 ; 5
|
||||
map_const CORAL_CITY_SAILOR_HOUSE 5, 4 ; 6
|
||||
map_const CORAL_CITY_OAK_HOUSE, 5, 4 ; 4
|
||||
map_const CORAL_CITY_FISHING_GURU_HOUSE, 5, 4 ; 5
|
||||
map_const CORAL_CITY_BIG_HOUSE, 5, 4 ; 6
|
||||
map_const ROUTE_51, 25, 9 ; 7
|
||||
map_const ROUTE_52, 10, 27 ; 8
|
||||
endgroup
|
||||
|
|
@ -692,6 +692,8 @@ ENDM
|
|||
map_const RUDDY_TOWN, 20, 18 ; 1
|
||||
map_const RUDDY_TOWN_POKECENTER_1F, 10, 4 ; 2
|
||||
map_const RUDDY_MART, 8, 4 ; 3
|
||||
map_const RUDDY_TOWN_BIG_HOUSE_1, 5, 4 ; 4
|
||||
map_const RUDDY_TOWN_BIG_HOUSE_2, 5, 4 ; 4
|
||||
map_const ROUTE_52_RUDDY_TOWN_GATE, 5, 4 ; 4
|
||||
map_const ROUTE_53_RUDDY_TOWN_GATE, 5, 4 ; 5
|
||||
map_const ROUTE_54_RUDDY_TOWN_GATE, 5, 4 ; 6
|
||||
|
|
|
|||
|
|
@ -895,13 +895,13 @@ ENDM
|
|||
map_attributes Route50SavoyCityGate, ROUTE_50_SAVOY_CITY_GATE, $00, 0
|
||||
map_attributes SavoyCityBigHouse1, SAVOY_CITY_BIG_HOUSE_1, $00, 0
|
||||
map_attributes SavoyCityBigHouse2, SAVOY_CITY_BIG_HOUSE_2, $00, 0
|
||||
map_attributes SavoyCityRockedBlockedHouse, SAVOY_CITY_ROCKET_BLOCKED_HOUSE, $00, 0
|
||||
map_attributes SavoyCityRocketBlockedHouse, SAVOY_CITY_ROCKET_BLOCKED_HOUSE, $00, 0
|
||||
|
||||
map_attributes CoralCity, CORAL_CITY, $04, WEST
|
||||
connection west, Route51, ROUTE_51, 0
|
||||
map_attributes CoralCityOakHouse, CORAL_CITY_OAK_HOUSE, $00, 0
|
||||
map_attributes CoralCityFishingGuruHouse, CORAL_CITY_FISHING_GURU_HOUSE, $00, 0
|
||||
map_attributes CoralCitySailorHouse, CORAL_CITY_SAILOR_HOUSE, $00, 0
|
||||
map_attributes CoralCityBigHouse, CORAL_CITY_BIG_HOUSE, $00, 0
|
||||
|
||||
map_attributes SavoyCityPokecenter1F, SAVOY_CITY_POKECENTER_1F, $00, 0
|
||||
map_attributes CoralCityPokecenter1F, CORAL_CITY_POKECENTER_1F, $00, 0
|
||||
|
|
@ -917,6 +917,8 @@ ENDM
|
|||
connection east, Route51, ROUTE_51, 18
|
||||
|
||||
map_attributes RuddyTown, RUDDY_TOWN, $04, 0
|
||||
map_attributes RuddyTownBigHouse1, RUDDY_TOWN_BIG_HOUSE_1, $00, 0
|
||||
map_attributes RuddyTownBigHouse2, RUDDY_TOWN_BIG_HOUSE_2, $00, 0
|
||||
map_attributes Route52RuddyTownGate, ROUTE_52_RUDDY_TOWN_GATE, $00, 0
|
||||
map_attributes Route53RuddyTownGate, ROUTE_53_RUDDY_TOWN_GATE, $00, 0
|
||||
map_attributes Route54RuddyTownGate, ROUTE_54_RUDDY_TOWN_GATE, $00, 0
|
||||
|
|
|
|||
|
|
@ -1352,9 +1352,12 @@ AventurineCity_Blocks:
|
|||
SavoyCityBigHouse1_Blocks:
|
||||
SavoyCityBigHouse2_Blocks:
|
||||
CoralCityFishingGuruHouse_Blocks:
|
||||
CoralCitySailorHouse_Blocks:
|
||||
CoralCityBigHouse_Blocks:
|
||||
RuddyTownBigHouse1_Blocks:
|
||||
RuddyTownBigHouse2_Blocks:
|
||||
INCBIN "maps/NihonBigHouse.ablk"
|
||||
|
||||
; an alt layout usually associated with larger and more important places
|
||||
SavoyCityRocketBlockedHouse_Blocks:
|
||||
CoralCityOakHouse_Blocks:
|
||||
INCBIN "maps/SavoyCityRocketBlockedHouse.ablk"
|
||||
|
|
|
|||
|
|
@ -750,7 +750,7 @@ MapGroup_CoralCity:
|
|||
map CoralMart, TILESET_NIHON_MART, INDOOR, LANDMARK_CORAL_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE
|
||||
map CoralCityOakHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
|
||||
map CoralCityFishingGuruHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
|
||||
map CoralCitySailorHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
|
||||
map CoralCityBigHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
|
||||
map Route51, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_51, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
|
||||
map Route52, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_52, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
|
||||
assert_table_length NUM_CORAL_CITY_MAPS
|
||||
|
|
@ -760,6 +760,8 @@ MapGroup_RuddyTown:
|
|||
map RuddyTown, TILESET_NIHON_SOUTH, TOWN, LANDMARK_RUDDY_TOWN, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
|
||||
map RuddyTownPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_RUDDY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
|
||||
map RuddyMart, TILESET_NIHON_MART, INDOOR, LANDMARK_RUDDY_TOWN, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE
|
||||
map RuddyTownBigHouse1, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_RUDDY_TOWN, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
|
||||
map RuddyTownBigHouse2, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_RUDDY_TOWN, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
|
||||
map Route52RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_52, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
|
||||
map Route53RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; needs new landmark when route is made
|
||||
map Route54RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; see above
|
||||
|
|
|
|||
|
|
@ -617,11 +617,8 @@ INCLUDE "maps/RuddyMart.asm"
|
|||
INCLUDE "maps/SavoyCityBigHouse1.asm"
|
||||
INCLUDE "maps/SavoyCityBigHouse2.asm"
|
||||
INCLUDE "maps/SavoyCityRocketBlockedHouse.asm"
|
||||
INCLUDE "maps/CoralCityOakHouse.asm"
|
||||
INCLUDE "maps/CoralCityFishingGuruHouse.asm"
|
||||
INCLUDE "maps/CoralCitySailorHouse.asm"
|
||||
|
||||
SECTION "Map Scripts 31", ROMX ; spillover
|
||||
SECTION "Map Scripts 31", ROMX
|
||||
INCLUDE "maps/TanobyRuins.asm"
|
||||
INCLUDE "maps/TanobyChambers.asm"
|
||||
INCLUDE "maps/NavalRockExterior.asm"
|
||||
|
|
@ -656,4 +653,9 @@ INCLUDE "maps/RuddyTown.asm"
|
|||
INCLUDE "maps/Route57.asm"
|
||||
INCLUDE "maps/SunglowCity.asm"
|
||||
INCLUDE "maps/AventurineCity.asm"
|
||||
INCLUDE "maps/SunglowWell.asm"
|
||||
INCLUDE "maps/SunglowWell.asm"
|
||||
INCLUDE "maps/CoralCityOakHouse.asm"
|
||||
INCLUDE "maps/CoralCityFishingGuruHouse.asm"
|
||||
INCLUDE "maps/CoralCityBigHouse.asm"
|
||||
INCLUDE "maps/RuddyTownBigHouse1.asm"
|
||||
INCLUDE "maps/RuddyTownBigHouse2.asm"
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ CoralCity_MapEvents:
|
|||
warp_event 31, 14, CORAL_MART, 1 ; mart
|
||||
warp_event 33, 18, CORAL_CITY_OAK_HOUSE, 1 ;
|
||||
warp_event 7, 15, CORAL_CITY_FISHING_GURU_HOUSE, 1 ;
|
||||
warp_event 15, 17, CORAL_CITY_SAILOR_HOUSE, 1 ;
|
||||
warp_event 15, 17, CORAL_CITY_BIG_HOUSE, 1 ;
|
||||
|
||||
def_coord_events
|
||||
|
||||
|
|
|
|||
|
|
@ -199,8 +199,8 @@ SavoyCity_MapEvents:
|
|||
warp_event 4, 8, CORAL_CITY, 1 ;port north
|
||||
warp_event 4, 9, CORAL_CITY, 2 ;port south
|
||||
warp_event 25, 14, SAVOY_CITY_POKECENTER_1F, 1 ; pokecenter
|
||||
warp_event 22, 25, SAVOY_CITY_BIGHOUSE_1, 1 ; west-south house
|
||||
warp_event 32, 25, SAVOY_CITY_BIGHOUSE_2, 1 ; east-south house
|
||||
warp_event 22, 25, SAVOY_CITY_BIG_HOUSE_1, 1 ; west-south house
|
||||
warp_event 32, 25, SAVOY_CITY_BIG_HOUSE_2, 1 ; east-south house
|
||||
warp_event 18, 12, SAVOY_CITY_ROCKET_BLOCKED_HOUSE, 1
|
||||
warp_event 27, 20, DEBUG_ROOM, 1 ; savoy rail
|
||||
warp_event 15, 23, DEBUG_ROOM, 1 ; savoy gym
|
||||
|
|
|
|||
Loading…
Reference in a new issue