ref: c9563d5c5e8e3612ac40d70d6f6f5e03ba231f16
parent: 86061d37d2aff18530d4340796c0799bb316e7f0
parent: 3234cb1117db197f29443ee797e3eddb7a12293f
author: Rangi <35663410+Rangi42@users.noreply.github.com>
date: Mon Nov 4 14:40:38 EST 2019
Merge pull request #648 from DeeDeeG/identifying-stuff-in-maps Identifying stuff in maps
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -56,7 +56,7 @@
waitbutton
closetext
playsound SFX_WARP_TO
- applymovement LAKEOFRAGE_LANCE, MovementData_0x70155
+ applymovement LAKEOFRAGE_LANCE, LakeOfRageLanceTeleportIntoSkyMovement
disappear LAKEOFRAGE_LANCE
clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
setevent EVENT_DECIDED_TO_HELP_LANCE
@@ -238,7 +238,7 @@
LakeOfRageHiddenMaxPotion:
hiddenitem MAX_POTION, EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION
-MovementData_0x70155:
+LakeOfRageLanceTeleportIntoSkyMovement:
teleport_from
step_end
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -2,7 +2,7 @@
const MAHOGANYMART1F_PHARMACIST
const MAHOGANYMART1F_BLACK_BELT
const MAHOGANYMART1F_LANCE
- const MAHOGANYMART1F_DRAGON
+ const MAHOGANYMART1F_DRAGONITE
const MAHOGANYMART1F_GRANNY
MahoganyMart1F_MapScripts:
@@ -29,7 +29,7 @@
changeblock 6, 2, $1e ; stairs
return
-MahogayMart1FPharmacistScript:
+MahoganyMart1FPharmacistScript:
faceplayer
opentext
checkevent EVENT_DECIDED_TO_HELP_LANCE
@@ -39,23 +39,23 @@
end
.LanceEntered:
- writetext MahogayMart1FPharmacistText_LanceEntered
+ writetext MahoganyMart1FPharmacistText_LanceEntered
waitbutton
closetext
end
-MahogayMart1FBlackBeltScript:
+MahoganyMart1FBlackBeltScript:
faceplayer
opentext
checkevent EVENT_DECIDED_TO_HELP_LANCE
iftrue .LanceEntered
- writetext MahogayMart1FBlackBeltText
+ writetext MahoganyMart1FBlackBeltText
waitbutton
closetext
end
.LanceEntered:
- writetext MahogayMart1FBlackBeltText_LanceEntered
+ writetext MahoganyMart1FBlackBeltText_LanceEntered
waitbutton
closetext
end
@@ -67,20 +67,20 @@
pause 15
closetext
playsound SFX_TACKLE
- applymovement MAHOGANYMART1F_DRAGON, MovementData_0x6c3f6
- applymovement MAHOGANYMART1F_BLACK_BELT, MovementData_0x6c3fb
+ applymovement MAHOGANYMART1F_DRAGONITE, MahoganyMart1FDragoniteTackleMovement
+ applymovement MAHOGANYMART1F_BLACK_BELT, MahoganyMart1FBlackBeltKnockedBackMovement
pause 15
- disappear MAHOGANYMART1F_DRAGON
+ disappear MAHOGANYMART1F_DRAGONITE
pause 15
- applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c407
+ applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachPlayerMovement
opentext
writetext MahoganyMart1FLanceRadioText
waitbutton
closetext
follow MAHOGANYMART1F_LANCE, PLAYER
- applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40a
- applymovement MAHOGANYMART1F_PHARMACIST, MovementData_0x6c403
- applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40e
+ applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachPharmacistMovement
+ applymovement MAHOGANYMART1F_PHARMACIST, MahoganyMart1FPharmacistShovedAsideMovement
+ applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachHiddenStairsMovement
stopfollow
opentext
writetext MahoganyMart1FLanceStairsText
@@ -96,7 +96,7 @@
writetext MahoganyMart1FLanceSplitUpText
waitbutton
closetext
- applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412
+ applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceGoDownStairsMovement
playsound SFX_EXIT_BUILDING
disappear MAHOGANYMART1F_LANCE
setscene SCENE_MAHOGANYMART1F_NOTHING
@@ -103,7 +103,7 @@
waitsfx
end
-MahogayMart1FGrannyScript:
+MahoganyMart1FGrannyScript:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2
@@ -110,7 +110,7 @@
closetext
end
-MovementData_0x6c3f6:
+MahoganyMart1FDragoniteTackleMovement:
fix_facing
big_step LEFT
big_step RIGHT
@@ -117,7 +117,7 @@
remove_fixed_facing
step_end
-MovementData_0x6c3fb:
+MahoganyMart1FBlackBeltKnockedBackMovement:
fix_facing
big_step LEFT
remove_fixed_facing
@@ -127,30 +127,30 @@
turn_head RIGHT
step_end
-MovementData_0x6c403:
+MahoganyMart1FPharmacistShovedAsideMovement:
fix_facing
big_step LEFT
remove_fixed_facing
step_end
-MovementData_0x6c407:
+MahoganyMart1FLanceApproachPlayerMovement:
slow_step LEFT
turn_head DOWN
step_end
-MovementData_0x6c40a:
+MahoganyMart1FLanceApproachPharmacistMovement:
slow_step RIGHT
slow_step UP
slow_step UP
step_end
-MovementData_0x6c40e:
+MahoganyMart1FLanceApproachHiddenStairsMovement:
slow_step UP
slow_step RIGHT
slow_step RIGHT
step_end
-MovementData_0x6c412:
+MahoganyMart1FLanceGoDownStairsMovement:
slow_step RIGHT
step_end
@@ -164,13 +164,13 @@
line "eat in MAHOGANY!"
done
-MahogayMart1FPharmacistText_LanceEntered:
+MahoganyMart1FPharmacistText_LanceEntered:
text "Arrgh… You found"
line "the secret stair-"
cont "way…"
done
-MahogayMart1FBlackBeltText:
+MahoganyMart1FBlackBeltText:
text "Heheh! The experi-"
line "ment worked like a"
cont "charm."
@@ -182,7 +182,7 @@
line "moneymakers."
done
-MahogayMart1FBlackBeltText_LanceEntered:
+MahoganyMart1FBlackBeltText_LanceEntered:
text "Urrgh…"
para "That guy's dragon"
@@ -231,8 +231,8 @@
db 0 ; bg events
db 5 ; object events
- object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION
- object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION
+ object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION
+ object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
- object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS
+ object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -2,7 +2,7 @@
const MOUNTMORTARB1F_POKE_BALL1
const MOUNTMORTARB1F_POKE_BALL2
const MOUNTMORTARB1F_BOULDER
- const MOUNTMORTARB1F_BLACK_BELT
+ const MOUNTMORTARB1F_KIYO
const MOUNTMORTARB1F_POKE_BALL3
const MOUNTMORTARB1F_POKE_BALL4
const MOUNTMORTARB1F_POKE_BALL5
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -3,7 +3,7 @@
const VIOLETPOKECENTER1F_GAMEBOY_KID
const VIOLETPOKECENTER1F_GENTLEMAN
const VIOLETPOKECENTER1F_YOUNGSTER
- const VIOLETPOKECENTER1F_SCIENTIST
+ const VIOLETPOKECENTER1F_ELMS_AIDE
VioletPokecenter1F_MapScripts:
db 0 ; scene scripts
@@ -37,18 +37,18 @@
readvar VAR_FACING
ifequal UP, .AideWalksAroundPlayer
turnobject PLAYER, DOWN
- applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter
+ applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideWalksStraightOutOfPokecenter
playsound SFX_EXIT_BUILDING
- disappear VIOLETPOKECENTER1F_SCIENTIST
+ disappear VIOLETPOKECENTER1F_ELMS_AIDE
waitsfx
end
.AideWalksAroundPlayer:
- applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter
+ applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideWalksLeftToExitPokecenter
turnobject PLAYER, DOWN
- applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter
+ applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideFinishesLeavingPokecenter
playsound SFX_EXIT_BUILDING
- disappear VIOLETPOKECENTER1F_SCIENTIST
+ disappear VIOLETPOKECENTER1F_ELMS_AIDE
waitsfx
end