pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename maps:

Browse Source 
- Underground -> UndergroundPath
- Route5UndergroundEntrance -> Route5UndergroundPathEntrance
- Route6UndergroundEntrance -> Route6UndergroundPathEntrance

- WarehouseEntrance -> GoldenrodUnderground
- UndergroundWarehouse -> GoldenrodUndergroundWarehouse
- UndergroundPathSwitchRoomEntrances -> GoldenrodUndergroundSwitchRoomEntrances
This commit is contained in:
Remy Oukaour
2017-12-24 18:06:12 -05:00
parent 0b8b6f9259
commit 0a1fef45fd
29 changed files with 854 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
constants/event_flags.asm
View File

@@ -145,11 +145,11 @@
const EVENT_ILEX_FOREST_HIDDEN_ETHER const EVENT_ILEX_FOREST_HIDDEN_ETHER
const EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION const EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION
const EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL const EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL
const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL
const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION
const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE
const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION
const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE
const EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION const EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION
const EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL const EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL
const EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE const EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE
@@ -238,8 +238,8 @@
const EVENT_GOT_TM29_PSYCHIC const EVENT_GOT_TM29_PSYCHIC
; Kanto hidden items ; Kanto hidden items
const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE const EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE
const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL const EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL
const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY
const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND
const EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION const EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION
@@ -787,10 +787,10 @@
const EVENT_LEARNED_SLOWPOKETAIL const EVENT_LEARNED_SLOWPOKETAIL
const EVENT_LEARNED_RATICATE_TAIL const EVENT_LEARNED_RATICATE_TAIL
const EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE const EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
const EVENT_WAREHOUSE_LAYOUT_1 const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
const EVENT_WAREHOUSE_LAYOUT_2 const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
const EVENT_WAREHOUSE_LAYOUT_3 const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
const EVENT_WAREHOUSE_BLOCKED_OFF const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
const EVENT_LEFT_MONS_WITH_CONTEST_OFFICER const EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
const EVENT_WILLS_ROOM_ENTRANCE_CLOSED const EVENT_WILLS_ROOM_ENTRANCE_CLOSED
const EVENT_WILLS_ROOM_EXIT_OPEN const EVENT_WILLS_ROOM_EXIT_OPEN
@@ -1691,7 +1691,7 @@
const EVENT_TIN_TOWER_8F_MAX_ELIXER const EVENT_TIN_TOWER_8F_MAX_ELIXER
const EVENT_TIN_TOWER_8F_FULL_RESTORE const EVENT_TIN_TOWER_8F_FULL_RESTORE
const EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL const EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
const EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
const EVENT_BURNED_TOWER_1F_HP_UP const EVENT_BURNED_TOWER_1F_HP_UP
const EVENT_BURNED_TOWER_B1F_TM_ENDURE const EVENT_BURNED_TOWER_B1F_TM_ENDURE
const EVENT_NATIONAL_PARK_PARLYZ_HEAL const EVENT_NATIONAL_PARK_PARLYZ_HEAL
@@ -1720,15 +1720,15 @@
const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
const EVENT_ILEX_FOREST_REVIVE const EVENT_ILEX_FOREST_REVIVE
const EVENT_WAREHOUSE_ENTRANCE_COIN_CASE const EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
const EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER const EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
const EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN const EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
const EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL const EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
const EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL const EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
const EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
const EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
const EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER const EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
const EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE const EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
const EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE const EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
@@ -1800,7 +1800,7 @@
const EVENT_RIVAL_CHERRYGROVE_CITY const EVENT_RIVAL_CHERRYGROVE_CITY
const EVENT_RIVAL_AZALEA_TOWN const EVENT_RIVAL_AZALEA_TOWN
const EVENT_RIVAL_TEAM_ROCKET_BASE const EVENT_RIVAL_TEAM_ROCKET_BASE
const EVENT_RIVAL_UNDERGROUND_PATH const EVENT_RIVAL_GOLDENROD_UNDERGROUND
const EVENT_RIVAL_VICTORY_ROAD const EVENT_RIVAL_VICTORY_ROAD
const EVENT_RIVAL_OLIVINE_CITY const EVENT_RIVAL_OLIVINE_CITY
const EVENT_RIVAL_SPROUT_TOWER const EVENT_RIVAL_SPROUT_TOWER
@@ -1945,10 +1945,10 @@
const EVENT_OPENED_MT_SILVER const EVENT_OPENED_MT_SILVER
const EVENT_FOUGHT_SNORLAX ; 750 const EVENT_FOUGHT_SNORLAX ; 750
const EVENT_LAKE_OF_RAGE_RED_GYARADOS const EVENT_LAKE_OF_RAGE_RED_GYARADOS
const EVENT_WAREHOUSE_ENTRANCE_GRANNY const EVENT_GOLDENROD_UNDERGROUND_GRANNY
const EVENT_WAREHOUSE_ENTRANCE_GRAMPS const EVENT_GOLDENROD_UNDERGROUND_GRAMPS
const EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER const EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
const EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER const EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
const EVENT_ROUTE_32_FRIEDA_OF_FRIDAY const EVENT_ROUTE_32_FRIEDA_OF_FRIDAY

2
constants/landmark_constants.asm
View File

@@ -63,7 +63,7 @@ KANTO_LANDMARK EQU const_value
const ROUTE_24 ; 38 const ROUTE_24 ; 38
const ROUTE_25 ; 39 const ROUTE_25 ; 39
const ROUTE_5 ; 3a const ROUTE_5 ; 3a
const UNDERGROUND ; 3b const UNDERGROUND_PATH ; 3b
const ROUTE_6 ; 3c const ROUTE_6 ; 3c
const VERMILION_CITY ; 3d const VERMILION_CITY ; 3d
const DIGLETTS_CAVE ; 3e const DIGLETTS_CAVE ; 3e

12
constants/map_dimension_constants.asm
View File

@@ -102,10 +102,10 @@ endm
mapgroup TEAM_ROCKET_BASE_B2F, 9, 15 ; 50 mapgroup TEAM_ROCKET_BASE_B2F, 9, 15 ; 50
mapgroup TEAM_ROCKET_BASE_B3F, 9, 15 ; 51 mapgroup TEAM_ROCKET_BASE_B3F, 9, 15 ; 51
mapgroup ILEX_FOREST, 27, 15 ; 52 mapgroup ILEX_FOREST, 27, 15 ; 52
mapgroup WAREHOUSE_ENTRANCE, 18, 15 ; 53 mapgroup GOLDENROD_UNDERGROUND, 18, 15 ; 53
mapgroup UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54 mapgroup GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54
mapgroup GOLDENROD_DEPT_STORE_B1F, 9, 10 ; 55 mapgroup GOLDENROD_DEPT_STORE_B1F, 9, 10 ; 55
mapgroup UNDERGROUND_WAREHOUSE, 9, 10 ; 56 mapgroup GOLDENROD_UNDERGROUND_WAREHOUSE, 9, 10 ; 56
mapgroup MOUNT_MORTAR_1F_OUTSIDE, 18, 20 ; 57 mapgroup MOUNT_MORTAR_1F_OUTSIDE, 18, 20 ; 57
mapgroup MOUNT_MORTAR_1F_INSIDE, 27, 20 ; 58 mapgroup MOUNT_MORTAR_1F_INSIDE, 27, 20 ; 58
mapgroup MOUNT_MORTAR_2F_INSIDE, 18, 20 ; 59 mapgroup MOUNT_MORTAR_2F_INSIDE, 18, 20 ; 59
@@ -135,7 +135,7 @@ endm
mapgroup TOHJO_FALLS, 9, 15 ; 83 mapgroup TOHJO_FALLS, 9, 15 ; 83
mapgroup DIGLETTS_CAVE, 18, 10 ; 84 mapgroup DIGLETTS_CAVE, 18, 10 ; 84
mapgroup MOUNT_MOON, 9, 15 ; 85 mapgroup MOUNT_MOON, 9, 15 ; 85
mapgroup UNDERGROUND, 14, 3 ; 86 mapgroup UNDERGROUND_PATH, 14, 3 ; 86
mapgroup ROCK_TUNNEL_1F, 18, 15 ; 87 mapgroup ROCK_TUNNEL_1F, 18, 15 ; 87
mapgroup ROCK_TUNNEL_B1F, 18, 15 ; 88 mapgroup ROCK_TUNNEL_B1F, 18, 15 ; 88
mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA, 4, 5 ; 89 mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA, 4, 5 ; 89
@@ -278,7 +278,7 @@ endm
mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10
mapgroup VERMILION_GYM, 9, 5 ; 11 mapgroup VERMILION_GYM, 9, 5 ; 11
mapgroup ROUTE_6_SAFFRON_GATE, 4, 5 ; 12 mapgroup ROUTE_6_SAFFRON_GATE, 4, 5 ; 12
mapgroup ROUTE_6_UNDERGROUND_ENTRANCE, 4, 4 ; 13 mapgroup ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13
newgroup ; 13 newgroup ; 13
@@ -469,7 +469,7 @@ endm
mapgroup SILPH_CO_1F, 4, 8 ; 10 mapgroup SILPH_CO_1F, 4, 8 ; 10
mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11 mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11
mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12 mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12
mapgroup ROUTE_5_UNDERGROUND_ENTRANCE, 4, 4 ; 13 mapgroup ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13
mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5 ; 14 mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5 ; 14
mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15 mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15

2
data/maps/map_scenes.asm
View File

@@ -73,7 +73,7 @@ MapScenes:: ; 4d01e
scene_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FSceneID scene_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FSceneID
scene_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID scene_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID
scene_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID scene_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID
scene_def UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, wUndergroundPathSwitchRoomEntrancesSceneID scene_def GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
scene_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID scene_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID
scene_def VICTORY_ROAD, wVictoryRoadSceneID scene_def VICTORY_ROAD, wVictoryRoadSceneID
scene_def DRAGONS_DEN_B1F, wDragonsDenB1FSceneID scene_def DRAGONS_DEN_B1F, wDragonsDenB1FSceneID

2
engine/events_3.asm
View File

@@ -78,7 +78,7 @@ ReturnFromMapSetupScript:: ; b8000
ret z ret z
cp LAV_RADIO_TOWER cp LAV_RADIO_TOWER
ret z ret z
cp UNDERGROUND cp UNDERGROUND_PATH
ret z ret z
cp INDIGO_PLATEAU cp INDIGO_PLATEAU
ret z ret z

6
engine/std_scripts.asm
View File

@@ -497,7 +497,7 @@ InitializeEventsScript:
setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_RIVAL_CHERRYGROVE_CITY setevent EVENT_RIVAL_CHERRYGROVE_CITY
setevent EVENT_RIVAL_AZALEA_TOWN setevent EVENT_RIVAL_AZALEA_TOWN
setevent EVENT_RIVAL_UNDERGROUND_PATH setevent EVENT_RIVAL_GOLDENROD_UNDERGROUND
setevent EVENT_AZALEA_TOWN_SLOWPOKES setevent EVENT_AZALEA_TOWN_SLOWPOKES
setevent EVENT_KURTS_HOUSE_SLOWPOKE setevent EVENT_KURTS_HOUSE_SLOWPOKE
setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
@@ -550,8 +550,8 @@ InitializeEventsScript:
setevent EVENT_ECRUTEAK_POKE_CENTER_BILL setevent EVENT_ECRUTEAK_POKE_CENTER_BILL
setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
setevent EVENT_LAKE_OF_RAGE_LANCE setevent EVENT_LAKE_OF_RAGE_LANCE
setevent EVENT_WAREHOUSE_LAYOUT_1 setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
setevent EVENT_WAREHOUSE_BLOCKED_OFF setevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
setevent EVENT_DRAGONS_DEN_CLAIR setevent EVENT_DRAGONS_DEN_CLAIR
setevent EVENT_RIVAL_OLIVINE_CITY setevent EVENT_RIVAL_OLIVINE_CITY
setevent EVENT_RIVAL_VICTORY_ROAD setevent EVENT_RIVAL_VICTORY_ROAD

4
event/basement_key.asm
View File

@@ -1,11 +1,11 @@
_BasementKey: ; 507b4 _BasementKey: ; 507b4
; Are we even in the right map to use this? ; Are we even in the right map to use this?
ld a, [MapGroup] ld a, [MapGroup]
cp GROUP_WAREHOUSE_ENTRANCE cp GROUP_GOLDENROD_UNDERGROUND
jr nz, .nope jr nz, .nope
ld a, [MapNumber] ld a, [MapNumber]
cp MAP_WAREHOUSE_ENTRANCE cp MAP_GOLDENROD_UNDERGROUND
jr nz, .nope jr nz, .nope
; Are we on the tile in front of the door? ; Are we on the tile in front of the door?
call GetFacingTileCoord call GetFacingTileCoord

12
maps.asm
View File

@@ -139,7 +139,7 @@ SECTION "Map Scripts 8", ROMX
INCLUDE "maps/DiglettsCave.asm" INCLUDE "maps/DiglettsCave.asm"
INCLUDE "maps/MountMoon.asm" INCLUDE "maps/MountMoon.asm"
INCLUDE "maps/Underground.asm" INCLUDE "maps/UndergroundPath.asm"
INCLUDE "maps/RockTunnel1F.asm" INCLUDE "maps/RockTunnel1F.asm"
INCLUDE "maps/RockTunnelB1F.asm" INCLUDE "maps/RockTunnelB1F.asm"
INCLUDE "maps/SafariZoneFuchsiaGateBeta.asm" INCLUDE "maps/SafariZoneFuchsiaGateBeta.asm"
@@ -176,10 +176,10 @@ INCLUDE "maps/Route2946Gate.asm"
SECTION "Map Scripts 10", ROMX SECTION "Map Scripts 10", ROMX
INCLUDE "maps/Route22.asm" INCLUDE "maps/Route22.asm"
INCLUDE "maps/WarehouseEntrance.asm" INCLUDE "maps/GoldenrodUnderground.asm"
INCLUDE "maps/UndergroundPathSwitchRoomEntrances.asm" INCLUDE "maps/GoldenrodUndergroundSwitchRoomEntrances.asm"
INCLUDE "maps/GoldenrodDeptStoreB1F.asm" INCLUDE "maps/GoldenrodDeptStoreB1F.asm"
INCLUDE "maps/UndergroundWarehouse.asm" INCLUDE "maps/GoldenrodUndergroundWarehouse.asm"
INCLUDE "maps/MountMortar1FOutside.asm" INCLUDE "maps/MountMortar1FOutside.asm"
INCLUDE "maps/MountMortar1FInside.asm" INCLUDE "maps/MountMortar1FInside.asm"
INCLUDE "maps/MountMortar2FInside.asm" INCLUDE "maps/MountMortar2FInside.asm"
@@ -304,7 +304,7 @@ INCLUDE "maps/SaffronTrainStation.asm"
INCLUDE "maps/SilphCo1F.asm" INCLUDE "maps/SilphCo1F.asm"
INCLUDE "maps/CopycatsHouse1F.asm" INCLUDE "maps/CopycatsHouse1F.asm"
INCLUDE "maps/CopycatsHouse2F.asm" INCLUDE "maps/CopycatsHouse2F.asm"
INCLUDE "maps/Route5UndergroundEntrance.asm" INCLUDE "maps/Route5UndergroundPathEntrance.asm"
INCLUDE "maps/Route5SaffronCityGate.asm" INCLUDE "maps/Route5SaffronCityGate.asm"
INCLUDE "maps/Route5CleanseTagSpeechHouse.asm" INCLUDE "maps/Route5CleanseTagSpeechHouse.asm"
@@ -350,7 +350,7 @@ INCLUDE "maps/VermilionMart.asm"
INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm" INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm"
INCLUDE "maps/VermilionGym.asm" INCLUDE "maps/VermilionGym.asm"
INCLUDE "maps/Route6SaffronGate.asm" INCLUDE "maps/Route6SaffronGate.asm"
INCLUDE "maps/Route6UndergroundEntrance.asm" INCLUDE "maps/Route6UndergroundPathEntrance.asm"
INCLUDE "maps/Pokecenter2F.asm" INCLUDE "maps/Pokecenter2F.asm"
INCLUDE "maps/TradeCenter.asm" INCLUDE "maps/TradeCenter.asm"
INCLUDE "maps/Colosseum.asm" INCLUDE "maps/Colosseum.asm"

4
maps/GoldenrodCity.asm
View File

@@ -572,8 +572,8 @@ GoldenrodCity_MapEventHeader:
warp_def $15, $e, 1, GOLDENROD_GAME_CORNER warp_def $15, $e, 1, GOLDENROD_GAME_CORNER
warp_def $f, $5, 1, RADIO_TOWER_1F warp_def $f, $5, 1, RADIO_TOWER_1F
warp_def $1, $13, 3, ROUTE_35_GOLDENROD_GATE warp_def $1, $13, 3, ROUTE_35_GOLDENROD_GATE
warp_def $5, $9, 8, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $5, $9, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_def $1d, $b, 5, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $1d, $b, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_def $1b, $f, 1, GOLDENROD_POKECENTER_1F warp_def $1b, $f, 1, GOLDENROD_POKECENTER_1F
.CoordEvents: .CoordEvents:

8
maps/GoldenrodDeptStoreB1F.asm
View File

@@ -27,9 +27,9 @@ UnknownScript_0x7d78a:
jump UnknownScript_0x7d791 jump UnknownScript_0x7d791
UnknownScript_0x7d791: UnknownScript_0x7d791:
checkevent EVENT_WAREHOUSE_LAYOUT_2 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
iftrue .Layout2 iftrue .Layout2
checkevent EVENT_WAREHOUSE_LAYOUT_3 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
iftrue .Layout3 iftrue .Layout3
changeblock $a, $8, $d changeblock $a, $8, $d
return return
@@ -43,7 +43,7 @@ UnknownScript_0x7d791:
return return
UnknownScript_0x7d7ac: UnknownScript_0x7d7ac:
clearevent EVENT_WAREHOUSE_BLOCKED_OFF clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
return return
GoldenrodDeptStoreB1FBlackBelt1Script: GoldenrodDeptStoreB1FBlackBelt1Script:
@@ -115,7 +115,7 @@ GoldenrodDeptStoreB1F_MapEventHeader:
.Warps: .Warps:
db 3 db 3
warp_def $2, $11, 3, UNDERGROUND_WAREHOUSE warp_def $2, $11, 3, GOLDENROD_UNDERGROUND_WAREHOUSE
warp_def $4, $9, 1, GOLDENROD_DEPT_STORE_ELEVATOR warp_def $4, $9, 1, GOLDENROD_DEPT_STORE_ELEVATOR
warp_def $4, $a, 2, GOLDENROD_DEPT_STORE_ELEVATOR warp_def $4, $a, 2, GOLDENROD_DEPT_STORE_ELEVATOR

26
maps/GoldenrodDeptStoreElevator.asm
View File

@@ -14,30 +14,30 @@ MapGoldenrodDeptStoreElevatorSignpost0Script:
playsound SFX_ELEVATOR playsound SFX_ELEVATOR
earthquake 60 earthquake 60
waitsfx waitsfx
checkevent EVENT_WAREHOUSE_BLOCKED_OFF checkevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
iftrue .Done iftrue .Done
checkevent EVENT_WAREHOUSE_LAYOUT_1 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
iftrue .BoxLayout1 iftrue .BoxLayout1
checkevent EVENT_WAREHOUSE_LAYOUT_2 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
iftrue .BoxLayout2 iftrue .BoxLayout2
checkevent EVENT_WAREHOUSE_LAYOUT_3 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
iftrue .BoxLayout3 iftrue .BoxLayout3
.BoxLayout3: .BoxLayout3:
setevent EVENT_WAREHOUSE_LAYOUT_1 setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
clearevent EVENT_WAREHOUSE_LAYOUT_2 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
clearevent EVENT_WAREHOUSE_LAYOUT_3 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
end end
.BoxLayout1: .BoxLayout1:
clearevent EVENT_WAREHOUSE_LAYOUT_1 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
setevent EVENT_WAREHOUSE_LAYOUT_2 setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
clearevent EVENT_WAREHOUSE_LAYOUT_3 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
end end
.BoxLayout2: .BoxLayout2:
clearevent EVENT_WAREHOUSE_LAYOUT_1 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
clearevent EVENT_WAREHOUSE_LAYOUT_2 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
setevent EVENT_WAREHOUSE_LAYOUT_3 setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
end end
.Done: .Done:

143
maps/WarehouseEntrance.asm → maps/GoldenrodUnderground.asm
View File

@@ -1,15 +1,15 @@
const_value set 2 const_value set 2
const WAREHOUSEENTRANCE_SUPER_NERD1 const GOLDENRODUNDERGROUND_SUPER_NERD1
const WAREHOUSEENTRANCE_SUPER_NERD2 const GOLDENRODUNDERGROUND_SUPER_NERD2
const WAREHOUSEENTRANCE_SUPER_NERD3 const GOLDENRODUNDERGROUND_SUPER_NERD3
const WAREHOUSEENTRANCE_SUPER_NERD4 const GOLDENRODUNDERGROUND_SUPER_NERD4
const WAREHOUSEENTRANCE_POKE_BALL const GOLDENRODUNDERGROUND_POKE_BALL
const WAREHOUSEENTRANCE_GRAMPS const GOLDENRODUNDERGROUND_GRAMPS
const WAREHOUSEENTRANCE_SUPER_NERD5 const GOLDENRODUNDERGROUND_SUPER_NERD5
const WAREHOUSEENTRANCE_SUPER_NERD6 const GOLDENRODUNDERGROUND_SUPER_NERD6
const WAREHOUSEENTRANCE_GRANNY const GOLDENRODUNDERGROUND_GRANNY
WarehouseEntrance_MapScriptHeader: GoldenrodUnderground_MapScriptHeader:
.SceneScripts: .SceneScripts:
db 0 db 0
@@ -58,56 +58,56 @@ WarehouseEntrance_MapScriptHeader:
if_equal SATURDAY, .Saturday if_equal SATURDAY, .Saturday
.Sunday: .Sunday:
disappear WAREHOUSEENTRANCE_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
disappear WAREHOUSEENTRANCE_SUPER_NERD5 disappear GOLDENRODUNDERGROUND_SUPER_NERD5
appear WAREHOUSEENTRANCE_SUPER_NERD6 appear GOLDENRODUNDERGROUND_SUPER_NERD6
appear WAREHOUSEENTRANCE_GRANNY appear GOLDENRODUNDERGROUND_GRANNY
return return
.Monday: .Monday:
disappear WAREHOUSEENTRANCE_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
checkmorn checkmorn
iffalse .NotMondayMorning iffalse .NotMondayMorning
appear WAREHOUSEENTRANCE_GRAMPS appear GOLDENRODUNDERGROUND_GRAMPS
.NotMondayMorning: .NotMondayMorning:
disappear WAREHOUSEENTRANCE_SUPER_NERD5 disappear GOLDENRODUNDERGROUND_SUPER_NERD5
disappear WAREHOUSEENTRANCE_SUPER_NERD6 disappear GOLDENRODUNDERGROUND_SUPER_NERD6
disappear WAREHOUSEENTRANCE_GRANNY disappear GOLDENRODUNDERGROUND_GRANNY
return return
.Tuesday: .Tuesday:
disappear WAREHOUSEENTRANCE_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
appear WAREHOUSEENTRANCE_SUPER_NERD5 appear GOLDENRODUNDERGROUND_SUPER_NERD5
disappear WAREHOUSEENTRANCE_SUPER_NERD6 disappear GOLDENRODUNDERGROUND_SUPER_NERD6
disappear WAREHOUSEENTRANCE_GRANNY disappear GOLDENRODUNDERGROUND_GRANNY
return return
.Wednesday: .Wednesday:
disappear WAREHOUSEENTRANCE_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
disappear WAREHOUSEENTRANCE_SUPER_NERD5 disappear GOLDENRODUNDERGROUND_SUPER_NERD5
appear WAREHOUSEENTRANCE_SUPER_NERD6 appear GOLDENRODUNDERGROUND_SUPER_NERD6
disappear WAREHOUSEENTRANCE_GRANNY disappear GOLDENRODUNDERGROUND_GRANNY
return return
.Thursday: .Thursday:
disappear WAREHOUSEENTRANCE_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
appear WAREHOUSEENTRANCE_SUPER_NERD5 appear GOLDENRODUNDERGROUND_SUPER_NERD5
disappear WAREHOUSEENTRANCE_SUPER_NERD6 disappear GOLDENRODUNDERGROUND_SUPER_NERD6
disappear WAREHOUSEENTRANCE_GRANNY disappear GOLDENRODUNDERGROUND_GRANNY
return return
.Friday: .Friday:
disappear WAREHOUSEENTRANCE_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
disappear WAREHOUSEENTRANCE_SUPER_NERD5 disappear GOLDENRODUNDERGROUND_SUPER_NERD5
appear WAREHOUSEENTRANCE_SUPER_NERD6 appear GOLDENRODUNDERGROUND_SUPER_NERD6
disappear WAREHOUSEENTRANCE_GRANNY disappear GOLDENRODUNDERGROUND_GRANNY
return return
.Saturday: .Saturday:
disappear WAREHOUSEENTRANCE_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
appear WAREHOUSEENTRANCE_SUPER_NERD5 appear GOLDENRODUNDERGROUND_SUPER_NERD5
disappear WAREHOUSEENTRANCE_SUPER_NERD6 disappear GOLDENRODUNDERGROUND_SUPER_NERD6
appear WAREHOUSEENTRANCE_GRANNY appear GOLDENRODUNDERGROUND_GRANNY
return return
TrainerSupernerdEric: TrainerSupernerdEric:
@@ -159,7 +159,7 @@ GrannyScript_0x7c132:
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_equal SUNDAY, .Open if_equal SUNDAY, .Open
if_equal SATURDAY, .Open if_equal SATURDAY, .Open
jump WarehouseEntranceScript_ShopClosed jump GoldenrodUndergroundScript_ShopClosed
.Open: .Open:
pokemart MARTTYPE_BITTER, MART_UNDERGROUND pokemart MARTTYPE_BITTER, MART_UNDERGROUND
@@ -169,14 +169,14 @@ GrannyScript_0x7c132:
GrampsScript_0x7c146: GrampsScript_0x7c146:
opentext opentext
checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
iftrue WarehouseEntranceScript_ShopClosed iftrue GoldenrodUndergroundScript_ShopClosed
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_equal MONDAY, .CheckMorn if_equal MONDAY, .CheckMorn
jump WarehouseEntranceScript_ShopClosed jump GoldenrodUndergroundScript_ShopClosed
.CheckMorn: .CheckMorn:
checkmorn checkmorn
iffalse WarehouseEntranceScript_ShopClosed iffalse GoldenrodUndergroundScript_ShopClosed
pokemart MARTTYPE_BARGAIN, 0 pokemart MARTTYPE_BARGAIN, 0
closetext closetext
end end
@@ -187,7 +187,7 @@ OlderHaircutBrotherScript:
if_equal TUESDAY, .DoHaircut if_equal TUESDAY, .DoHaircut
if_equal THURSDAY, .DoHaircut if_equal THURSDAY, .DoHaircut
if_equal SATURDAY, .DoHaircut if_equal SATURDAY, .DoHaircut
jump WarehouseEntranceScript_ShopClosed jump GoldenrodUndergroundScript_ShopClosed
.DoHaircut: .DoHaircut:
checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@@ -270,7 +270,7 @@ YoungerHaircutBrotherScript:
if_equal SUNDAY, .DoHaircut if_equal SUNDAY, .DoHaircut
if_equal WEDNESDAY, .DoHaircut if_equal WEDNESDAY, .DoHaircut
if_equal FRIDAY, .DoHaircut if_equal FRIDAY, .DoHaircut
jump WarehouseEntranceScript_ShopClosed jump GoldenrodUndergroundScript_ShopClosed
.DoHaircut: .DoHaircut:
checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@@ -396,29 +396,26 @@ BasementDoorScript::
closetext closetext
end end
WarehouseEntranceScript_ShopClosed: GoldenrodUndergroundScript_ShopClosed:
writetext UnknownText_0x7c904 writetext UnknownText_0x7c904
waitbutton waitbutton
closetext closetext
end end
WarehouseEntranceCoinCase: GoldenrodUndergroundCoinCase:
itemball COIN_CASE itemball COIN_CASE
MapWarehouseEntranceSignpost1Script: MapGoldenrodUndergroundSignpost1Script:
jumptext UnknownText_0x7c91a jumptext UnknownText_0x7c91a
WarehouseEntranceHiddenParlyzHeal: GoldenrodUndergroundHiddenParlyzHeal:
dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL
GoldenrodUndergroundHiddenSuperPotion:
dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION
WarehouseEntranceHiddenSuperPotion: GoldenrodUndergroundHiddenAntidote:
dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION, SUPER_POTION dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE
WarehouseEntranceHiddenAntidote:
dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE, ANTIDOTE
SupernerdEricSeenText: SupernerdEricSeenText:
text "I got booted out" text "I got booted out"
@@ -649,18 +646,18 @@ UnknownText_0x7c91a:
line "THIS POINT" line "THIS POINT"
done done
WarehouseEntrance_MapEventHeader: GoldenrodUnderground_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0
.Warps: .Warps:
db 6 db 6
warp_def $2, $3, 7, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $2, $3, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_def $22, $3, 4, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $22, $3, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_def $6, $12, 4, WAREHOUSE_ENTRANCE warp_def $6, $12, 4, GOLDENROD_UNDERGROUND
warp_def $1f, $15, 3, WAREHOUSE_ENTRANCE warp_def $1f, $15, 3, GOLDENROD_UNDERGROUND
warp_def $1f, $16, 3, WAREHOUSE_ENTRANCE warp_def $1f, $16, 3, GOLDENROD_UNDERGROUND
warp_def $1b, $16, 1, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $1b, $16, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
.CoordEvents: .CoordEvents:
db 0 db 0
@@ -668,10 +665,10 @@ WarehouseEntrance_MapEventHeader:
.BGEvents: .BGEvents:
db 5 db 5
bg_event 6, 18, BGEVENT_READ, BasementDoorScript bg_event 6, 18, BGEVENT_READ, BasementDoorScript
bg_event 6, 19, BGEVENT_READ, MapWarehouseEntranceSignpost1Script bg_event 6, 19, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script
bg_event 13, 6, BGEVENT_ITEM, WarehouseEntranceHiddenParlyzHeal bg_event 13, 6, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
bg_event 18, 4, BGEVENT_ITEM, WarehouseEntranceHiddenSuperPotion bg_event 18, 4, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
bg_event 8, 17, BGEVENT_ITEM, WarehouseEntranceHiddenAntidote bg_event 8, 17, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
.ObjectEvents: .ObjectEvents:
db 9 db 9
@@ -679,8 +676,8 @@ WarehouseEntrance_MapEventHeader:
object_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 object_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
object_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 object_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
object_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 object_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
object_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WarehouseEntranceCoinCase, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE object_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
object_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS object_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
object_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER object_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
object_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER object_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
object_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY object_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY

0
maps/WarehouseEntrance.blk → maps/GoldenrodUnderground.blk
View File

128
maps/UndergroundPathSwitchRoomEntrances.asm → maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@@ -31,19 +31,19 @@ doorstate: macro
endm endm
const_value set 2 const_value set 2
const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST1 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1
const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2
const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET1 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1
const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET2
const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET3 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET3
const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET_GIRL const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET_GIRL
const UNDERGROUNDPATHSWITCHROOMENTRANCES_TEACHER const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_TEACHER
const UNDERGROUNDPATHSWITCHROOMENTRANCES_SUPER_NERD const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SUPER_NERD
const UNDERGROUNDPATHSWITCHROOMENTRANCES_POKE_BALL1 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL1
const UNDERGROUNDPATHSWITCHROOMENTRANCES_POKE_BALL2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL2
const UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
UndergroundPathSwitchRoomEntrances_MapScriptHeader: GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader:
.SceneScripts: .SceneScripts:
db 2 db 2
scene_script .DummyScene0 scene_script .DummyScene0
@@ -112,10 +112,10 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader:
return return
SuperNerdScript_0x7ca7a: SuperNerdScript_0x7ca7a:
jumptextfaceplayer UndergroundPathSwitchRoomEntrances_SuperNerdText jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText
TeacherScript_0x7ca7d: TeacherScript_0x7ca7d:
jumptextfaceplayer UndergroundPathSwitchRoomEntrances_TeacherText jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText
UndergroundSilverScene1: UndergroundSilverScene1:
spriteface PLAYER, RIGHT spriteface PLAYER, RIGHT
@@ -123,14 +123,14 @@ UndergroundSilverScene1:
special Special_FadeOutMusic special Special_FadeOutMusic
pause 15 pause 15
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
waitsfx waitsfx
applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1 applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1
spriteface PLAYER, RIGHT spriteface PLAYER, RIGHT
scall UndergroundSilverBattleScript scall UndergroundSilverBattleScript
applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1 applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
setscene 1 setscene 1
waitsfx waitsfx
playmapmusic playmapmusic
@@ -142,14 +142,14 @@ UndergroundSilverScene2:
special Special_FadeOutMusic special Special_FadeOutMusic
pause 15 pause 15
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
waitsfx waitsfx
applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2 applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2
spriteface PLAYER, RIGHT spriteface PLAYER, RIGHT
scall UndergroundSilverBattleScript scall UndergroundSilverBattleScript
applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2 applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
setscene 1 setscene 1
waitsfx waitsfx
playmapmusic playmapmusic
@@ -166,13 +166,13 @@ UndergroundSilverBattleScript:
writetext UndergroundSilverBeforeText writetext UndergroundSilverBeforeText
waitbutton waitbutton
closetext closetext
setevent EVENT_RIVAL_UNDERGROUND_PATH setevent EVENT_RIVAL_GOLDENROD_UNDERGROUND
checkevent EVENT_GOT_TOTODILE_FROM_ELM checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue .Totodile iftrue .Totodile
checkevent EVENT_GOT_CHIKORITA_FROM_ELM checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue .Chikorita iftrue .Chikorita
winlosstext UndergroundSilverWinText, UndergroundSilverLossText winlosstext UndergroundSilverWinText, UndergroundSilverLossText
setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
loadtrainer RIVAL1, RIVAL1_4_TOTODILE loadtrainer RIVAL1, RIVAL1_4_TOTODILE
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
@@ -181,7 +181,7 @@ UndergroundSilverBattleScript:
.Totodile: .Totodile:
winlosstext UndergroundSilverWinText, UndergroundSilverLossText winlosstext UndergroundSilverWinText, UndergroundSilverLossText
setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
loadtrainer RIVAL1, RIVAL1_4_CHIKORITA loadtrainer RIVAL1, RIVAL1_4_CHIKORITA
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
@@ -190,7 +190,7 @@ UndergroundSilverBattleScript:
.Chikorita: .Chikorita:
winlosstext UndergroundSilverWinText, UndergroundSilverLossText winlosstext UndergroundSilverWinText, UndergroundSilverLossText
setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
loadtrainer RIVAL1, RIVAL1_4_CYNDAQUIL loadtrainer RIVAL1, RIVAL1_4_CYNDAQUIL
startbattle startbattle
dontrestartmapmusic dontrestartmapmusic
@@ -279,22 +279,22 @@ Switch1Script:
iftrue .On iftrue .On
writetext SwitchRoomText_OffTurnOn writetext SwitchRoomText_OffTurnOn
yesorno yesorno
iffalse UndergroundPathSwitchRoomEntrances_DontToggle iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions copybytetovar UndergroundSwitchPositions
addvar 1 addvar 1
copyvartobyte UndergroundSwitchPositions copyvartobyte UndergroundSwitchPositions
setevent EVENT_SWITCH_1 setevent EVENT_SWITCH_1
jump UndergroundPathSwitchRoomEntrances_UpdateDoors jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On: .On:
writetext SwitchRoomText_OnTurnOff writetext SwitchRoomText_OnTurnOff
yesorno yesorno
iffalse UndergroundPathSwitchRoomEntrances_DontToggle iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions copybytetovar UndergroundSwitchPositions
addvar -1 addvar -1
copyvartobyte UndergroundSwitchPositions copyvartobyte UndergroundSwitchPositions
clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_1
jump UndergroundPathSwitchRoomEntrances_UpdateDoors jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
Switch2Script: Switch2Script:
opentext opentext
@@ -304,22 +304,22 @@ Switch2Script:
iftrue .On iftrue .On
writetext SwitchRoomText_OffTurnOn writetext SwitchRoomText_OffTurnOn
yesorno yesorno
iffalse UndergroundPathSwitchRoomEntrances_DontToggle iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions copybytetovar UndergroundSwitchPositions
addvar 2 addvar 2
copyvartobyte UndergroundSwitchPositions copyvartobyte UndergroundSwitchPositions
setevent EVENT_SWITCH_2 setevent EVENT_SWITCH_2
jump UndergroundPathSwitchRoomEntrances_UpdateDoors jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On: .On:
writetext SwitchRoomText_OnTurnOff writetext SwitchRoomText_OnTurnOff
yesorno yesorno
iffalse UndergroundPathSwitchRoomEntrances_DontToggle iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions copybytetovar UndergroundSwitchPositions
addvar -2 addvar -2
copyvartobyte UndergroundSwitchPositions copyvartobyte UndergroundSwitchPositions
clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_2
jump UndergroundPathSwitchRoomEntrances_UpdateDoors jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
Switch3Script: Switch3Script:
opentext opentext
@@ -329,22 +329,22 @@ Switch3Script:
iftrue .On iftrue .On
writetext SwitchRoomText_OffTurnOn writetext SwitchRoomText_OffTurnOn
yesorno yesorno
iffalse UndergroundPathSwitchRoomEntrances_DontToggle iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions copybytetovar UndergroundSwitchPositions
addvar 3 addvar 3
copyvartobyte UndergroundSwitchPositions copyvartobyte UndergroundSwitchPositions
setevent EVENT_SWITCH_3 setevent EVENT_SWITCH_3
jump UndergroundPathSwitchRoomEntrances_UpdateDoors jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On: .On:
writetext SwitchRoomText_OnTurnOff writetext SwitchRoomText_OnTurnOff
yesorno yesorno
iffalse UndergroundPathSwitchRoomEntrances_DontToggle iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions copybytetovar UndergroundSwitchPositions
addvar -3 addvar -3
copyvartobyte UndergroundSwitchPositions copyvartobyte UndergroundSwitchPositions
clearevent EVENT_SWITCH_3 clearevent EVENT_SWITCH_3
jump UndergroundPathSwitchRoomEntrances_UpdateDoors jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
EmergencySwitchScript: EmergencySwitchScript:
opentext opentext
@@ -354,32 +354,32 @@ EmergencySwitchScript:
iftrue .On iftrue .On
writetext SwitchRoomText_OffTurnOn writetext SwitchRoomText_OffTurnOn
yesorno yesorno
iffalse UndergroundPathSwitchRoomEntrances_DontToggle iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
writebyte 7 writebyte 7
copyvartobyte UndergroundSwitchPositions copyvartobyte UndergroundSwitchPositions
setevent EVENT_EMERGENCY_SWITCH setevent EVENT_EMERGENCY_SWITCH
setevent EVENT_SWITCH_1 setevent EVENT_SWITCH_1
setevent EVENT_SWITCH_2 setevent EVENT_SWITCH_2
setevent EVENT_SWITCH_3 setevent EVENT_SWITCH_3
jump UndergroundPathSwitchRoomEntrances_UpdateDoors jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On: .On:
writetext SwitchRoomText_OnTurnOff writetext SwitchRoomText_OnTurnOff
yesorno yesorno
iffalse UndergroundPathSwitchRoomEntrances_DontToggle iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
writebyte 0 writebyte 0
copyvartobyte UndergroundSwitchPositions copyvartobyte UndergroundSwitchPositions
clearevent EVENT_EMERGENCY_SWITCH clearevent EVENT_EMERGENCY_SWITCH
clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_1
clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_2
clearevent EVENT_SWITCH_3 clearevent EVENT_SWITCH_3
jump UndergroundPathSwitchRoomEntrances_UpdateDoors jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
UndergroundPathSwitchRoomEntrances_DontToggle: GoldenrodUndergroundSwitchRoomEntrances_DontToggle:
closetext closetext
end end
UndergroundPathSwitchRoomEntrances_UpdateDoors: GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
copybytetovar UndergroundSwitchPositions copybytetovar UndergroundSwitchPositions
if_equal 0, .Position0 if_equal 0, .Position0
if_equal 1, .Position1 if_equal 1, .Position1
@@ -623,19 +623,17 @@ UndergroundPathSwitchRoomEntrances_UpdateDoors:
clearevent EVENT_SWITCH_14 clearevent EVENT_SWITCH_14
end end
UndergroundPathSwitchRoomEntrancesSmokeBall: GoldenrodUndergroundSwitchRoomEntrancesSmokeBall:
itemball SMOKE_BALL itemball SMOKE_BALL
UndergroundPathSwitchRoomEntrancesFullHeal: GoldenrodUndergroundSwitchRoomEntrancesFullHeal:
itemball FULL_HEAL itemball FULL_HEAL
UndergroundPathSwitchRoomEntrancesHiddenMaxPotion: GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion:
dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
UndergroundPathSwitchRoomEntrancesHiddenRevive:
dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE
GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive:
dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE
UndergroundSilverApproachMovement1: UndergroundSilverApproachMovement1:
step DOWN step DOWN
@@ -751,7 +749,7 @@ UndergroundSilverLossText:
cont "under my heels." cont "under my heels."
done done
UndergroundPathSwitchRoomEntrances_SuperNerdText: GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText:
text "I was challenged" text "I was challenged"
line "to a battle down-" line "to a battle down-"
cont "stairs." cont "stairs."
@@ -761,7 +759,7 @@ UndergroundPathSwitchRoomEntrances_SuperNerdText:
cont "better be careful." cont "better be careful."
done done
UndergroundPathSwitchRoomEntrances_TeacherText: GoldenrodUndergroundSwitchRoomEntrances_TeacherText:
text "There are some" text "There are some"
line "shops downstairs…" line "shops downstairs…"
@@ -931,19 +929,19 @@ SwitchRoomText_Emergency:
line "EMERGENCY." line "EMERGENCY."
done done
UndergroundPathSwitchRoomEntrances_MapEventHeader: GoldenrodUndergroundSwitchRoomEntrances_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0
.Warps: .Warps:
db 9 db 9
warp_def $3, $17, 6, WAREHOUSE_ENTRANCE warp_def $3, $17, 6, GOLDENROD_UNDERGROUND
warp_def $a, $16, 1, UNDERGROUND_WAREHOUSE warp_def $a, $16, 1, GOLDENROD_UNDERGROUND_WAREHOUSE
warp_def $a, $17, 2, UNDERGROUND_WAREHOUSE warp_def $a, $17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE
warp_def $19, $5, 2, WAREHOUSE_ENTRANCE warp_def $19, $5, 2, GOLDENROD_UNDERGROUND
warp_def $1d, $4, 14, GOLDENROD_CITY warp_def $1d, $4, 14, GOLDENROD_CITY
warp_def $1d, $5, 14, GOLDENROD_CITY warp_def $1d, $5, 14, GOLDENROD_CITY
warp_def $19, $15, 1, WAREHOUSE_ENTRANCE warp_def $19, $15, 1, GOLDENROD_UNDERGROUND
warp_def $1d, $14, 13, GOLDENROD_CITY warp_def $1d, $14, 13, GOLDENROD_CITY
warp_def $1d, $15, 13, GOLDENROD_CITY warp_def $1d, $15, 13, GOLDENROD_CITY
@@ -958,8 +956,8 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader:
bg_event 1, 10, BGEVENT_READ, Switch2Script bg_event 1, 10, BGEVENT_READ, Switch2Script
bg_event 1, 2, BGEVENT_READ, Switch3Script bg_event 1, 2, BGEVENT_READ, Switch3Script
bg_event 11, 20, BGEVENT_READ, EmergencySwitchScript bg_event 11, 20, BGEVENT_READ, EmergencySwitchScript
bg_event 9, 8, BGEVENT_ITEM, UndergroundPathSwitchRoomEntrancesHiddenMaxPotion bg_event 9, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
bg_event 8, 1, BGEVENT_ITEM, UndergroundPathSwitchRoomEntrancesHiddenRevive bg_event 8, 1, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
.ObjectEvents: .ObjectEvents:
db 11 db 11
@@ -971,6 +969,6 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader:
object_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 object_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
object_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1 object_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1
object_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesSmokeBall, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL object_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
object_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesFullHeal, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL object_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
object_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH object_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND

0
maps/UndergroundPathSwitchRoomEntrances.blk → maps/GoldenrodUndergroundSwitchRoomEntrances.blk
View File

40
maps/UndergroundWarehouse.asm → maps/GoldenrodUndergroundWarehouse.asm
View File

@@ -1,13 +1,13 @@
const_value set 2 const_value set 2
const UNDERGROUNDWAREHOUSE_ROCKET1 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1
const UNDERGROUNDWAREHOUSE_ROCKET2 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2
const UNDERGROUNDWAREHOUSE_ROCKET3 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3
const UNDERGROUNDWAREHOUSE_GENTLEMAN const GOLDENRODUNDERGROUNDWAREHOUSE_GENTLEMAN
const UNDERGROUNDWAREHOUSE_POKE_BALL1 const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL1
const UNDERGROUNDWAREHOUSE_POKE_BALL2 const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL2
const UNDERGROUNDWAREHOUSE_POKE_BALL3 const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3
UndergroundWarehouse_MapScriptHeader: GoldenrodUndergroundWarehouse_MapScriptHeader:
.SceneScripts: .SceneScripts:
db 0 db 0
@@ -77,9 +77,9 @@ GentlemanScript_0x7d9bf:
buttonsound buttonsound
verbosegiveitem CARD_KEY verbosegiveitem CARD_KEY
setevent EVENT_RECEIVED_CARD_KEY setevent EVENT_RECEIVED_CARD_KEY
setevent EVENT_WAREHOUSE_LAYOUT_1 setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
clearevent EVENT_WAREHOUSE_LAYOUT_2 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
clearevent EVENT_WAREHOUSE_LAYOUT_3 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
writetext UnknownText_0x7dc5b writetext UnknownText_0x7dc5b
buttonsound buttonsound
UnknownScript_0x7d9de: UnknownScript_0x7d9de:
@@ -88,13 +88,13 @@ UnknownScript_0x7d9de:
closetext closetext
end end
UndergroundWarehouseMaxEther: GoldenrodUndergroundWarehouseMaxEther:
itemball MAX_ETHER itemball MAX_ETHER
UndergroundWarehouseTMSleepTalk: GoldenrodUndergroundWarehouseTMSleepTalk:
itemball TM_SLEEP_TALK itemball TM_SLEEP_TALK
UndergroundWarehouseUltraBall: GoldenrodUndergroundWarehouseUltraBall:
itemball ULTRA_BALL itemball ULTRA_BALL
GruntM24SeenText: GruntM24SeenText:
@@ -210,14 +210,14 @@ UnknownText_0x7dc8d:
line "MON nationwide!" line "MON nationwide!"
done done
UndergroundWarehouse_MapEventHeader: GoldenrodUndergroundWarehouse_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0
.Warps: .Warps:
db 3 db 3
warp_def $c, $2, 2, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $c, $2, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_def $c, $3, 3, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $c, $3, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_def $2, $11, 1, GOLDENROD_DEPT_STORE_B1F warp_def $2, $11, 1, GOLDENROD_DEPT_STORE_B1F
.CoordEvents: .CoordEvents:
@@ -232,6 +232,6 @@ UndergroundWarehouse_MapEventHeader:
object_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundWarehouseMaxEther, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER object_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
object_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundWarehouseTMSleepTalk, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK object_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
object_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundWarehouseUltraBall, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL object_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL

0
maps/UndergroundWarehouse.blk → maps/GoldenrodUndergroundWarehouse.blk
View File

2
maps/Route5.asm
View File

@@ -45,7 +45,7 @@ Route5_MapEventHeader:
.Warps: .Warps:
db 4 db 4
warp_def $f, $11, 1, ROUTE_5_UNDERGROUND_ENTRANCE warp_def $f, $11, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
warp_def $11, $8, 1, ROUTE_5_SAFFRON_CITY_GATE warp_def $11, $8, 1, ROUTE_5_SAFFRON_CITY_GATE
warp_def $11, $9, 2, ROUTE_5_SAFFRON_CITY_GATE warp_def $11, $9, 2, ROUTE_5_SAFFRON_CITY_GATE
warp_def $b, $a, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE warp_def $b, $a, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE

40
maps/Route5UndergroundEntrance.asm
View File

@@ -1,40 +0,0 @@
const_value set 2
const ROUTE5UNDERGROUNDENTRANCE_TEACHER
Route5UndergroundEntrance_MapScriptHeader:
.SceneScripts:
db 0
.MapCallbacks:
db 0
Route5UndergroundEntranceTeacherScript:
jumptextfaceplayer Route5UndergroundEntranceTeacherText
Route5UndergroundEntranceTeacherText:
text "Many cities in"
line "JOHTO have long"
para "histories. I'd"
line "love to visit!"
done
Route5UndergroundEntrance_MapEventHeader:
; filler
db 0, 0
.Warps:
db 3
warp_def $7, $3, 1, ROUTE_5
warp_def $7, $4, 1, ROUTE_5
warp_def $3, $4, 1, UNDERGROUND
.CoordEvents:
db 0
.BGEvents:
db 0
.ObjectEvents:
db 1
object_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundEntranceTeacherScript, -1

40
maps/Route5UndergroundPathEntrance.asm Normal file
View File

@@ -0,0 +1,40 @@
const_value set 2
const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER
Route5UndergroundPathEntrance_MapScriptHeader:
.SceneScripts:
db 0
.MapCallbacks:
db 0
Route5UndergroundPathEntranceTeacherScript:
jumptextfaceplayer Route5UndergroundPathEntranceTeacherText
Route5UndergroundPathEntranceTeacherText:
text "Many cities in"
line "JOHTO have long"
para "histories. I'd"
line "love to visit!"
done
Route5UndergroundPathEntrance_MapEventHeader:
; filler
db 0, 0
.Warps:
db 3
warp_def $7, $3, 1, ROUTE_5
warp_def $7, $4, 1, ROUTE_5
warp_def $3, $4, 1, UNDERGROUND_PATH
.CoordEvents:
db 0
.BGEvents:
db 0
.ObjectEvents:
db 1
object_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1

Some files were not shown because too many files have changed in this diff Show More