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

Consistent stonetable cmdqueues

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-13 01:03:42 -05:00
parent 5a3822fe86
commit b28e71271d
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
maps/BlackthornGym2F.asm
View File

@ -14,30 +14,30 @@ BlackthornGym2F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
callback MAPCALLBACK_CMDQUEUE, .Boulders callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
.Boulders: .SetUpStoneTable:
writecmdqueue .BoulderCmdQueue writecmdqueue .CommandQueue
return return
.BoulderCmdQueue: .CommandQueue:
cmdqueue CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp
.BoulderTable: .StoneTable:
stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4 stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Boulder1
stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Disappear5 stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Boulder2
stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Disappear6 stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Boulder3
db -1 ; end db -1 ; end
.Disappear4: .Boulder1:
disappear BLACKTHORNGYM2F_BOULDER1 disappear BLACKTHORNGYM2F_BOULDER1
jump .Fall jump .Fall
.Disappear5: .Boulder2:
disappear BLACKTHORNGYM2F_BOULDER2 disappear BLACKTHORNGYM2F_BOULDER2
jump .Fall jump .Fall
.Disappear6: .Boulder3:
disappear BLACKTHORNGYM2F_BOULDER3 disappear BLACKTHORNGYM2F_BOULDER3
jump .Fall jump .Fall

2
maps/IcePathB1F.asm
View File

@ -25,7 +25,7 @@ IcePathB1F_MapScriptHeader:
stonetable 4, ICEPATHB1F_BOULDER2, .Boulder2 stonetable 4, ICEPATHB1F_BOULDER2, .Boulder2
stonetable 5, ICEPATHB1F_BOULDER3, .Boulder3 stonetable 5, ICEPATHB1F_BOULDER3, .Boulder3
stonetable 6, ICEPATHB1F_BOULDER4, .Boulder4 stonetable 6, ICEPATHB1F_BOULDER4, .Boulder4
db -1 db -1 ; end
.Boulder1: .Boulder1:
disappear ICEPATHB1F_BOULDER1 disappear ICEPATHB1F_BOULDER1

14
maps/IcePathB2FMahoganySide.asm
View File

@ -13,8 +13,8 @@ IcePathB2FMahoganySide_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
BoulderScript_0x7e5a3: IcePathB2FMahoganySideBoulder:
jumptext UnknownText_0x7e5ad jumptext IcePathB2FMahoganySideBoulderText
IcePathB2FMahoganySideFullHeal: IcePathB2FMahoganySideFullHeal:
itemball FULL_HEAL itemball FULL_HEAL
@ -25,7 +25,7 @@ IcePathB2FMahoganySideMaxPotion:
IcePathB2FMahoganySideHiddenCarbos: IcePathB2FMahoganySideHiddenCarbos:
hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
UnknownText_0x7e5ad: IcePathB2FMahoganySideBoulderText:
text "It's immovably" text "It's immovably"
line "imbedded in ice." line "imbedded in ice."
done done
@ -52,9 +52,9 @@ IcePathB2FMahoganySide_MapEventHeader:
.ObjectEvents: .ObjectEvents:
db 6 db 6
object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A
object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A
object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A
object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A
object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION

4
maps/TeamRocketBaseB2F.asm
View File

@ -44,7 +44,7 @@ TeamRocketBaseB2F_MapScriptHeader:
return return
.Change: .Change:
changeblock 14, 12, $7 changeblock 14, 12, $07
return return
UnknownScript_0x6cf95: UnknownScript_0x6cf95:
@ -330,7 +330,7 @@ UnknownScript_0x6d1e8:
writetext UnknownText_0x6dd6b writetext UnknownText_0x6dd6b
waitbutton waitbutton
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
changeblock 14, 12, $7 changeblock 14, 12, $07
reloadmappart reloadmappart
closetext closetext
setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER

4
maps/TeamRocketBaseB3F.asm
View File

@ -45,7 +45,7 @@ TeamRocketBaseB3F_MapScriptHeader:
return return
.OpenSesame: .OpenSesame:
changeblock 10, 8, $7 changeblock 10, 8, $07
return return
LanceGetPasswordScript: LanceGetPasswordScript:
@ -194,7 +194,7 @@ TeamRocketBaseB3FLockedDoor:
writetext UnknownText_0x6e9a3 writetext UnknownText_0x6e9a3
waitbutton waitbutton
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
changeblock 10, 8, $7 changeblock 10, 8, $07
reloadmappart reloadmappart
closetext closetext
setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE