Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	maps/Route25.asm
#	maps/Route27.asm
#	maps/Route35.asm
#	maps/Route39.asm
#	maps/Route42.asm
#	maps/Route43.asm
#	maps/Route43MahoganyGate.asm
#	maps/Route45.asm
#	maps/Route5CleanseTagHouse.asm
#	maps/Route6SaffronGate.asm
#	maps/Route7SaffronGate.asm
#	maps/ViridianCity.asm
This commit is contained in:
Rangi
2018-01-30 22:01:20 -05:00
parent 6e00101b89 7547ad839c
commit 72cdcb621c
19 changed files with 610 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maps/Route43MahoganyGate.asm
View File

@@ -6,17 +6,17 @@ Route43MahoganyGate_MapScripts:
db 0 ; callbacks
OfficerScript_0x19ab0b:
Route43MahoganyGateOfficer:
faceplayer
opentext
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19ab19
iftrue .RocketsCleared
writetext UnknownText_0x19ab1f
waitbutton
closetext
end
UnknownScript_0x19ab19:
.RocketsCleared:
writetext UnknownText_0x19ab65
waitbutton
closetext
@@ -50,4 +50,4 @@ Route43MahoganyGate_MapEvents:
db 0 ; bg events
db 1 ; object events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1