Merge branch 'master' of github.com:pret/pokecrystal

1 files changed, 24 insertions, 25 deletions

diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 0ed2c67f0..abfd227a1 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -14,7 +14,7 @@ const_value set 2
 	const TEAMROCKETBASEB2F_ROCKET4
 	const TEAMROCKETBASEB2F_POKE_BALL
 
-TeamRocketBaseB2F_MapScriptHeader:
+TeamRocketBaseB2F_MapScripts:
 .SceneScripts:
 	db 4
 	scene_script .DummyScene0
@@ -24,7 +24,7 @@ TeamRocketBaseB2F_MapScriptHeader:
 
 .MapCallbacks:
 	db 1
-	dbw MAPCALLBACK_TILES, .TransmitterDoorCallback
+	callback MAPCALLBACK_TILES, .TransmitterDoorCallback
 
 .DummyScene0:
 	end
@@ -40,22 +40,22 @@ TeamRocketBaseB2F_MapScriptHeader:
 
 .TransmitterDoorCallback:
 	checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
-	iftrue .Change
+	iftrue .OpenDoor
 	return
 
-.Change:
-	changeblock $e, $c, $7
+.OpenDoor:
+	changeblock 14, 12, $07 ; floor
 	return
 
 UnknownScript_0x6cf95:
-	moveobject TEAMROCKETBASEB2F_LANCE, $9, $d
+	moveobject TEAMROCKETBASEB2F_LANCE, 9, 13
 	jump UnknownScript_0x6cfac
 
 UnknownScript_0x6cf9c:
-	moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, $15, $10
-	moveobject TEAMROCKETBASEB2F_ROCKET1, $15, $10
-	moveobject TEAMROCKETBASEB2F_DRAGON, $a, $d
-	moveobject TEAMROCKETBASEB2F_LANCE, $a, $d
+	moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, 21, 16
+	moveobject TEAMROCKETBASEB2F_ROCKET1, 21, 16
+	moveobject TEAMROCKETBASEB2F_DRAGON, 10, 13
+	moveobject TEAMROCKETBASEB2F_LANCE, 10, 13
 UnknownScript_0x6cfac:
 	appear TEAMROCKETBASEB2F_ROCKET_GIRL
 	appear TEAMROCKETBASEB2F_ROCKET1
@@ -110,7 +110,7 @@ UnknownScript_0x6cfac:
 	waitbutton
 	closetext
 	special Special_FadeBlackQuickly
-	special Special_ReloadSpritesNoPalettes
+	special ReloadSpritesNoPalettes
 	disappear TEAMROCKETBASEB2F_ROCKET1
 	disappear TEAMROCKETBASEB2F_ROCKET_GIRL
 	disappear TEAMROCKETBASEB2F_ROCKET2
@@ -118,7 +118,7 @@ UnknownScript_0x6cfac:
 	disappear TEAMROCKETBASEB2F_ROCKET4
 	pause 15
 	special Special_FadeInQuickly
-	setscene $2
+	setscene 2
 	clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
 	spriteface TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
@@ -166,16 +166,16 @@ LanceHealsCommon:
 	writetext LanceHealsText1
 	waitbutton
 	closetext
-	special FadeOutPalettes
-	special TrainerRankings_Healings
+	special Special_FadeOutPalettes
+	special Special_StubbedTrainerRankings_Healings
 	playsound SFX_FULL_HEAL
 	special HealParty
-	special FadeInPalettes
+	special Special_FadeInPalettes
 	opentext
 	writetext LanceHealsText2
 	waitbutton
 	closetext
-	setscene $1
+	setscene 1
 	setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
 	checkcode VAR_FACING
 	if_equal RIGHT, UnknownScript_0x6d0be
@@ -280,7 +280,7 @@ UnknownScript_0x6d182:
 	end
 
 UnknownScript_0x6d184:
-	moveobject TEAMROCKETBASEB2F_LANCE, $12, $6
+	moveobject TEAMROCKETBASEB2F_LANCE, 18, 6
 	appear TEAMROCKETBASEB2F_LANCE
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a
 	spriteface PLAYER, RIGHT
@@ -304,7 +304,7 @@ UnknownScript_0x6d184:
 	clearflag ENGINE_ROCKET_SIGNAL_ON_CH20
 	setevent EVENT_ROUTE_43_GATE_ROCKETS
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
-	setscene $3
+	setscene 3
 	clearevent EVENT_LAKE_OF_RAGE_CIVILIANS
 	setevent EVENT_TURNED_OFF_SECURITY_CAMERAS
 	setevent EVENT_SECURITY_CAMERA_1
@@ -315,7 +315,7 @@ UnknownScript_0x6d184:
 	end
 
 TeamRocketBaseB2FLockedDoor:
-	dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script
+	conditional_event EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script
 
 .Script:
 	opentext
@@ -330,7 +330,7 @@ UnknownScript_0x6d1e8:
 	writetext UnknownText_0x6dd6b
 	waitbutton
 	playsound SFX_ENTER_DOOR
-	changeblock $e, $c, $7
+	changeblock 14, 12, $07 ; floor
 	reloadmappart
 	closetext
 	setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
@@ -356,8 +356,7 @@ TeamRocketBaseB2FTMThief:
 	itemball TM_THIEF
 
 TeamRocketBaseB2FHiddenFullHeal:
-	dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
-
+	hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
 
 MovementData_0x6d212:
 	step RIGHT
@@ -414,9 +413,9 @@ MovementData_0x6d236:
 
 MovementData_0x6d23b:
 	fix_facing
-	db $39 ; movement
+	set_sliding
 	jump_step RIGHT
-	db $38 ; movement
+	remove_sliding
 	remove_fixed_facing
 	step_end
 
@@ -909,7 +908,7 @@ UnknownText_0x6de03:
 	line "broadcast."
 	done
 
-TeamRocketBaseB2F_MapEventHeader:
+TeamRocketBaseB2F_MapEvents:
 	; filler
 	db 0, 0