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

Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

Browse Source 
# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm
This commit is contained in:
Remy Oukaour
2018-01-14 22:56:36 -05:00
parent 8e1e583640 2c789b64b1
commit 5c28d05bb4
249 changed files with 1382 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maps/TinTower1F.asm
View File

@@ -33,7 +33,7 @@ TinTower1F_MapScriptHeader:
iftrue .GotRainbowWing
checkevent EVENT_BEAT_ELITE_FOUR
iffalse .FaceBeasts
special SpecialBeastsCheck
special Special_BeastsCheck
iffalse .FaceBeasts
clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1
@@ -49,7 +49,7 @@ TinTower1F_MapScriptHeader:
iftrue .FoughtSuicune
appear TINTOWER1F_SUICUNE
writebyte RAIKOU
special SpecialMonCheck
special Special_MonCheck
iftrue .NoRaikou
appear TINTOWER1F_RAIKOU
jump .CheckEntei
@@ -58,7 +58,7 @@ TinTower1F_MapScriptHeader:
disappear TINTOWER1F_RAIKOU
.CheckEntei:
writebyte ENTEI
special SpecialMonCheck
special Special_MonCheck
iftrue .NoEntei
appear TINTOWER1F_ENTEI
jump .BeastsDone
@@ -87,7 +87,7 @@ TinTower1F_MapScriptHeader:
applymovement PLAYER, TinTowerPlayerMovement1
pause 15
writebyte RAIKOU
special SpecialMonCheck
special Special_MonCheck
iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower
applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1
spriteface PLAYER, LEFT
@@ -100,7 +100,7 @@ TinTower1F_MapScriptHeader:
waitsfx
.Next1:
writebyte ENTEI
special SpecialMonCheck
special Special_MonCheck
iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower
applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1
spriteface PLAYER, RIGHT