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

"Speech" houses just have dialog NPCs

Browse Source
This commit is contained in:
Rangi
2018-01-23 12:54:17 -05:00
parent c5cc23a35f
commit 517eab6526
14 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maps/Route2.asm
View File

@@ -152,7 +152,7 @@ Route2_MapEvents:
.Warps:
db 5
warp_def 15, 15, 1, ROUTE_2_NUGGET_SPEECH_HOUSE
warp_def 15, 15, 1, ROUTE_2_NUGGET_HOUSE
warp_def 15, 31, 3, ROUTE_2_GATE
warp_def 16, 27, 1, ROUTE_2_GATE
warp_def 17, 27, 2, ROUTE_2_GATE

2
maps/Route26.asm
View File

@@ -419,7 +419,7 @@ Route26_MapEvents:
.Warps:
db 3
warp_def 7, 5, 3, VICTORY_ROAD_GATE
warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE
warp_def 15, 57, 1, ROUTE_26_HEAL_HOUSE
warp_def 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE
.CoordEvents:

6
maps/Route26HealSpeechHouse.asm → maps/Route26HealHouse.asm
View File

@@ -1,7 +1,7 @@
const_value set 2
const ROUTE26HEALSPEECHHOUSE_TEACHER
const ROUTE26HEALHOUSE_TEACHER
Route26HealSpeechHouse_MapScripts:
Route26HealHouse_MapScripts:
.SceneScripts:
db 0
@@ -48,7 +48,7 @@ UnknownText_0x7b18b:
para "Keep at it!"
done
Route26HealSpeechHouse_MapEvents:
Route26HealHouse_MapEvents:
; filler
db 0, 0

8
maps/Route28FamousSpeechHouse.asm → maps/Route28SteelWingHouse.asm
View File

@@ -1,8 +1,8 @@
const_value set 2
const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY
const ROUTE28FAMOUSSPEECHHOUSE_FEAROW
const ROUTE28STEELWINGHOUSE_CELEBRITY
const ROUTE28STEELWINGHOUSE_FEAROW
Route28FamousSpeechHouse_MapScripts:
Route28SteelWingHouse_MapScripts:
.SceneScripts:
db 1
scene_script .DummyScene
@@ -70,7 +70,7 @@ CelebritysFearowText:
text "FEAROW: Feero!"
done
Route28FamousSpeechHouse_MapEvents:
Route28SteelWingHouse_MapEvents:
; filler
db 0, 0

8
maps/Route2NuggetSpeechHouse.asm → maps/Route2NuggetHouse.asm
View File

@@ -1,7 +1,7 @@
const_value set 2
const ROUTE2NUGGETSPEECHHOUSE_FISHER
const ROUTE2NUGGETHOUSE_FISHER
Route2NuggetSpeechHouse_MapScripts:
Route2NuggetHouse_MapScripts:
.SceneScripts:
db 0
@@ -25,7 +25,7 @@ FisherScript_0x9b847:
closetext
end
Route2NuggetSpeechHouseBookshelf:
Route2NuggetHouseBookshelf:
; unused
jumpstd difficultbookshelf
@@ -52,7 +52,7 @@ UnknownText_0x9b8e5:
line "have to do!"
done
Route2NuggetSpeechHouse_MapEvents:
Route2NuggetHouse_MapEvents:
; filler
db 0, 0

2
maps/Route30.asm
View File

@@ -412,7 +412,7 @@ Route30_MapEvents:
.Warps:
db 2
warp_def 7, 39, 1, ROUTE_30_BERRY_SPEECH_HOUSE
warp_def 7, 39, 1, ROUTE_30_BERRY_HOUSE
warp_def 17, 5, 1, MR_POKEMONS_HOUSE
.CoordEvents:

12
maps/Route30BerrySpeechHouse.asm → maps/Route30BerryHouse.asm
View File

@@ -1,7 +1,7 @@
const_value set 2
const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M
const ROUTE30BERRYHOUSE_POKEFAN_M
Route30BerrySpeechHouse_MapScripts:
Route30BerryHouse_MapScripts:
.SceneScripts:
db 0
@@ -25,7 +25,7 @@ UnknownScript_0x196d7d:
closetext
end
Route30BerrySpeechHouseBookshelf:
Route30BerryHouseBookshelf:
jumpstd magazinebookshelf
UnknownText_0x196d82:
@@ -46,7 +46,7 @@ UnknownText_0x196dec:
cont "drop right off."
done
Route30BerrySpeechHouse_MapEvents:
Route30BerryHouse_MapEvents:
; filler
db 0, 0
@@ -60,8 +60,8 @@ Route30BerrySpeechHouse_MapEvents:
.BGEvents:
db 2
bg_event 0, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf
bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf
.ObjectEvents:
db 1

2
maps/Route5.asm
View File

@@ -48,7 +48,7 @@ Route5_MapEvents:
warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE
warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE
warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE
warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE
.CoordEvents:
db 0

16
maps/Route5CleanseTagSpeechHouse.asm → maps/Route5CleanseTagHouse.asm
View File

@@ -1,8 +1,8 @@
const_value set 2
const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY
const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER
const ROUTE5CLEANSETAGHOUSE_GRANNY
const ROUTE5CLEANSETAGHOUSE_TEACHER
Route5CleanseTagSpeechHouse_MapScripts:
Route5CleanseTagHouse_MapScripts:
.SceneScripts:
db 0
@@ -26,8 +26,8 @@ UnknownScript_0x18b64d:
closetext
end
Route5CleanseTagSpeechHouseTeacherScript:
jumptextfaceplayer Route5CleanseTagSpeechHouseTeacherText
Route5CleanseTagHouseTeacherScript:
jumptextfaceplayer Route5CleanseTagHouseTeacherText
HouseForSaleBookshelf:
jumpstd difficultbookshelf
@@ -49,7 +49,7 @@ UnknownText_0x18b6a7:
cont "are protected now."
done
Route5CleanseTagSpeechHouseTeacherText:
Route5CleanseTagHouseTeacherText:
text "My grandma is into"
line "warding off what"
@@ -60,7 +60,7 @@ Route5CleanseTagSpeechHouseTeacherText:
line "startled you."
done
Route5CleanseTagSpeechHouse_MapEvents:
Route5CleanseTagHouse_MapEvents:
; filler
db 0, 0
@@ -80,4 +80,4 @@ Route5CleanseTagSpeechHouse_MapEvents:
.ObjectEvents:
db 2
object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1
object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1
object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1