pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
This commit is contained in:
Rangi
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@@ -279,9 +279,9 @@ Switch1Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar 1
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
setevent EVENT_SWITCH_1
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -289,9 +289,9 @@ Switch1Script:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar -1
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_SWITCH_1
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -304,9 +304,9 @@ Switch2Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar 2
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
setevent EVENT_SWITCH_2
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -314,9 +314,9 @@ Switch2Script:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar -2
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_SWITCH_2
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -329,9 +329,9 @@ Switch3Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar 3
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
setevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -339,9 +339,9 @@ Switch3Script:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar -3
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -355,7 +355,7 @@ EmergencySwitchScript:
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
writebyte 7
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
setevent EVENT_EMERGENCY_SWITCH
setevent EVENT_SWITCH_1
setevent EVENT_SWITCH_2
@@ -367,7 +367,7 @@ EmergencySwitchScript:
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
writebyte 0
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_EMERGENCY_SWITCH
clearevent EVENT_SWITCH_1
clearevent EVENT_SWITCH_2
@@ -379,7 +379,7 @@ GoldenrodUndergroundSwitchRoomEntrances_DontToggle:
end
GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
ifequal 0, .Position0
ifequal 1, .Position1
ifequal 2, .Position2
@@ -499,7 +499,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
reloadmappart
closetext
writebyte 6
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
end
.Set4: