summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--maps/BlackthornGym1F.asm6
-rw-r--r--maps/BrunosRoom.asm24
-rw-r--r--maps/BurnedTower1F.asm12
-rw-r--r--maps/BurnedTowerB1F.asm8
-rw-r--r--maps/CeladonDeptStore6F.asm6
-rw-r--r--maps/GoldenrodDeptStoreB1F.asm8
-rw-r--r--maps/GoldenrodDeptStoreRoof.asm8
-rw-r--r--maps/GoldenrodUnderground.asm4
-rw-r--r--maps/GoldenrodUndergroundSwitchRoomEntrances.asm1
-rw-r--r--maps/KarensRoom.asm24
-rw-r--r--maps/KogasRoom.asm24
-rw-r--r--maps/LancesRoom.asm16
-rw-r--r--maps/MahoganyMart1F.asm4
-rw-r--r--maps/RadioTower3F.asm8
-rw-r--r--maps/Route19.asm12
-rw-r--r--maps/RuinsOfAlphAerodactylChamber.asm12
-rw-r--r--maps/RuinsOfAlphHoOhChamber.asm12
-rw-r--r--maps/RuinsOfAlphKabutoChamber.asm12
-rw-r--r--maps/RuinsOfAlphOmanyteChamber.asm12
-rw-r--r--maps/TeamRocketBaseB2F.asm8
-rw-r--r--maps/TeamRocketBaseB3F.asm4
-rw-r--r--maps/TinTower1F.asm4
-rw-r--r--maps/WillsRoom.asm24
23 files changed, 127 insertions, 126 deletions
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 920442fe9..25de39246 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -16,15 +16,15 @@ BlackthornGym1F_MapScripts:
.Boulders:
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1
iffalse .skip1
- changeblock 8, 2, $3b
+ changeblock 8, 2, $3b ; fallen boulder 2
.skip1
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_2
iffalse .skip2
- changeblock 2, 4, $3a
+ changeblock 2, 4, $3a ; fallen boulder 1
.skip2
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_3
iffalse .skip3
- changeblock 8, 6, $3b
+ changeblock 8, 6, $3b ; fallen boulder 2
.skip3
return
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index bdb93065e..9ddbb5664 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -20,21 +20,21 @@ BrunosRoom_MapScripts:
.BrunosRoomDoors:
checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
- iffalse .KeepDoorClosed
- changeblock 4, 14, $2a
-.KeepDoorClosed:
+ iffalse .KeepEntranceOpen
+ changeblock 4, 14, $2a ; wall
+.KeepEntranceOpen:
checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN
- iffalse .OpenDoor
- changeblock 4, 2, $16
-.OpenDoor:
+ iffalse .KeepExitClosed
+ changeblock 4, 2, $16 ; open door
+.KeepExitClosed:
return
.BrunosDoorLocksBehindYou:
- applymovement PLAYER, MovementData_0x1809f9
+ applymovement PLAYER, BrunosRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
- changeblock 4, 14, $2a
+ changeblock 4, 14, $2a ; wall
reloadmappart
closetext
setscene 1
@@ -46,7 +46,7 @@ BrunoScript_Battle:
faceplayer
opentext
checkevent EVENT_BEAT_ELITE_4_BRUNO
- iftrue UnknownScript_0x1809f3
+ iftrue BrunoScript_AfterBattle
writetext BrunoScript_BrunoBeforeText
waitbutton
closetext
@@ -60,20 +60,20 @@ BrunoScript_Battle:
waitbutton
closetext
playsound SFX_ENTER_DOOR
- changeblock 4, 2, $16
+ changeblock 4, 2, $16 ; open door
reloadmappart
closetext
setevent EVENT_BRUNOS_ROOM_EXIT_OPEN
waitsfx
end
-UnknownScript_0x1809f3:
+BrunoScript_AfterBattle:
writetext BrunoScript_BrunoDefeatText
waitbutton
closetext
end
-MovementData_0x1809f9:
+BrunosRoom_EnterMovement:
step UP
step UP
step UP
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 2aca9c74e..4c307d710 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -28,13 +28,13 @@ BurnedTower1F_MapScripts:
.HoleAndLadder:
checkevent EVENT_HOLE_IN_BURNED_TOWER
- iftrue .Next
- changeblock 10, 8, $32 ; hole
-.Next:
+ iftrue .KeepHoleOpen
+ changeblock 10, 8, $32 ; floor
+.KeepHoleOpen:
checkevent EVENT_RELEASED_THE_BEASTS
- iftrue .Done
+ iftrue .HideBasement
changeblock 6, 14, $09 ; ladder
-.Done:
+.HideBasement:
return
.MeetEusine:
@@ -106,7 +106,7 @@ BurnedTowerRivalBattleScript:
showemote EMOTE_SHOCK, PLAYER, 15
playsound SFX_ENTER_DOOR
waitsfx
- changeblock 10, 8, $25
+ changeblock 10, 8, $25 ; hole
reloadmappart
pause 15
applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 7fb711543..3ad1d60f4 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -27,9 +27,9 @@ BurnedTowerB1F_MapScripts:
.LadderCallback:
checkevent EVENT_RELEASED_THE_BEASTS
- iftrue .NoChange
- changeblock 6, 14, $02
-.NoChange:
+ iftrue .HideLadder
+ changeblock 6, 14, $02 ; floor
+.HideLadder:
return
ReleaseTheBeasts:
@@ -93,7 +93,7 @@ ReleaseTheBeasts:
setevent EVENT_BURNED_TOWER_1F_EUSINE
appear BURNEDTOWERB1F_EUSINE
refreshscreen
- changeblock 6, 14, $1b
+ changeblock 6, 14, $1b ; ladder
reloadmappart
closetext
setscene 1
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 3971efeed..b63ec99da 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -8,10 +8,10 @@ CeladonDeptStore6F_MapScripts:
.MapCallbacks:
db 1
- callback MAPCALLBACK_TILES, .Callback
+ callback MAPCALLBACK_TILES, .HideRooftopStairs
-.Callback:
- changeblock 12, 0, $03
+.HideRooftopStairs:
+ changeblock 12, 0, $03 ; wall
return
CeladonDeptStore6FSuperNerdScript:
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index 7d39dd8a9..4d0603d0f 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -23,7 +23,7 @@ UnknownScript_0x7d781:
jump UnknownScript_0x7d791
UnknownScript_0x7d78a:
- changeblock 16, 4, $0d
+ changeblock 16, 4, $0d ; floor
jump UnknownScript_0x7d791
UnknownScript_0x7d791:
@@ -31,15 +31,15 @@ UnknownScript_0x7d791:
iftrue .Layout2
checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
iftrue .Layout3
- changeblock 10, 8, $0d
+ changeblock 10, 8, $0d ; floor
return
.Layout2:
- changeblock 4, 10, $0d
+ changeblock 4, 10, $0d ; floor
return
.Layout3:
- changeblock 10, 12, $0d
+ changeblock 10, 12, $0d ; floor
return
UnknownScript_0x7d7ac:
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index cbc2a6b76..55f885e62 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -19,12 +19,12 @@ GoldenrodDeptStoreRoof_MapScripts:
.CheckSaleChangeBlock:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
- iftrue .ChangeBlock
+ iftrue .SaleIsOn
return
-.ChangeBlock:
- changeblock 0, 2, $3f
- changeblock 0, 4, $0f
+.SaleIsOn:
+ changeblock 0, 2, $3f ; cardboard boxes
+ changeblock 0, 4, $0f ; vendor booth
return
.CheckSaleChangeClerk:
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index c60f68ee5..e8e566666 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -45,7 +45,7 @@ GoldenrodUnderground_MapScripts:
return
.LockBasementDoor:
- changeblock 18, 6, $3d
+ changeblock 18, 6, $3d ; locked door
return
.CheckDayOfWeek:
@@ -384,7 +384,7 @@ BasementDoorScript::
writetext UnknownText_0x7c5d6
waitbutton
closetext
- changeblock 18, 6, $2e
+ changeblock 18, 6, $2e ; unlocked door
reloadmappart
closetext
setevent EVENT_USED_BASEMENT_KEY
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index e01ee8470..621c133fd 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -1,3 +1,4 @@
+; block ids
UNDERGROUND_DOOR_CLOSED1 EQU $2a
UNDERGROUND_DOOR_CLOSED2 EQU $3e
UNDERGROUND_DOOR_CLOSED3 EQU $3f
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index 4ceed61fc..eef62321d 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -20,21 +20,21 @@ KarensRoom_MapScripts:
.KarensRoomDoors:
checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
- iffalse .KeepDoorsClosed
- changeblock 4, 14, $2a
-.KeepDoorsClosed:
+ iffalse .KeepEntranceOpen
+ changeblock 4, 14, $2a ; wall
+.KeepEntranceOpen:
checkevent EVENT_KARENS_ROOM_EXIT_OPEN
- iffalse .OpenDoors
- changeblock 4, 2, $16
-.OpenDoors:
+ iffalse .KeepExitClosed
+ changeblock 4, 2, $16 ; open door
+.KeepExitClosed:
return
.KarensDoorLocksBehindYou:
- applymovement PLAYER, MovementData_0x180c22
+ applymovement PLAYER, KarensMovementData_0x18078e
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
- changeblock 4, 14, $2a
+ changeblock 4, 14, $2a ; wall
reloadmappart
closetext
setscene 1
@@ -46,7 +46,7 @@ KarenScript_Battle:
faceplayer
opentext
checkevent EVENT_BEAT_ELITE_4_KAREN
- iftrue UnknownScript_0x180c1c
+ iftrue KarenScript_AfterBattle
writetext KarenScript_KarenBeforeText
waitbutton
closetext
@@ -60,20 +60,20 @@ KarenScript_Battle:
waitbutton
closetext
playsound SFX_ENTER_DOOR
- changeblock 4, 2, $16
+ changeblock 4, 2, $16 ; open door
reloadmappart
closetext
setevent EVENT_KARENS_ROOM_EXIT_OPEN
waitsfx
end
-UnknownScript_0x180c1c:
+KarenScript_AfterBattle:
writetext KarenScript_KarenDefeatText
waitbutton
closetext
end
-MovementData_0x180c22:
+KarensMovementData_0x18078e:
step UP
step UP
step UP
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index d448d4661..fe1badec4 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -20,21 +20,21 @@ KogasRoom_MapScripts:
.KogasRoomDoors:
checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
- iffalse .KeepDoorsClosed
- changeblock 4, 14, $2a
-.KeepDoorsClosed:
+ iffalse .KeepEntranceOpen
+ changeblock 4, 14, $2a ; wall
+.KeepEntranceOpen:
checkevent EVENT_KOGAS_ROOM_EXIT_OPEN
- iffalse .OpenDoors
- changeblock 4, 2, $16
-.OpenDoors:
+ iffalse .KeepExitClosed
+ changeblock 4, 2, $16 ; open door
+.KeepExitClosed:
return
.KogasDoorLocksBehindYou:
- applymovement PLAYER, MovementData_0x18078e
+ applymovement PLAYER, KogasMovementData_0x18078e
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
- changeblock 4, 14, $2a
+ changeblock 4, 14, $2a ; wall
reloadmappart
closetext
setscene 1
@@ -46,7 +46,7 @@ KogaScript_Battle:
faceplayer
opentext
checkevent EVENT_BEAT_ELITE_4_KOGA
- iftrue UnknownScript_0x180788
+ iftrue KogaScript_AfterBattle
writetext KogaScript_KogaBeforeText
waitbutton
closetext
@@ -60,20 +60,20 @@ KogaScript_Battle:
waitbutton
closetext
playsound SFX_ENTER_DOOR
- changeblock 4, 2, $16
+ changeblock 4, 2, $16 ; open door
reloadmappart
closetext
setevent EVENT_KOGAS_ROOM_EXIT_OPEN
waitsfx
end
-UnknownScript_0x180788:
+KogaScript_AfterBattle:
writetext KogaScript_KogaDefeatText
waitbutton
closetext
end
-MovementData_0x18078e:
+KogasMovementData_0x18078e:
step UP
step UP
step UP
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index c073f0f1e..a3336251b 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -22,13 +22,13 @@ LancesRoom_MapScripts:
.LancesRoomDoors:
checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
- iffalse .KeepDoorsClosed
- changeblock 4, 22, $34
-.KeepDoorsClosed:
+ iffalse .KeepEntranceOpen
+ changeblock 4, 22, $34 ; wall
+.KeepEntranceOpen:
checkevent EVENT_LANCES_ROOM_EXIT_OPEN
- iffalse .OpenDoors
- changeblock 4, 0, $0b
-.OpenDoors:
+ iffalse .KeepExitClosed
+ changeblock 4, 0, $0b ; open door
+.KeepExitClosed:
return
.LancesDoorLocksBehindYou:
@@ -36,7 +36,7 @@ LancesRoom_MapScripts:
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
- changeblock 4, 22, $34
+ changeblock 4, 22, $34 ; wall
reloadmappart
closetext
setscene 1
@@ -69,7 +69,7 @@ LanceScript_0x180e7b:
waitbutton
closetext
playsound SFX_ENTER_DOOR
- changeblock 4, 0, $0b
+ changeblock 4, 0, $0b ; open door
reloadmappart
closetext
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index a216b1079..5b3cfd43c 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -28,7 +28,7 @@ MahoganyMart1F_MapScripts:
return
.ShowStairs:
- changeblock 6, 2, $1e
+ changeblock 6, 2, $1e ; stairs
return
PharmacistScript_0x6c367:
@@ -89,7 +89,7 @@ UnknownScript_0x6c38f:
waitbutton
showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10
playsound SFX_FAINT
- changeblock 6, 2, $1e
+ changeblock 6, 2, $1e ; stairs
reloadmappart
closetext
setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 030aec018..0efc9e2db 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -21,8 +21,8 @@ RadioTower3F_MapScripts:
return
.Change:
- changeblock 14, 2, $2a
- changeblock 14, 4, $01
+ changeblock 14, 2, $2a ; open shutter
+ changeblock 14, 4, $01 ; floor
return
RadioTower3FSuperNerdScript:
@@ -143,8 +143,8 @@ UnknownScript_0x5e605:
waitbutton
setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
playsound SFX_ENTER_DOOR
- changeblock 14, 2, $2a
- changeblock 14, 4, $01
+ changeblock 14, 2, $2a ; open shutter
+ changeblock 14, 4, $01 ; floor
reloadmappart
closetext
waitsfx
diff --git a/maps/Route19.asm b/maps/Route19.asm
index 4c32af13f..8767a8b3b 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -17,12 +17,12 @@ Route19_MapScripts:
.ClearRocks:
checkevent EVENT_CINNABAR_ROCKS_CLEARED
iftrue .Done
- changeblock 6, 6, $7a
- changeblock 8, 6, $7a
- changeblock 10, 6, $7a
- changeblock 12, 8, $7a
- changeblock 4, 8, $7a
- changeblock 10, 10, $7a
+ changeblock 6, 6, $7a ; rock
+ changeblock 8, 6, $7a ; rock
+ changeblock 10, 6, $7a ; rock
+ changeblock 12, 8, $7a ; rock
+ changeblock 4, 8, $7a ; rock
+ changeblock 10, 10, $7a ; rock
.Done:
return
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index 3a195d430..91f2967a3 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -23,15 +23,15 @@ RuinsOfAlphAerodactylChamber_MapScripts:
.HiddenDoors:
checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
iftrue .WallOpen
- changeblock 4, 0, $2e
+ changeblock 4, 0, $2e ; closed wall
.WallOpen:
checkevent EVENT_SOLVED_AERODACTYL_PUZZLE
iffalse .FloorClosed
return
.FloorClosed:
- changeblock 2, 2, $01
- changeblock 4, 2, $02
+ changeblock 2, 2, $01 ; left floor
+ changeblock 4, 2, $02 ; right floor
return
.WallOpenScript:
@@ -40,7 +40,7 @@ RuinsOfAlphAerodactylChamber_MapScripts:
showemote EMOTE_SHOCK, PLAYER, 20
pause 30
playsound SFX_STRENGTH
- changeblock 4, 0, $30
+ changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
setscene 1
@@ -62,8 +62,8 @@ UnknownScript_0x58df7:
setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15
- changeblock 2, 2, $18
- changeblock 4, 2, $19
+ changeblock 2, 2, $18 ; left hole
+ changeblock 4, 2, $19 ; right hole
reloadmappart
playsound SFX_STRENGTH
earthquake 80
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 06a8d67fb..173f35e39 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -24,15 +24,15 @@ RuinsOfAlphHoOhChamber_MapScripts:
.HiddenDoors:
checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue .WallOpen
- changeblock 4, 0, $2e
+ changeblock 4, 0, $2e ; closed wall
.WallOpen:
checkevent EVENT_SOLVED_HO_OH_PUZZLE
iffalse .FloorClosed
return
.FloorClosed:
- changeblock 2, 2, $01
- changeblock 4, 2, $02
+ changeblock 2, 2, $01 ; left floor
+ changeblock 4, 2, $02 ; right floor
return
.WallOpenScript:
@@ -41,7 +41,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
showemote EMOTE_SHOCK, PLAYER, 20
pause 30
playsound SFX_STRENGTH
- changeblock 4, 0, $30
+ changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
setscene 1
@@ -63,8 +63,8 @@ UnknownScript_0x585ba:
setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15
- changeblock 2, 2, $18
- changeblock 4, 2, $19
+ changeblock 2, 2, $18 ; left hole
+ changeblock 4, 2, $19 ; right hole
reloadmappart
playsound SFX_STRENGTH
earthquake 80
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index f59b6d537..df4bcb881 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -27,15 +27,15 @@ RuinsOfAlphKabutoChamber_MapScripts:
.HiddenDoors:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue .WallOpen
- changeblock 4, 0, $2e
+ changeblock 4, 0, $2e ; closed wall
.WallOpen:
checkevent EVENT_SOLVED_KABUTO_PUZZLE
iffalse .FloorClosed
return
.FloorClosed:
- changeblock 2, 2, $01
- changeblock 4, 2, $02
+ changeblock 2, 2, $01 ; left floor
+ changeblock 4, 2, $02 ; right floor
return
.WallOpenScript:
@@ -44,7 +44,7 @@ RuinsOfAlphKabutoChamber_MapScripts:
showemote EMOTE_SHOCK, PLAYER, 20
pause 30
playsound SFX_STRENGTH
- changeblock 4, 0, $30
+ changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
setscene 1
@@ -70,8 +70,8 @@ UnknownScript_0x58778:
setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15
- changeblock 2, 2, $18
- changeblock 4, 2, $19
+ changeblock 2, 2, $18 ; left hole
+ changeblock 4, 2, $19 ; right hole
reloadmappart
playsound SFX_STRENGTH
earthquake 80
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index 9385eb2ff..e9c937526 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -24,15 +24,15 @@ RuinsOfAlphOmanyteChamber_MapScripts:
.HiddenDoors:
checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue .WallOpen
- changeblock 4, 0, $2e
+ changeblock 4, 0, $2e ; closed wall
.WallOpen:
checkevent EVENT_SOLVED_OMANYTE_PUZZLE
iffalse .FloorClosed
return
.FloorClosed:
- changeblock 2, 2, $01
- changeblock 4, 2, $02
+ changeblock 2, 2, $01 ; left floor
+ changeblock 4, 2, $02 ; right floor
return
.WallOpenScript:
@@ -41,7 +41,7 @@ RuinsOfAlphOmanyteChamber_MapScripts:
showemote EMOTE_SHOCK, PLAYER, 20
pause 30
playsound SFX_STRENGTH
- changeblock 4, 0, $30
+ changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
setscene 1
@@ -63,8 +63,8 @@ UnknownScript_0x58c36:
setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15
- changeblock 2, 2, $18
- changeblock 4, 2, $19
+ changeblock 2, 2, $18 ; left hole
+ changeblock 4, 2, $19 ; right hole
reloadmappart
playsound SFX_STRENGTH
earthquake 80
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index da8881af5..abfd227a1 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -40,11 +40,11 @@ TeamRocketBaseB2F_MapScripts:
.TransmitterDoorCallback:
checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
- iftrue .Change
+ iftrue .OpenDoor
return
-.Change:
- changeblock 14, 12, $07
+.OpenDoor:
+ changeblock 14, 12, $07 ; floor
return
UnknownScript_0x6cf95:
@@ -330,7 +330,7 @@ UnknownScript_0x6d1e8:
writetext UnknownText_0x6dd6b
waitbutton
playsound SFX_ENTER_DOOR
- changeblock 14, 12, $07
+ changeblock 14, 12, $07 ; floor
reloadmappart
closetext
setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index f0c9af09e..3f7fe5d39 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -45,7 +45,7 @@ TeamRocketBaseB3F_MapScripts:
return
.OpenSesame:
- changeblock 10, 8, $07
+ changeblock 10, 8, $07 ; floor
return
LanceGetPasswordScript:
@@ -194,7 +194,7 @@ TeamRocketBaseB3FLockedDoor:
writetext UnknownText_0x6e9a3
waitbutton
playsound SFX_ENTER_DOOR
- changeblock 10, 8, $07
+ changeblock 10, 8, $07 ; floor
reloadmappart
closetext
setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index cb04e8845..cd20d59b2 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -79,7 +79,7 @@ TinTower1F_MapScripts:
.StairsCallback:
checkevent EVENT_GOT_RAINBOW_WING
iftrue .DontHideStairs
- changeblock 10, 2, $09
+ changeblock 10, 2, $09 ; floor
.DontHideStairs:
return
@@ -201,7 +201,7 @@ TinTower1FSage5Script:
earthquake 72
waitsfx
playsound SFX_STRENGTH
- changeblock 10, 2, $20
+ changeblock 10, 2, $20 ; stairs
reloadmappart
setevent EVENT_GOT_RAINBOW_WING
closetext
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 5198c8407..1b0522ce9 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -20,21 +20,21 @@ WillsRoom_MapScripts:
.WillsRoomDoors:
checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
- iffalse .KeepDoorsClosed
- changeblock 4, 14, $2a
-.KeepDoorsClosed:
+ iffalse .KeepEntranceOpen
+ changeblock 4, 14, $2a ; wall
+.KeepEntranceOpen:
checkevent EVENT_WILLS_ROOM_EXIT_OPEN
- iffalse .OpenDoors
- changeblock 4, 2, $16
-.OpenDoors:
+ iffalse .KeepExitClosed
+ changeblock 4, 2, $16 ; open door
+.KeepExitClosed:
return
.WillsDoorLocksBehindYou:
- applymovement PLAYER, MovementData_0x18052c
+ applymovement PLAYER, WillsRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
- changeblock 4, 14, $2a
+ changeblock 4, 14, $2a ; wall
reloadmappart
closetext
setscene 1
@@ -46,7 +46,7 @@ WillScript_Battle:
faceplayer
opentext
checkevent EVENT_BEAT_ELITE_4_WILL
- iftrue WillScript_0x180526
+ iftrue WillScript_AfterBattle
writetext WillScript_WillBeforeText
waitbutton
closetext
@@ -60,20 +60,20 @@ WillScript_Battle:
waitbutton
closetext
playsound SFX_ENTER_DOOR
- changeblock 4, 2, $16
+ changeblock 4, 2, $16 ; open door
reloadmappart
closetext
setevent EVENT_WILLS_ROOM_EXIT_OPEN
waitsfx
end
-WillScript_0x180526:
+WillScript_AfterBattle:
writetext WillScript_WillDefeatText
waitbutton
closetext
end
-MovementData_0x18052c:
+WillsRoom_EnterMovement:
step UP
step UP
step UP
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 19:03:17 +0000