Fixing My Errors + More

This commit is contained in:
Misty Violet 2023-10-22 18:15:19 -04:00
parent fa5f2111f9
commit d0d6bbb8cf
25 changed files with 518 additions and 702 deletions

View file

@ -1,9 +1,9 @@
CeruleanCave1F_MapScriptHeader:
CeruleanCave1F_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_TILES, CeruleanCave1FTileScript
CeruleanCave1F_MapEvents:
def_warp_events
warp_event 27, 21, CERULEAN_CITY, 7
warp_event 9, 5, CERULEAN_CAVE_2F, 1
@ -15,12 +15,6 @@ CeruleanCave1F_MapScriptHeader:
warp_event 5, 15, CERULEAN_CAVE_2F, 6
def_coord_events
coord_event 20, 4, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 20, 5, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 23, 4, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 23, 5, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 21, 7, 0, CeruleanCave1FBridgeUnderfootTrigger
coord_event 22, 7, 0, CeruleanCave1FBridgeUnderfootTrigger
def_bg_events
bg_event 10, 13, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_1F_HIDDEN_ULTRA_BALL
@ -29,49 +23,6 @@ CeruleanCave1F_MapScriptHeader:
bg_event 25, 2, BGEVENT_ITEM + BERSERK_GENE, EVENT_CERULEAN_CAVE_1F_HIDDEN_BERSERK_GENE
def_object_events
itemball_event 7, 6, BIG_NUGGET, 1, EVENT_CERULEAN_CAVE_1F_BIG_NUGGET
itemball_event 9, 17, FULL_RESTORE, 1, EVENT_CERULEAN_CAVE_1F_FULL_RESTORE
itemball_event 14, 2, MAX_REVIVE, 1, EVENT_CERULEAN_CAVE_1F_MAX_REVIVE
CeruleanCave1FTileScript:
checkscene
iftrue .underfoot
callasm CeruleanCave1F_OverheadBridgeAsm
endcallback
.underfoot:
callasm CeruleanCave1F_UnderfootBridgeAsm
endcallback
CeruleanCave1F_OverheadBridgeAsm:
changebridgeblock 20, 2, $ea, CERULEAN_CAVE_1F
changebridgeblock 22, 2, $eb, CERULEAN_CAVE_1F
changebridgeblock 20, 4, $ee, CERULEAN_CAVE_1F
changebridgeblock 22, 4, $ef, CERULEAN_CAVE_1F
changebridgeblock 20, 6, $59, CERULEAN_CAVE_1F
changebridgeblock 22, 6, $5b, CERULEAN_CAVE_1F
jmp BufferScreen
CeruleanCave1F_UnderfootBridgeAsm:
changebridgeblock 20, 2, $e8, CERULEAN_CAVE_1F
changebridgeblock 22, 2, $e9, CERULEAN_CAVE_1F
changebridgeblock 20, 4, $ec, CERULEAN_CAVE_1F
changebridgeblock 22, 4, $ed, CERULEAN_CAVE_1F
changebridgeblock 20, 6, $55, CERULEAN_CAVE_1F
changebridgeblock 22, 6, $57, CERULEAN_CAVE_1F
jmp BufferScreen
CeruleanCave1FBridgeOverheadTrigger:
callasm CeruleanCave1F_OverheadBridgeAsm
callthisasm
xor a
jr CeruleanCave1F_FinishBridge
CeruleanCave1FBridgeUnderfootTrigger:
callasm CeruleanCave1F_UnderfootBridgeAsm
callthisasm
ld a, $1
CeruleanCave1F_FinishBridge:
ld [wWalkingOnBridge], a
ld [wCeruleanCave1FSceneID], a ; setscene a
jmp GenericFinishBridge
object_event 7, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NUGGET, 1, EVENT_CERULEAN_CAVE_1F_BIG_NUGGET
object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FULL_RESTORE, 1, EVENT_CERULEAN_CAVE_1F_FULL_RESTORE
object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MAX_REVIVE, 1, EVENT_CERULEAN_CAVE_1F_MAX_REVIVE