ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Document Sky Pillar outside

Browse Source
This commit is contained in:
GriffinR 2019-11-08 03:37:46 -05:00 committed by huderlem
parent a727c16012
commit 8702972067
26 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/event_scripts.s
View File

@ -780,7 +780,7 @@ Common_EventScript_NoRoomForDecor:: @ 8272071
msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
return
Common_EventScript_SetWeather15:: @ 827207A
Common_EventScript_SetAlternatingWeather:: @ 827207A
setweather WEATHER_ALTERNATING
return

2
data/maps/EverGrandeCity/scripts.inc
View File

@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B
.byte 0
EverGrandeCity_OnTransition: @ 81E7D21
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
end
EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B

2
data/maps/LilycoveCity/scripts.inc
View File

@ -7,7 +7,7 @@ LilycoveCity_OnTransition: @ 81E2B47
setflag FLAG_VISITED_LILYCOVE_CITY
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
call Common_EventScript_SetupRivalGfxId
end

2
data/maps/MossdeepCity/scripts.inc
View File

@ -7,7 +7,7 @@ MossdeepCity_OnTransition: @ 81E4A9C
clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
end
MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2

2
data/maps/Route124/scripts.inc
View File

@ -3,7 +3,7 @@ Route124_MapScripts:: @ 81F656C
.byte 0
Route124_OnTransition: @ 81F6572
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
end
Route124_EventScript_1F657C:: @ 81F657C

2
data/maps/Route125/scripts.inc
View File

@ -5,7 +5,7 @@ Route125_MapScripts:: @ 81F6748
.byte 0
Route125_OnTransition: @ 81F6758
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST

2
data/maps/Route126/scripts.inc
View File

@ -3,7 +3,7 @@ Route126_MapScripts:: @ 81F68C6
.byte 0
Route126_OnTransition: @ 81F68CC
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
end
Route126_EventScript_1F68D6:: @ 81F68D6

2
data/maps/Route127/scripts.inc
View File

@ -5,7 +5,7 @@ Route127_MapScripts:: @ 81F69D9
.byte 0
Route127_OnTransition: @ 81F69E9
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH

2
data/maps/Route128/scripts.inc
View File

@ -4,7 +4,7 @@ Route128_MapScripts:: @ 81F6B38
.byte 0
Route128_OnTransition: @ 81F6B43
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
end
Route128_MapScript2_1F6B4D: @ 81F6B4D

2
data/maps/Route129/scripts.inc
View File

@ -23,7 +23,7 @@ Route129_OnTransition: @ 81F72AB
end
Route129_EventScript_1F72D8:: @ 81F72D8
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
return
Route129_MapScript2_1F72E2: @ 81F72E2

2
data/maps/Route130/scripts.inc
View File

@ -31,7 +31,7 @@ Route130_EventScript_1F73B1:: @ 81F73B1
end
Route130_EventScript_1F73B5:: @ 81F73B5
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
return
Route130_EventScript_1F73BF:: @ 81F73BF

2
data/maps/Route131/scripts.inc
View File

@ -13,7 +13,7 @@ Route131_EventScript_1F741B:: @ 81F741B
return
Route131_EventScript_1F741F:: @ 81F741F
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
return
Route131_EventScript_1F7429:: @ 81F7429

2
data/maps/SkyPillar_Outside/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SkyPillar_Outside_EventScript_2393F8",
"script": "SkyPillar_Outside_EventScript_Wallace",
"flag": "FLAG_HIDE_SKY_PILLAR_WALLACE"
}
],

62
data/maps/SkyPillar_Outside/scripts.inc
View File

@ -1,44 +1,44 @@
SkyPillar_Outside_MapScripts:: @ 82392A8
map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_OnTransition
map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD
map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA
map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_OnLoad
map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_OnFrame
.byte 0
SkyPillar_Outside_OnTransition: @ 82392B8
compare VAR_SOOTOPOLIS_CITY_STATE, 3
call_if_eq SkyPillar_Outside_EventScript_2392CF
call_if_eq SkyPillar_Outside_EventScript_HideMapNamePopup
compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_ge SkyPillar_Outside_EventScript_2392D3
call_if_ge SkyPillar_Outside_EventScript_CheckSetAlternatingWeather
end
SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
SkyPillar_Outside_EventScript_HideMapNamePopup:: @ 82392CF
setflag FLAG_HIDE_MAP_NAME_POPUP
return
SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
SkyPillar_Outside_EventScript_CheckSetAlternatingWeather:: @ 82392D3
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
return
SkyPillar_Outside_MapScript1_2392DD: @ 82392DD
call_if_set FLAG_WALLACE_GOES_TO_SKY_PILLAR, SkyPillar_Outside_EventScript_2392E7
SkyPillar_Outside_OnLoad: @ 82392DD
call_if_set FLAG_WALLACE_GOES_TO_SKY_PILLAR, SkyPillar_Outside_EventScript_OpenDoor
end
SkyPillar_Outside_EventScript_2392E7:: @ 82392E7
SkyPillar_Outside_EventScript_OpenDoor:: @ 82392E7
setmetatile 14, 4, METATILE_Pacifidlog_SkyPillar_DoorOpen_Top, 0
setmetatile 14, 5, METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom, 0
return
SkyPillar_Outside_MapScript2_2392FA: @ 82392FA
map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, SkyPillar_Outside_EventScript_239304
SkyPillar_Outside_OnFrame: @ 82392FA
map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, SkyPillar_Outside_EventScript_WallaceScene
.2byte 0
SkyPillar_Outside_EventScript_239304:: @ 8239304
SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
lockall
applymovement 1, SkyPillar_Outside_Movement_2393D3
applymovement 1, SkyPillar_Outside_Movement_WallaceApproachPlayer
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT
msgbox SkyPillar_Outside_Text_OpenedDoorToSkyPillar, MSGBOX_DEFAULT
closemessage
delay 30
setvar VAR_0x8004, 1 @ vertical pan
@ -48,10 +48,10 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
special ShakeCamera
waitstate
delay 40
msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT
msgbox SkyPillar_Outside_Text_EarthquakeNotMomentToWaste, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2393EB
applymovement 1, SkyPillar_Outside_Movement_2393DE
applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_PlayerClimbSkyPillar
applymovement 1, SkyPillar_Outside_Movement_WallaceClimbSkyPillar
waitmovement 0
setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 3 @ horizontal pan
@ -69,7 +69,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
delay 30
msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT
msgbox SkyPillar_Outside_Text_SituationGettingWorse, MSGBOX_DEFAULT
closemessage
setflag FLAG_SYS_WEATHER_CTRL
setweather WEATHER_ALTERNATING
@ -77,7 +77,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
special WaitWeather
waitstate
delay 30
msgbox SkyPillar_Outside_Text_23953A, MSGBOX_DEFAULT
msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT
closemessage
playse SE_KAIDAN
fadescreenswapbuffers 1
@ -89,7 +89,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
releaseall
end
SkyPillar_Outside_Movement_2393D3: @ 82393D3
SkyPillar_Outside_Movement_WallaceApproachPlayer: @ 82393D3
walk_down
walk_down
walk_down
@ -102,7 +102,7 @@ SkyPillar_Outside_Movement_2393D3: @ 82393D3
walk_right
step_end
SkyPillar_Outside_Movement_2393DE: @ 82393DE
SkyPillar_Outside_Movement_WallaceClimbSkyPillar: @ 82393DE
walk_left
walk_left
walk_left
@ -117,7 +117,7 @@ SkyPillar_Outside_Movement_2393DE: @ 82393DE
walk_up
step_end
SkyPillar_Outside_Movement_2393EB: @ 82393EB
SkyPillar_Outside_Movement_PlayerClimbSkyPillar: @ 82393EB
walk_left
walk_left
walk_left
@ -132,17 +132,17 @@ SkyPillar_Outside_Movement_2393EB: @ 82393EB
walk_up
step_end
SkyPillar_Outside_EventScript_2393F8:: @ 82393F8
SkyPillar_Outside_EventScript_Wallace:: @ 82393F8
end
SkyPillar_Outside_EventScript_2393F9:: @ 82393F9
msgbox SkyPillar_Outside_Text_239402, MSGBOX_SIGN
SkyPillar_Outside_EventScript_ClosedDoor:: @ 82393F9
msgbox SkyPillar_Outside_Text_DoorIsClosed, MSGBOX_SIGN
end
SkyPillar_Outside_Text_239402: @ 8239402
SkyPillar_Outside_Text_DoorIsClosed: @ 8239402
.string "The door is closed.$"
SkyPillar_Outside_Text_239416: @ 8239416
SkyPillar_Outside_Text_OpenedDoorToSkyPillar: @ 8239416
.string "WALLACE: Oh, my, I'm terribly sorry!\p"
.string "In my haste, I didn't notice that\n"
.string "I'd left you behind!\p"
@ -150,16 +150,16 @@ SkyPillar_Outside_Text_239416: @ 8239416
.string "the SKY PILLAR.\p"
.string "{PLAYER}{KUN}, let's be on our way!$"
SkyPillar_Outside_Text_2394BC: @ 82394BC
SkyPillar_Outside_Text_EarthquakeNotMomentToWaste: @ 82394BC
.string "WALLACE: It's an earthquake!\p"
.string "There's not a moment to waste!\n"
.string "We've got to hurry!$"
SkyPillar_Outside_Text_23950C: @ 823950C
SkyPillar_Outside_Text_SituationGettingWorse: @ 823950C
.string "WALLACE: Hmm…\n"
.string "The situation is getting worse…$"
SkyPillar_Outside_Text_23953A: @ 823953A
SkyPillar_Outside_Text_GotToGoBackForSootopolis: @ 823953A
.string "WALLACE: This isn't good…\p"
.string "The weather distortion is spreading\n"
.string "even here…\p"

2
data/maps/SootopolisCity/scripts.inc
View File

@ -110,7 +110,7 @@ SootopolisCity_EventScript_1E5805:: @ 81E5805
compare VAR_SKY_PILLAR_STATE, 1
goto_if_eq SootopolisCity_EventScript_1E583E
compare VAR_SKY_PILLAR_STATE, 1
goto_if_le Common_EventScript_SetWeather15
goto_if_le Common_EventScript_SetAlternatingWeather
return
SootopolisCity_EventScript_1E583D:: @ 81E583D

4
data/maps/Underwater3/scripts.inc
View File

@ -1,8 +1,8 @@
Underwater3_MapScripts:: @ 81F7724
map_script MAP_SCRIPT_ON_RESUME, Underwater3_MapScript1_1F772A
map_script MAP_SCRIPT_ON_RESUME, Underwater3_OnResume
.byte 0
Underwater3_MapScript1_1F772A: @ 81F772A
Underwater3_OnResume: @ 81F772A
call UnusualWeather_Underwater_SetupEscapeWarp
end

4
data/maps/Underwater5/scripts.inc
View File

@ -1,8 +1,8 @@
Underwater5_MapScripts:: @ 81F7731
map_script MAP_SCRIPT_ON_RESUME, Underwater5_MapScript1_1F7737
map_script MAP_SCRIPT_ON_RESUME, Underwater5_OnResume
.byte 0
Underwater5_MapScript1_1F7737: @ 81F7737
Underwater5_OnResume: @ 81F7737
call UnusualWeather_Underwater_SetupEscapeWarp
end

4
data/maps/Underwater6/scripts.inc
View File

@ -1,8 +1,8 @@
Underwater6_MapScripts:: @ 81F773D
map_script MAP_SCRIPT_ON_RESUME, Underwater6_MapScript1_1F7743
map_script MAP_SCRIPT_ON_RESUME, Underwater6_OnResume
.byte 0
Underwater6_MapScript1_1F7743: @ 81F7743
Underwater6_OnResume: @ 81F7743
call UnusualWeather_Underwater_SetupEscapeWarp
end

4
data/maps/Underwater7/scripts.inc
View File

@ -1,8 +1,8 @@
Underwater7_MapScripts:: @ 81F7749
map_script MAP_SCRIPT_ON_RESUME, Underwater7_MapScript1_1F774F
map_script MAP_SCRIPT_ON_RESUME, Underwater7_OnResume
.byte 0
Underwater7_MapScript1_1F774F: @ 81F774F
Underwater7_OnResume: @ 81F774F
call UnusualWeather_Underwater_SetupEscapeWarp
end

4
data/maps/Underwater_Route134/scripts.inc
View File

@ -1,8 +1,8 @@
Underwater_Route134_MapScripts:: @ 82390B5
map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_MapScript1_2390BB
map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_OnResume
.byte 0
Underwater_Route134_MapScript1_2390BB: @ 82390BB
Underwater_Route134_OnResume: @ 82390BB
setdivewarp MAP_ROUTE134, 255, 60, 31
end

4
data/maps/Underwater_SootopolisCity/scripts.inc
View File

@ -1,8 +1,8 @@
Underwater_SootopolisCity_MapScripts:: @ 822D94C
map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_MapScript1_22D952
map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_OnResume
.byte 0
Underwater_SootopolisCity_MapScript1_22D952: @ 822D952
Underwater_SootopolisCity_OnResume: @ 822D952
setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53
end

2
include/constants/metatile_behaviors.h
View File

@ -235,7 +235,7 @@
#define MB_CABLE_BOX_RESULTS_2 0xE7
#define MB_WIRELESS_BOX_RESULTS 0xE8
#define MB_TRAINER_HILL_TIMER 0xE9
#define MB_UNKNOWN_CLOSED_DOOR 0xEA
#define MB_SKY_PILLAR_CLOSED_DOOR 0xEA
#define MB_UNUSED_EB 0xEB
#define MB_UNUSED_EC 0xEC
#define MB_UNUSED_ED 0xED

2
include/event_scripts.h
View File

@ -524,7 +524,7 @@ extern const u8 EventScript_TestSignpostMsg[];
extern const u8 EventScript_HiddenItemScript[];
extern const u8 EventScript_TV[];
extern const u8 EventScript_ClosedSootopolisDoor[];
extern const u8 SkyPillar_Outside_EventScript_2393F9[];
extern const u8 SkyPillar_Outside_EventScript_ClosedDoor[];
extern const u8 EventScript_CableBoxResults[];
extern const u8 EventScript_PokeBlockFeeder[];
extern const u8 Route110_TrickHouseEntrance_EventScript_26A22A[];

2
include/metatile_behavior.h
View File

@ -107,7 +107,7 @@ bool8 MetatileBehavior_IsPacifidlogLog(u8);
bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8);
bool8 MetatileBehavior_IsRegionMap(u8);
bool8 MetatileBehavior_IsClosedSootopolisDoor(u8);
bool8 MetatileBehavior_IsUnknownClosedDoor(u8);
bool8 MetatileBehavior_IsSkyPillarClosedDoor(u8);
bool8 MetatileBehavior_IsRoulette(u8);
bool8 MetatileBehavior_IsPokeblockFeeder(u8);
bool8 MetatileBehavior_IsSecretBaseJumpMat(u8);

4
src/field_control_avatar.c
View File

@ -373,8 +373,8 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me
return EventScript_PC;
if (MetatileBehavior_IsClosedSootopolisDoor(metatileBehavior) == TRUE)
return EventScript_ClosedSootopolisDoor;
if (MetatileBehavior_IsUnknownClosedDoor(metatileBehavior) == TRUE)
return SkyPillar_Outside_EventScript_2393F9;
if (MetatileBehavior_IsSkyPillarClosedDoor(metatileBehavior) == TRUE)
return SkyPillar_Outside_EventScript_ClosedDoor;
if (MetatileBehavior_IsCableBoxResults1(metatileBehavior) == TRUE)
return EventScript_CableBoxResults;
if (MetatileBehavior_IsPokeblockFeeder(metatileBehavior) == TRUE)

6
src/metatile_behavior.c
View File

@ -244,7 +244,7 @@ static const u8 sTileBitAttributes[] =
[MB_CABLE_BOX_RESULTS_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_WIRELESS_BOX_RESULTS] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_TRAINER_HILL_TIMER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_UNKNOWN_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_SKY_PILLAR_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_UNUSED_EB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_UNUSED_EC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_UNUSED_ED] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
@ -1172,9 +1172,9 @@ bool8 MetatileBehavior_IsClosedSootopolisDoor(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_IsUnknownClosedDoor(u8 metatileBehavior)
bool8 MetatileBehavior_IsSkyPillarClosedDoor(u8 metatileBehavior)
{
if (metatileBehavior == MB_UNKNOWN_CLOSED_DOOR)
if (metatileBehavior == MB_SKY_PILLAR_CLOSED_DOOR)
return TRUE;
else
return FALSE;