summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/BattleTower1F.asm4
-rw-r--r--maps/BlackthornGym2F.asm10
-rw-r--r--maps/BurnedTowerB1F.asm24
-rw-r--r--maps/CianwoodGym.asm80
-rw-r--r--maps/IcePathB1F.asm12
-rw-r--r--maps/LancesRoom.asm92
-rw-r--r--maps/Route36.asm60
-rw-r--r--maps/TinTower1F.asm20
8 files changed, 151 insertions, 151 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index ca10518fb..10e8fa51a 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -62,7 +62,7 @@ ReceptionistScript_0x9e3e2:
opentext
writetext Text_BattleTowerWelcomesYou
buttonsound
- writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [sbe4f]
+ writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [s1_be4f]
special BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
@@ -87,7 +87,7 @@ Script_ChoseChallenge: ; 0x9e40f
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $1
- writebyte BATTLETOWERACTION_01 ; set 1, [sbe4f]
+ writebyte BATTLETOWERACTION_01 ; set 1, [s1_be4f]
special BattleTowerAction
special Function1700b0
if_equal $a, Script_Menu_ChallengeExplanationCancel
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index d77464877..02a4d2234 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -23,8 +23,8 @@ BlackthornGym2F_MapScriptHeader:
return
.BoulderCmdQueue
- dbw MAPCALLBACK_OBJECTS, .BoulderTable ; check if any stones are sitting on a warp
- db 0, 0 ; filler
+ dbw CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp
+ dw 0 ; filler
.BoulderTable
stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4
@@ -137,9 +137,9 @@ BlackthornGym2F_MapEventHeader:
db 5
warp_def $7, $1, 3, BLACKTHORN_GYM_1F
warp_def $9, $7, 4, BLACKTHORN_GYM_1F
- warp_def $5, $2, 5, BLACKTHORN_GYM_1F
- warp_def $7, $8, 6, BLACKTHORN_GYM_1F
- warp_def $3, $8, 7, BLACKTHORN_GYM_1F
+ warp_def $5, $2, 5, BLACKTHORN_GYM_1F ; hole
+ warp_def $7, $8, 6, BLACKTHORN_GYM_1F ; hole
+ warp_def $3, $8, 7, BLACKTHORN_GYM_1F ; hole
.XYTriggers:
db 0
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 0991a2ecb..5de04e591 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -130,53 +130,53 @@ BurnedTowerB1FBoulder:
jumpstd strengthboulder
BurnedTowerRaikouMovement:
- db $39 ; movement
+ set_sliding
fast_jump_step_down
fast_jump_step_left
- db $38 ; movement
+ remove_sliding
step_end
BurnedTowerEnteiMovement:
- db $39 ; movement
+ set_sliding
fast_jump_step_right
fast_jump_step_down
fast_jump_step_right
- db $38 ; movement
+ remove_sliding
step_end
BurnedTowerSuicuneMovement1:
- db $39 ; movement
+ set_sliding
fast_jump_step_right
fast_jump_step_down
fast_jump_step_down
fast_jump_step_left
- db $38 ; movement
+ remove_sliding
step_end
BurnedTowerSuicuneMovement2:
- db $39 ; movement
+ set_sliding
fast_jump_step_left
fast_jump_step_up
big_step_up
fast_jump_step_right
- db $38 ; movement
+ remove_sliding
step_end
MovementData_0x18624f:
- db $39 ; movement
+ set_sliding
big_step_down
- db $38 ; movement
+ remove_sliding
step_end
BurnedTowerSuicuneMovement3:
- db $39 ; movement
+ set_sliding
big_step_up
fast_jump_step_right
fast_jump_step_down
fast_jump_step_down
fast_jump_step_down
fast_jump_step_down
- db $38 ; movement
+ remove_sliding
step_end
BurnedTowerB1FEusineMovement2:
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 3d0a87751..afeb908de 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -21,31 +21,31 @@ ChuckScript_0x9d60f:
opentext
checkevent EVENT_BEAT_CHUCK
iftrue .FightDone
- writetext UnknownText_0x9d6f9
+ writetext ChuckIntroText1
waitbutton
closetext
spriteface CIANWOODGYM_CHUCK, RIGHT
opentext
- writetext UnknownText_0x9d76f
+ writetext ChuckIntroText2
waitbutton
closetext
- applymovement CIANWOODGYM_BOULDER1, MovementData_0x9d6f3
+ applymovement CIANWOODGYM_BOULDER1, CianwoodGymMovement_ChuckChucksBoulder
playsound SFX_STRENGTH
earthquake 80
disappear CIANWOODGYM_BOULDER1
pause 30
faceplayer
opentext
- writetext UnknownText_0x9d78a
+ writetext ChuckIntroText3
waitbutton
closetext
- winlosstext UnknownText_0x9d7f6, 0
+ winlosstext ChuckLossText, 0
loadtrainer CHUCK, 1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_CHUCK
opentext
- writetext UnknownText_0x9d835
+ writetext GetStormBadgeText
playsound SFX_GET_BADGE
waitsfx
setflag ENGINE_STORMBADGE
@@ -53,25 +53,25 @@ ChuckScript_0x9d60f:
scall CianwoodGymTriggerRockets
.FightDone
checkevent EVENT_GOT_TM01_DYNAMICPUNCH
- iftrue UnknownScript_0x9d67b
+ iftrue .AlreadyGotTM
setevent EVENT_BEAT_BLACKBELT_YOSHI
setevent EVENT_BEAT_BLACKBELT_LAO
setevent EVENT_BEAT_BLACKBELT_NOB
setevent EVENT_BEAT_BLACKBELT_LUNG
- writetext UnknownText_0x9d84d
+ writetext ChuckExplainBadgeText
buttonsound
verbosegiveitem TM_DYNAMICPUNCH
- iffalse UnknownScript_0x9d67f
+ iffalse .BagFull
setevent EVENT_GOT_TM01_DYNAMICPUNCH
- writetext UnknownText_0x9d8da
+ writetext ChuckExplainTMText
waitbutton
closetext
end
-UnknownScript_0x9d67b:
- writetext UnknownText_0x9d930
+.AlreadyGotTM:
+ writetext ChuckAfterText
waitbutton
-UnknownScript_0x9d67f:
+.BagFull:
closetext
end
@@ -87,45 +87,45 @@ CianwoodGymTriggerRockets:
jumpstd radiotowerrockets
TrainerBlackbeltYoshi:
- trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, BlackbeltYoshiScript
+ trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script
-BlackbeltYoshiScript:
+.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x9d9fa
+ writetext BlackbeltYoshiAfterText
waitbutton
closetext
end
TrainerBlackbeltLao:
- trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, BlackbeltLaoScript
+ trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script
-BlackbeltLaoScript:
+.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x9da61
+ writetext BlackbeltLaoAfterText
waitbutton
closetext
end
TrainerBlackbeltNob:
- trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, BlackbeltNobScript
+ trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script
-BlackbeltNobScript:
+.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x9dac0
+ writetext BlackbeltNobAfterText
waitbutton
closetext
end
TrainerBlackbeltLung:
- trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, BlackbeltLungScript
+ trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script
-BlackbeltLungScript:
+.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x9db14
+ writetext BlackbeltLungAfterText
waitbutton
closetext
end
@@ -141,15 +141,15 @@ CianwoodGymStatue:
trainertotext CHUCK, 1, $1
jumpstd gymstatue2
-MovementData_0x9d6f3:
- db $39 ; movement
+CianwoodGymMovement_ChuckChucksBoulder:
+ set_sliding
big_step_left
big_step_up
fast_jump_step_right
- db $38 ; movement
+ remove_sliding
step_end
-UnknownText_0x9d6f9:
+ChuckIntroText1:
text "WAHAHAH!"
para "So you've come"
@@ -165,14 +165,14 @@ UnknownText_0x9d6f9:
para "Watch this!"
done
-UnknownText_0x9d76f:
+ChuckIntroText2:
text "CHUCK: Urggh!"
line "…"
para "Oooarrgh!"
done
-UnknownText_0x9d78a:
+ChuckIntroText3:
text "There! Scared now,"
line "are you?"
@@ -186,7 +186,7 @@ UnknownText_0x9d78a:
line "do battle!"
done
-UnknownText_0x9d7f6:
+ChuckLossText:
text "Wha? Huh?"
line "I lost?"
@@ -195,12 +195,12 @@ UnknownText_0x9d7f6:
cont "STORMBADGE!"
done
-UnknownText_0x9d835:
+GetStormBadgeText:
text "<PLAYER> received"
line "STORMBADGE."
done
-UnknownText_0x9d84d:
+ChuckExplainBadgeText:
text "STORMBADGE makes"
line "all #MON up to"
@@ -217,7 +217,7 @@ UnknownText_0x9d84d:
line "too!"
done
-UnknownText_0x9d8da:
+ChuckExplainTMText:
text "That is DYNAMIC-"
line "PUNCH."
@@ -228,7 +228,7 @@ UnknownText_0x9d8da:
line "confusion!"
done
-UnknownText_0x9d930:
+ChuckAfterText:
text "WAHAHAH! I enjoyed"
line "battling you!"
@@ -253,7 +253,7 @@ BlackbeltYoshiBeatenText:
text "This isn't real!"
done
-UnknownText_0x9d9fa:
+BlackbeltYoshiAfterText:
text "You seem to have a"
line "strong bond with"
cont "your #MON too!"
@@ -268,7 +268,7 @@ BlackbeltLaoBeatenText:
text "That's shocking!"
done
-UnknownText_0x9da61:
+BlackbeltLaoAfterText:
text "Fighting #MON"
line "are afraid of psy-"
cont "chics…"
@@ -284,7 +284,7 @@ BlackbeltNobBeatenText:
text "…"
done
-UnknownText_0x9dac0:
+BlackbeltNobAfterText:
text "I lost! "
line "I'm speechless!"
done
@@ -299,7 +299,7 @@ BlackbeltLungBeatenText:
text "I got shattered!"
done
-UnknownText_0x9db14:
+BlackbeltLungAfterText:
text "My #MON lost…"
line "My… my pride is"
cont "shattered…"
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 9e9390f67..afac65352 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -21,8 +21,8 @@ IcePathB1F_MapScriptHeader:
return
.CommandQueue:
- dbw MAPCALLBACK_OBJECTS, .StoneTable ; check if any stones are sitting on a warp
- db 0, 0 ; filler
+ dbw CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp
+ dw 0 ; filler
.StoneTable:
stonetable 3, ICEPATHB1F_BOULDER1, .Boulder1
@@ -90,10 +90,10 @@ IcePathB1F_MapEventHeader:
db 8
warp_def $f, $3, 3, ICE_PATH_1F
warp_def $3, $11, 1, ICE_PATH_B2F_MAHOGANY_SIDE
- warp_def $2, $b, 3, ICE_PATH_B2F_MAHOGANY_SIDE
- warp_def $7, $4, 4, ICE_PATH_B2F_MAHOGANY_SIDE
- warp_def $c, $5, 5, ICE_PATH_B2F_MAHOGANY_SIDE
- warp_def $d, $c, 6, ICE_PATH_B2F_MAHOGANY_SIDE
+ warp_def $2, $b, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
+ warp_def $7, $4, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
+ warp_def $c, $5, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
+ warp_def $d, $c, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
warp_def $19, $5, 4, ICE_PATH_1F
warp_def $1b, $b, 1, ICE_PATH_B2F_BLACKTHORN_SIDE
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 6188ac56d..a3c9018e2 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -8,36 +8,36 @@ LancesRoom_MapScriptHeader:
db 2
; triggers
- dw UnknownScript_0x180e39, 0
- dw UnknownScript_0x180e3d, 0
+ dw .Trigger0, 0
+ dw .Trigger1, 0
.MapCallbacks:
db 1
; callbacks
- dbw MAPCALLBACK_TILES, UnknownScript_0x180e3e
+ dbw MAPCALLBACK_TILES, .CheckDoor
-UnknownScript_0x180e39:
- priorityjump UnknownScript_0x180e53
+.Trigger0:
+ priorityjump LancesRoom_PlayerWalksIn_DoorsCloseBehind
end
-UnknownScript_0x180e3d:
+.Trigger1:
end
-UnknownScript_0x180e3e:
+.CheckDoor:
checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
- iffalse UnknownScript_0x180e48
+ iffalse .LanceEntranceOpen
changeblock $4, $16, $34
-UnknownScript_0x180e48:
+.LanceEntranceOpen:
checkevent EVENT_LANCES_ROOM_EXIT_OPEN
- iffalse UnknownScript_0x180e52
+ iffalse .LanceExitClosed
changeblock $4, $0, $b
-UnknownScript_0x180e52:
+.LanceExitClosed:
return
-UnknownScript_0x180e53:
- applymovement PLAYER, MovementData_0x180f33
+LancesRoom_PlayerWalksIn_DoorsCloseBehind:
+ applymovement PLAYER, LancesRoom_PlayerWalksInMovementData
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
@@ -48,21 +48,21 @@ UnknownScript_0x180e53:
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
end
-UnknownScript_0x180e6a:
+Script_ApproachLanceFromLeft:
special Special_FadeOutMusic
- applymovement PLAYER, MovementData_0x180f38
+ applymovement PLAYER, MovementData_ApproachLanceFromLeft
jump LanceScript_0x180e7b
-UnknownScript_0x180e74:
+Script_ApproachLanceFromRight:
special Special_FadeOutMusic
- applymovement PLAYER, MovementData_0x180f3c
+ applymovement PLAYER, MovementData_ApproachLanceFromRight
LanceScript_0x180e7b:
spriteface LANCESROOM_LANCE, LEFT
opentext
- writetext UnknownText_0x180f67
+ writetext LanceBattleIntroText
waitbutton
closetext
- winlosstext UnknownText_0x1810a4, 0
+ winlosstext LanceBattleWinText, 0
setlasttalked LANCESROOM_LANCE
loadtrainer CHAMPION, LANCE
startbattle
@@ -70,7 +70,7 @@ LanceScript_0x180e7b:
reloadmapafterbattle
setevent EVENT_BEAT_CHAMPION_LANCE
opentext
- writetext UnknownText_0x181132
+ writetext LanceBattleAfterText
waitbutton
closetext
playsound SFX_ENTER_DOOR
@@ -85,15 +85,15 @@ LanceScript_0x180e7b:
pause 10
spriteface PLAYER, DOWN
appear LANCESROOM_MARY
- applymovement LANCESROOM_MARY, MovementData_0x180f41
+ applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn
opentext
writetext UnknownText_0x1811dd
waitbutton
closetext
appear LANCESROOM_OAK
- applymovement LANCESROOM_OAK, MovementData_0x180f46
+ applymovement LANCESROOM_OAK, LancesRoomMovementData_OakWalksIn
follow LANCESROOM_MARY, LANCESROOM_OAK
- applymovement LANCESROOM_MARY, MovementData_0x180f49
+ applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryYieldsToOak
stopfollow
spriteface LANCESROOM_OAK, UP
spriteface LANCESROOM_LANCE, LEFT
@@ -101,13 +101,13 @@ LanceScript_0x180e7b:
writetext UnknownText_0x18121b
waitbutton
closetext
- applymovement LANCESROOM_MARY, MovementData_0x180f4c
+ applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion
spriteface PLAYER, LEFT
opentext
writetext UnknownText_0x18134b
waitbutton
closetext
- applymovement LANCESROOM_LANCE, MovementData_0x180f4f
+ applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway
spriteface PLAYER, UP
opentext
writetext UnknownText_0x18137b
@@ -116,88 +116,88 @@ LanceScript_0x180e7b:
follow LANCESROOM_LANCE, PLAYER
spriteface LANCESROOM_MARY, UP
spriteface LANCESROOM_OAK, UP
- applymovement LANCESROOM_LANCE, MovementData_0x180f53
+ applymovement LANCESROOM_LANCE, LancesRoomMovementData_LanceLeadsPlayerToHallOfFame
stopfollow
playsound SFX_EXIT_BUILDING
disappear LANCESROOM_LANCE
- applymovement PLAYER, MovementData_0x180f55
+ applymovement PLAYER, LancesRoomMovementData_PlayerExits
playsound SFX_EXIT_BUILDING
disappear PLAYER
- applymovement LANCESROOM_MARY, MovementData_0x180f57
+ applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryTriesToFollow
showemote EMOTE_SHOCK, LANCESROOM_MARY, 15
opentext
writetext UnknownText_0x1813c5
pause 30
closetext
- applymovement LANCESROOM_MARY, MovementData_0x180f5b
+ applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth
special FadeOutPalettes
pause 15
warpfacing UP, HALL_OF_FAME, $4, $d
end
-MovementData_0x180f33:
+LancesRoom_PlayerWalksInMovementData:
step_up
step_up
step_up
step_up
step_end
-MovementData_0x180f38:
+MovementData_ApproachLanceFromLeft:
step_up
step_up
turn_head_right
step_end
-MovementData_0x180f3c:
+MovementData_ApproachLanceFromRight:
step_up
step_left
step_up
turn_head_right
step_end
-MovementData_0x180f41:
+LancesRoomMovementData_MaryRushesIn:
big_step_up
big_step_up
big_step_up
turn_head_down
step_end
-MovementData_0x180f46:
+LancesRoomMovementData_OakWalksIn:
step_up
step_up
step_end
-MovementData_0x180f49:
+LancesRoomMovementData_MaryYieldsToOak:
step_left
turn_head_right
step_end
-MovementData_0x180f4c:
+LancesRoomMovementData_MaryInterviewChampion:
big_step_up
turn_head_right
step_end
-MovementData_0x180f4f:
+LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway:
step_up
step_left
turn_head_down
step_end
-MovementData_0x180f53:
+LancesRoomMovementData_LanceLeadsPlayerToHallOfFame:
step_up
step_end
-MovementData_0x180f55:
+LancesRoomMovementData_PlayerExits:
step_up
step_end
-MovementData_0x180f57:
+LancesRoomMovementData_MaryTriesToFollow:
step_up
step_right
turn_head_up
step_end
-MovementData_0x180f5b:
+LancesRoomMovementData_MaryRunsBackAndForth:
big_step_right
big_step_right
big_step_left
@@ -211,7 +211,7 @@ MovementData_0x180f5b:
turn_head_up
step_end
-UnknownText_0x180f67:
+LanceBattleIntroText:
text "LANCE: I've been"
line "waiting for you."
@@ -243,7 +243,7 @@ UnknownText_0x180f67:
cont "your challenge!"
done
-UnknownText_0x1810a4:
+LanceBattleWinText:
text "…It's over."
para "But it's an odd"
@@ -260,7 +260,7 @@ UnknownText_0x1810a4:
line "CHAMPION!"
done
-UnknownText_0x181132:
+LanceBattleAfterText:
text "…Whew."
para "You have become"
@@ -355,8 +355,8 @@ LancesRoom_MapEventHeader:
.XYTriggers:
db 2
- xy_trigger 1, $5, $4, $0, UnknownScript_0x180e6a, $0, $0
- xy_trigger 1, $5, $5, $0, UnknownScript_0x180e74, $0, $0
+ xy_trigger 1, $5, $4, $0, Script_ApproachLanceFromLeft, $0, $0
+ xy_trigger 1, $5, $5, $0, Script_ApproachLanceFromRight, $0, $0
.Signposts:
db 0
diff --git a/maps/Route36.asm b/maps/Route36.asm
index fb9289f47..8bd05b91d 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -14,23 +14,23 @@ Route36_MapScriptHeader:
db 2
; triggers
- dw UnknownScript_0x19400d, 0
- dw UnknownScript_0x19400e, 0
+ dw .Trigger0, 0
+ dw .Trigger1, 0
.MapCallbacks:
db 1
; callbacks
- dbw MAPCALLBACK_OBJECTS, ArthurCallback
+ dbw MAPCALLBACK_OBJECTS, .ArthurCallback
-UnknownScript_0x19400d:
+.Trigger0:
end
-UnknownScript_0x19400e:
+.Trigger1:
end
-ArthurCallback:
+.ArthurCallback:
checkcode VAR_WEEKDAY
if_equal THURSDAY, .ArthurAppears
disappear ROUTE36_ARTHUR
@@ -45,7 +45,7 @@ Route36SuicuneScript:
pause 15
playsound SFX_WARP_FROM
spriteface PLAYER, UP
- applymovement ROUTE36_SUICUNE, MovementData_0x194262
+ applymovement ROUTE36_SUICUNE, Route36SuicuneMovement
disappear ROUTE36_SUICUNE
spriteface PLAYER, DOWN
pause 10
@@ -86,7 +86,7 @@ WateredWeirdTreeScript:: ; export (for when you use Squirtbottle from pack)
loadwildmon SUDOWOODO, 20
startbattle
setevent EVENT_FOUGHT_SUDOWOODO
- if_equal $2, UnknownScript_0x19407b
+ if_equal $2, DidntCatchSudowoodo
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
reloadmapafterbattle
@@ -96,9 +96,9 @@ DidntUseSquirtbottleScript:
closetext
end
-UnknownScript_0x19407b:
+DidntCatchSudowoodo:
reloadmapafterbattle
- applymovement ROUTE36_WEIRD_TREE, MovementData_0x19424b
+ applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
special RunCallback_04
@@ -132,28 +132,28 @@ Route36FloriaScript:
closetext
end
-FisherScript_0x1940b9:
+Route36RockSmashGuyScript:
faceplayer
opentext
checkevent EVENT_GOT_TM08_ROCK_SMASH
- iftrue UnknownScript_0x1940da
+ iftrue .AlreadyGotRockSmash
checkevent EVENT_FOUGHT_SUDOWOODO
- iftrue UnknownScript_0x1940cd
- writetext UnknownText_0x19446f
+ iftrue .ClearedSudowoodo
+ writetext RockSmashGuyText1
waitbutton
closetext
end
-UnknownScript_0x1940cd:
- writetext UnknownText_0x1944d0
+.ClearedSudowoodo:
+ writetext RockSmashGuyText2
buttonsound
verbosegiveitem TM_ROCK_SMASH
- iffalse UnknownScript_0x1940de
+ iffalse .NoRoomForTM
setevent EVENT_GOT_TM08_ROCK_SMASH
-UnknownScript_0x1940da:
- writetext UnknownText_0x19452c
+.AlreadyGotRockSmash:
+ writetext RockSmashGuyText3
waitbutton
-UnknownScript_0x1940de:
+.NoRoomForTM:
closetext
end
@@ -161,13 +161,13 @@ LassScript_0x1940e0:
faceplayer
opentext
checkevent EVENT_FOUGHT_SUDOWOODO
- iftrue UnknownScript_0x1940ee
+ iftrue .ClearedSudowoodo
writetext UnknownText_0x194626
waitbutton
closetext
end
-UnknownScript_0x1940ee:
+.ClearedSudowoodo:
writetext UnknownText_0x19469e
waitbutton
closetext
@@ -377,7 +377,7 @@ SudowoodoShakeMovement:
db $56 ; shake
step_end
-MovementData_0x19424b:
+WeirdTreeMovement_Flee:
fast_jump_step_up
fast_jump_step_up
step_end
@@ -406,15 +406,15 @@ FloriaMovement2:
step_left
step_end
-MovementData_0x194262:
- db $39 ; movement
+Route36SuicuneMovement:
+ set_sliding
fast_jump_step_down
fast_jump_step_down
fast_jump_step_down
fast_jump_step_right
fast_jump_step_right
fast_jump_step_right
- db $38 ; movement
+ remove_sliding
step_end
UseSquirtbottleText:
@@ -476,7 +476,7 @@ FloriaText2:
line "bottle…"
done
-UnknownText_0x19446f:
+RockSmashGuyText1:
text "Wa-hey!"
para "I was going to"
@@ -489,7 +489,7 @@ UnknownText_0x19446f:
line "I'm a failure!"
done
-UnknownText_0x1944d0:
+RockSmashGuyText2:
text "Did you clear that"
line "wretched tree?"
@@ -503,7 +503,7 @@ UnknownText_0x19451a:
line "TM08."
done
-UnknownText_0x19452c:
+RockSmashGuyText3:
text "That happens to be"
line "ROCK SMASH."
@@ -695,7 +695,7 @@ Route36_MapEventHeader:
person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
person_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
- person_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1940b9, -1
+ person_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
person_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x194247, -1
person_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 81fb366e6..5ebd80be6 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -243,37 +243,37 @@ TinTowerPlayerMovement1:
step_end
TinTowerRaikouMovement1:
- db $39 ; movement
+ set_sliding
fast_jump_step_down
- db $38 ; movement
+ remove_sliding
step_end
TinTowerRaikouMovement2:
- db $39 ; movement
+ set_sliding
fast_jump_step_down
fast_jump_step_right
fast_jump_step_down
- db $38 ; movement
+ remove_sliding
step_end
TinTowerEnteiMovement1:
- db $39 ; movement
+ set_sliding
fast_jump_step_down
- db $38 ; movement
+ remove_sliding
step_end
TinTowerEnteiMovement2:
- db $39 ; movement
+ set_sliding
fast_jump_step_down
fast_jump_step_left
fast_jump_step_down
- db $38 ; movement
+ remove_sliding
step_end
TinTowerSuicuneMovement:
- db $39 ; movement
+ set_sliding
fast_jump_step_down
- db $38 ; movement
+ remove_sliding
step_end
TinTowerPlayerMovement2:
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 15:01:18 +0000