Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2024-11-30 08:20:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync cave_of_origin.inc

Browse Source
This commit is contained in:
GriffinR 2020-05-06 15:20:28 -04:00
parent d53c3741ab
commit 49d6f31c28
16 changed files with 68 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
data-de/event_scripts.s vendored
View File

@ -963,57 +963,7 @@ Common_EventScript_FerryDepartIsland:: @ 81A047C
call Common_EventScript_FerryDepart
return
CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0
lockall
waitse
playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
waitmoncry
setvar VAR_TEMP_5, 1
releaseall
end
CaveOfOrigin_1F_EventScript_1A04AF:: @ 81A04AF
CaveOfOrigin_B1F_EventScript_1A04AF:: @ 81A04AF
CaveOfOrigin_B2F_EventScript_1A04AF:: @ 81A04AF
CaveOfOrigin_B3F_EventScript_1A04AF:: @ 81A04AF
lockall
setvar VAR_TEMP_1, 1
goto CaveOfOrigin_1F_EventScript_1A04D3
end
CaveOfOrigin_B2F_EventScript_1A04BB:: @ 81A04BB
CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB
lockall
setvar VAR_TEMP_2, 1
goto CaveOfOrigin_B2F_EventScript_1A04D3
end
@ 81A04C7
lockall
setvar VAR_TEMP_3, 1
goto CaveOfOrigin_B2F_EventScript_1A04D3
end
CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3
CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_810F758
waitstate
releaseall
end
CaveOfOrigin_1F_EventScript_1A04E3:: @ 81A04E3
CaveOfOrigin_B1F_EventScript_1A04E3:: @ 81A04E3
CaveOfOrigin_B2F_EventScript_1A04E3:: @ 81A04E3
CaveOfOrigin_B3F_EventScript_1A04E3:: @ 81A04E3
CaveOfOrigin_B4F_EventScript_1A04E3:: @ 81A04E3
setvar VAR_TEMP_1, 1
setvar VAR_TEMP_2, 1
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_4, 1
setvar VAR_TEMP_5, 1
return
.include "data/scripts/cave_of_origin.inc"
AquaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD

52
data/event_scripts.s vendored
View File

@ -962,57 +962,7 @@ Common_EventScript_FerryDepartIsland:: @ 81A047C
call Common_EventScript_FerryDepart
return
CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0
lockall
waitse
playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
waitmoncry
setvar VAR_TEMP_5, 1
releaseall
end
CaveOfOrigin_1F_EventScript_1A04AF:: @ 81A04AF
CaveOfOrigin_B1F_EventScript_1A04AF:: @ 81A04AF
CaveOfOrigin_B2F_EventScript_1A04AF:: @ 81A04AF
CaveOfOrigin_B3F_EventScript_1A04AF:: @ 81A04AF
lockall
setvar VAR_TEMP_1, 1
goto CaveOfOrigin_1F_EventScript_1A04D3
end
CaveOfOrigin_B2F_EventScript_1A04BB:: @ 81A04BB
CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB
lockall
setvar VAR_TEMP_2, 1
goto CaveOfOrigin_B2F_EventScript_1A04D3
end
@ 81A04C7
lockall
setvar VAR_TEMP_3, 1
goto CaveOfOrigin_B2F_EventScript_1A04D3
end
CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3
CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_810F758
waitstate
releaseall
end
CaveOfOrigin_1F_EventScript_1A04E3:: @ 81A04E3
CaveOfOrigin_B1F_EventScript_1A04E3:: @ 81A04E3
CaveOfOrigin_B2F_EventScript_1A04E3:: @ 81A04E3
CaveOfOrigin_B3F_EventScript_1A04E3:: @ 81A04E3
CaveOfOrigin_B4F_EventScript_1A04E3:: @ 81A04E3
setvar VAR_TEMP_1, 1
setvar VAR_TEMP_2, 1
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_4, 1
setvar VAR_TEMP_5, 1
return
.include "data/scripts/cave_of_origin.inc"
AquaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD

6
data/maps/CaveOfOrigin_1F/map.json vendored
View File

@ -35,7 +35,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "CaveOfOrigin_1F_EventScript_1A04AF"
"script": "CaveOfOrigin_EventScript_Shake1"
},
{
"type": "trigger",
@ -44,7 +44,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "CaveOfOrigin_1F_EventScript_1A04AF"
"script": "CaveOfOrigin_EventScript_Shake1"
},
{
"type": "trigger",
@ -53,7 +53,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "CaveOfOrigin_1F_EventScript_1A04AF"
"script": "CaveOfOrigin_EventScript_Shake1"
}
],
"bg_events": []

2
data/maps/CaveOfOrigin_1F/scripts.inc vendored
View File

@ -3,5 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C
.byte 0
CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72
call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_1F_EventScript_1A04E3
call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_EventScript_DisableTriggers
end

6
data/maps/CaveOfOrigin_B1F/map.json vendored
View File

@ -35,7 +35,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "CaveOfOrigin_B1F_EventScript_1A04AF"
"script": "CaveOfOrigin_EventScript_Shake1"
},
{
"type": "trigger",
@ -44,7 +44,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "CaveOfOrigin_B1F_EventScript_1A04AF"
"script": "CaveOfOrigin_EventScript_Shake1"
},
{
"type": "trigger",
@ -53,7 +53,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "CaveOfOrigin_B1F_EventScript_1A04AF"
"script": "CaveOfOrigin_EventScript_Shake1"
}
],
"bg_events": []

2
data/maps/CaveOfOrigin_B1F/scripts.inc vendored
View File

@ -3,5 +3,5 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C
.byte 0
CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82
call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B1F_EventScript_1A04E3
call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_EventScript_DisableTriggers
end

6
data/maps/CaveOfOrigin_B2F/map.json vendored
View File

@ -35,7 +35,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "CaveOfOrigin_B2F_EventScript_1A04AF"
"script": "CaveOfOrigin_EventScript_Shake1"
},
{
"type": "trigger",
@ -44,7 +44,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "CaveOfOrigin_B2F_EventScript_1A04AF"
"script": "CaveOfOrigin_EventScript_Shake1"
},
{
"type": "trigger",
@ -53,7 +53,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
"script": "CaveOfOrigin_B2F_EventScript_1A04BB"
"script": "CaveOfOrigin_EventScript_Shake2"
}
],
"bg_events": []

2
data/maps/CaveOfOrigin_B2F/scripts.inc vendored
View File

@ -3,5 +3,5 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C
.byte 0
CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92
call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B2F_EventScript_1A04E3
call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_EventScript_DisableTriggers
end

6
data/maps/CaveOfOrigin_B3F/map.json vendored
View File

@ -49,7 +49,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "CaveOfOrigin_B3F_EventScript_1A04AF"
"script": "CaveOfOrigin_EventScript_Shake1"
},
{
"type": "trigger",
@ -58,7 +58,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
"script": "CaveOfOrigin_B3F_EventScript_1A04BB"
"script": "CaveOfOrigin_EventScript_Shake2"
},
{
"type": "trigger",
@ -67,7 +67,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
"script": "CaveOfOrigin_B3F_EventScript_1A04BB"
"script": "CaveOfOrigin_EventScript_Shake2"
}
],
"bg_events": []

2
data/maps/CaveOfOrigin_B3F/scripts.inc vendored
View File

@ -3,5 +3,5 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C
.byte 0
CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2
call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B3F_EventScript_1A04E3
call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_EventScript_DisableTriggers
end

4
data/maps/CaveOfOrigin_B4F/map.json vendored
View File

@ -51,7 +51,7 @@
"elevation": 3,
"var": "VAR_TEMP_5",
"var_value": "0",
"script": "CaveOfOrigin_B4F_EventScript_1A04A0"
"script": "CaveOfOrigin_EventScript_LegendaryCry"
},
{
"type": "trigger",
@ -60,7 +60,7 @@
"elevation": 3,
"var": "VAR_TEMP_5",
"var_value": "0",
"script": "CaveOfOrigin_B4F_EventScript_1A04A0"
"script": "CaveOfOrigin_EventScript_LegendaryCry"
}
],
"bg_events": []

2
data/maps/CaveOfOrigin_B4F/scripts.inc vendored
View File

@ -18,7 +18,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5
setmaplayoutindex 313
.endif
call Common_EventScript_SetupLegendaryGfxIds
call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B4F_EventScript_1A04E3
call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_EventScript_DisableTriggers
end
CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7

4
data/maps/SeafloorCavern_Room9/scripts.inc vendored
View File

@ -106,7 +106,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
waitstate
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_810F758
special ShakeCamera
waitstate
applymovement 1, SeafloorCavern_Room9_Movement_15DD57
waitmovement 0
@ -114,7 +114,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
delay 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
special sub_810F758
special ShakeCamera
waitstate
delay 30
setvar VAR_0x8004, 2

43
data/scripts/cave_of_origin.inc vendored Normal file
View File

@ -0,0 +1,43 @@
CaveOfOrigin_EventScript_LegendaryCry:: @ 81A04A0
lockall
waitse
playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
waitmoncry
setvar VAR_TEMP_5, 1
releaseall
end
CaveOfOrigin_EventScript_Shake1:: @ 81A04AF
lockall
setvar VAR_TEMP_1, 1
goto CaveOfOrigin_EventScript_Shake
end
CaveOfOrigin_EventScript_Shake2:: @ 81A04BB
lockall
setvar VAR_TEMP_2, 1
goto CaveOfOrigin_EventScript_Shake
end
@ Unused
CaveOfOrigin_EventScript_Shake3:: @ 81A04C7
lockall
setvar VAR_TEMP_3, 1
goto CaveOfOrigin_EventScript_Shake
end
CaveOfOrigin_EventScript_Shake:: @ 81A04D3
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special ShakeCamera
waitstate
releaseall
end
CaveOfOrigin_EventScript_DisableTriggers:: @ 81A04E3
setvar VAR_TEMP_1, 1
setvar VAR_TEMP_2, 1
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_4, 1
setvar VAR_TEMP_5, 1
return

2
data/specials.inc
View File

@ -318,7 +318,7 @@ gSpecials::
def_special GetShieldToyTVDecorationInfo
def_special IsPokerusInParty
def_special SetSootopolisGymCrackedIceMetatiles
def_special sub_810F758
def_special ShakeCamera
def_special ScrSpecial_StartGroudonKyogreBattle
def_special ScrSpecial_StartRayquazaBattle
def_special ScrSpecial_StartRegiBattle

2
src/field_specials.c
View File

@ -1791,7 +1791,7 @@ bool8 IsPokerusInParty(void)
static void sub_810F7A8(u8);
static void sub_810F814(u8);
void sub_810F758(void)
void ShakeCamera(void)
{
u8 taskId = CreateTask(sub_810F7A8, 9);
gTasks[taskId].data[0] = gSpecialVar_0x8005;