pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename scene and callback labels (#981)

Browse Source 
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
This commit is contained in:
vulcandth 2022-08-09 17:04:18 -05:00 committed by GitHub
parent 134f45b71d
commit c3331eb7b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
137 changed files with 650 additions and 647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/event_flags.asm
View File

@ -1455,7 +1455,7 @@
const EVENT_MOUNT_MORTAR_B1F_PP_UP
const EVENT_RADIO_TOWER_5F_ULTRA_BALL
const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
const EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
const EVENT_BATTLE_TOWER_OPEN_CIVILIANS
; Unused: next 48 events
const_next 2048

8
docs/map_event_scripts.md
View File

@ -41,7 +41,7 @@
<pre>
def_scene_scripts
scene_script <i>script</i>
scene_script <i>script</i>, SCENE_<i>MAPNAME</i>_<i>SCENE_NAME</i>
</pre>
@ -65,9 +65,9 @@
- `MAPCALLBACK_CMDQUEUE`
<pre>
callback MAPCALLBACK_CMDQUEUE, .Boulders
callback MAPCALLBACK_CMDQUEUE, <i>MapName</i>BouldersCallback
.Boulders:
<i>MapName</i>BouldersCallback:
writecmdqueue .BoulderCmdQueue
endcallback
@ -214,7 +214,7 @@
<i>MapName</i>_MapScripts:
def_scene_scripts
; scene_script <i>script</i>
; scene_script <i>script</i>, SCENE_<i>MAPNAME</i>_<i>SCENE_NAME</i>
def_callbacks
; callback <i>type</i>, <i>script</i>

2
engine/events/std_scripts.asm
View File

@ -590,7 +590,7 @@ InitializeEventsScript:
setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
setevent EVENT_BATTLE_TOWER_OPEN_CIVILIANS
setflag ENGINE_ROCKET_SIGNAL_ON_CH20
setflag ENGINE_ROCKETS_IN_MAHOGANY
variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO

4
maps/AzaleaPokecenter1F.asm
View File

@ -6,11 +6,11 @@
AzaleaPokecenter1F_MapScripts:
def_scene_scripts
scene_script .DummyScene ; unusable
scene_script AzaleaPokecenter1FNoopScene ; unusable
def_callbacks
.DummyScene:
AzaleaPokecenter1FNoopScene:
end
AzaleaPokecenter1FNurseScript:

16
maps/AzaleaTown.asm
View File

@ -14,23 +14,23 @@
AzaleaTown_MapScripts:
def_scene_scripts
scene_script .DummyScene0, SCENE_AZALEATOWN_NOOP
scene_script .DummyScene1, SCENE_AZALEATOWN_RIVAL_BATTLE
scene_script .DummyScene2, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
scene_script AzaleaTownNoop1Scene, SCENE_AZALEATOWN_NOOP
scene_script AzaleaTownNoop2Scene, SCENE_AZALEATOWN_RIVAL_BATTLE
scene_script AzaleaTownNoop3Scene, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
def_callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint
callback MAPCALLBACK_NEWMAP, AzaleaTownFlypointCallback
.DummyScene0:
AzaleaTownNoop1Scene:
end
.DummyScene1:
AzaleaTownNoop2Scene:
end
.DummyScene2:
AzaleaTownNoop3Scene:
end
.Flypoint:
AzaleaTownFlypointCallback:
setflag ENGINE_FLYPOINT_AZALEA
endcallback

9
maps/BattleTower1F.asm
View File

@ -7,12 +7,12 @@
BattleTower1F_MapScripts:
def_scene_scripts
scene_script .Scene0, SCENE_BATTLETOWER1F_CHECKSTATE
scene_script .Scene1, SCENE_BATTLETOWER1F_NOOP
scene_script BattleTower1FCheckStateScene, SCENE_BATTLETOWER1F_CHECKSTATE
scene_script BattleTower1FNoopScene, SCENE_BATTLETOWER1F_NOOP
def_callbacks
.Scene0:
BattleTower1FCheckStateScene:
setval BATTLETOWERACTION_CHECKSAVEFILEISYOURS
special BattleTowerAction
iffalse .SkipEverything
@ -37,7 +37,8 @@ BattleTower1F_MapScripts:
special BattleTowerAction
.SkipEverything:
setscene SCENE_BATTLETOWER1F_NOOP
.Scene1:
; fallthrough
BattleTower1FNoopScene:
end
BattleTower1FRulesSign:

9
maps/BattleTowerBattleRoom.asm
View File

@ -4,16 +4,17 @@
BattleTowerBattleRoom_MapScripts:
def_scene_scripts
scene_script .EnterBattleRoom, SCENE_BATTLETOWERBATTLEROOM_ENTER
scene_script .DummyScene, SCENE_BATTLETOWERBATTLEROOM_NOOP
scene_script BattleTowerBattleRoomEnterScene, SCENE_BATTLETOWERBATTLEROOM_ENTER
scene_script BattleTowerBattleRoomNoopScene, SCENE_BATTLETOWERBATTLEROOM_NOOP
def_callbacks
.EnterBattleRoom:
BattleTowerBattleRoomEnterScene:
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
sdefer Script_BattleRoom
setscene SCENE_BATTLETOWERBATTLEROOM_NOOP
.DummyScene:
; fallthrough
BattleTowerBattleRoomNoopScene:
end
Script_BattleRoom:

13
maps/BattleTowerElevator.asm
View File

@ -3,18 +3,19 @@
BattleTowerElevator_MapScripts:
def_scene_scripts
scene_script .Scene0, SCENE_BATTLETOWERELEVATOR_ENTER
scene_script .Scene1, SCENE_BATTLETOWERELEVATOR_NOOP
scene_script BattleTowerElevatorEnterScene, SCENE_BATTLETOWERELEVATOR_ENTER
scene_script BattleTowerElevatorNoopScene, SCENE_BATTLETOWERELEVATOR_NOOP
def_callbacks
.Scene0:
sdefer .RideElevator
BattleTowerElevatorEnterScene:
sdefer BattleTowerElevatorRideElevatorScript
setscene SCENE_BATTLETOWERELEVATOR_NOOP
.Scene1:
; fallthrough
BattleTowerElevatorNoopScene:
end
.RideElevator:
BattleTowerElevatorRideElevatorScript:
follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER
applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn

13
maps/BattleTowerHallway.asm
View File

@ -3,18 +3,19 @@
BattleTowerHallway_MapScripts:
def_scene_scripts
scene_script .Scene0, SCENE_BATTLETOWERHALLWAY_ENTER
scene_script .Scene1, SCENE_BATTLETOWERHALLWAY_NOOP
scene_script BattleTowerHallwayEnterScene, SCENE_BATTLETOWERHALLWAY_ENTER
scene_script BattleTowerHallwayNoopScene, SCENE_BATTLETOWERHALLWAY_NOOP
def_callbacks
.Scene0:
sdefer .ChooseBattleRoom
BattleTowerHallwayEnterScene:
sdefer BattleTowerHallwayChooseBattleRoomScript
setscene SCENE_BATTLETOWERHALLWAY_NOOP
.Scene1:
; fallthrough
BattleTowerHallwayNoopScene:
end
.ChooseBattleRoom:
BattleTowerHallwayChooseBattleRoomScript:
follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER
callasm .asm_load_battle_room
sjump .WalkToChosenBattleRoom

12
maps/BattleTowerOutside.asm
View File

@ -8,14 +8,14 @@ BattleTowerOutside_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_TILES, .Callback1
callback MAPCALLBACK_OBJECTS, .Callback2
callback MAPCALLBACK_TILES, BattleTowerOutsideNoopCallback
callback MAPCALLBACK_OBJECTS, BattleTowerOutsideShowCiviliansCallback
.Callback1:
BattleTowerOutsideNoopCallback:
endcallback
.Callback2:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
BattleTowerOutsideShowCiviliansCallback:
clearevent EVENT_BATTLE_TOWER_OPEN_CIVILIANS
endcallback
BattleTowerOutsideYoungsterScript:
@ -144,5 +144,5 @@ BattleTowerOutside_MapEvents:
def_object_events
object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
object_event 13, 11, SPRITE_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -1
object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OPEN_CIVILIANS
object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1

8
maps/BlackthornCity.asm
View File

@ -13,14 +13,14 @@ BlackthornCity_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_OBJECTS, .Santos
callback MAPCALLBACK_NEWMAP, BlackthornCityFlypointCallback
callback MAPCALLBACK_OBJECTS, BlackthornCitySantosCallback
.FlyPoint:
BlackthornCityFlypointCallback:
setflag ENGINE_FLYPOINT_BLACKTHORN
endcallback
.Santos:
BlackthornCitySantosCallback:
readvar VAR_WEEKDAY
ifequal SATURDAY, .SantosAppears
disappear BLACKTHORNCITY_SANTOS

4
maps/BlackthornGym1F.asm
View File

@ -9,9 +9,9 @@ BlackthornGym1F_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_TILES, .Boulders
callback MAPCALLBACK_TILES, BlackthornGym1FBouldersCallback
.Boulders:
BlackthornGym1FBouldersCallback:
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1
iffalse .skip1
changeblock 8, 2, $3b ; fallen boulder 2

4
maps/BlackthornGym2F.asm
View File

@ -12,9 +12,9 @@ BlackthornGym2F_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
callback MAPCALLBACK_CMDQUEUE, BlackthornGym2FSetUpStoneTableCallback
.SetUpStoneTable:
BlackthornGym2FSetUpStoneTableCallback:
writecmdqueue .CommandQueue
endcallback

16
maps/BrunosRoom.asm
View File

@ -3,20 +3,20 @@
BrunosRoom_MapScripts:
def_scene_scripts
scene_script .LockDoor, SCENE_BRUNOSROOM_LOCK_DOOR
scene_script .DummyScene, SCENE_BRUNOSROOM_NOOP
scene_script BrunosRoomLockDoorScene, SCENE_BRUNOSROOM_LOCK_DOOR
scene_script BrunosRoomNoopScene, SCENE_BRUNOSROOM_NOOP
def_callbacks
callback MAPCALLBACK_TILES, .BrunosRoomDoors
callback MAPCALLBACK_TILES, BrunosRoomDoorsCallback
.LockDoor:
sdefer .BrunosDoorLocksBehindYou
BrunosRoomLockDoorScene:
sdefer BrunosRoomDoorLocksBehindYouScript
end
.DummyScene:
BrunosRoomNoopScene:
end
.BrunosRoomDoors:
BrunosRoomDoorsCallback:
checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
iffalse .KeepEntranceOpen
changeblock 4, 14, $2a ; wall
@ -27,7 +27,7 @@ BrunosRoom_MapScripts:
.KeepExitClosed:
endcallback
.BrunosDoorLocksBehindYou:
BrunosRoomDoorLocksBehindYouScript:
applymovement PLAYER, BrunosRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH

20
maps/BurnedTower1F.asm
View File

@ -7,24 +7,24 @@
BurnedTower1F_MapScripts:
def_scene_scripts
scene_script .EusineScene, SCENE_BURNEDTOWER1F_MEET_EUSINE
scene_script .DummyScene1, SCENE_BURNEDTOWER1F_RIVAL_BATTLE
scene_script .DummyScene2, SCENE_BURNEDTOWER1F_NOOP
scene_script BurnedTower1FMeetEusineScene, SCENE_BURNEDTOWER1F_MEET_EUSINE
scene_script BurnedTower1FNoop1Scene, SCENE_BURNEDTOWER1F_RIVAL_BATTLE
scene_script BurnedTower1FNoop2Scene, SCENE_BURNEDTOWER1F_NOOP
def_callbacks
callback MAPCALLBACK_TILES, .HoleAndLadder
callback MAPCALLBACK_TILES, BurnedTower1FHoleAndLadderCallback
.EusineScene:
sdefer .MeetEusine
BurnedTower1FMeetEusineScene:
sdefer BurnedTower1FMeetEusineScript
end
.DummyScene1:
BurnedTower1FNoop1Scene:
end
.DummyScene2:
BurnedTower1FNoop2Scene:
end
.HoleAndLadder:
BurnedTower1FHoleAndLadderCallback:
checkevent EVENT_HOLE_IN_BURNED_TOWER
iftrue .KeepHoleOpen
changeblock 10, 8, $32 ; floor
@ -35,7 +35,7 @@ BurnedTower1F_MapScripts:
.HideBasement:
endcallback
.MeetEusine:
BurnedTower1FMeetEusineScript:
turnobject BURNEDTOWER1F_EUSINE, DOWN
showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement

12
maps/BurnedTowerB1F.asm
View File

@ -11,19 +11,19 @@
BurnedTowerB1F_MapScripts:
def_scene_scripts
scene_script .DummyScene0, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS
scene_script .DummyScene1, SCENE_BURNEDTOWERB1F_NOOP
scene_script BurnedTowerB1FNoop1Scene, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS
scene_script BurnedTowerB1FNoop2Scene, SCENE_BURNEDTOWERB1F_NOOP
def_callbacks
callback MAPCALLBACK_TILES, .LadderCallback
callback MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback
.DummyScene0:
BurnedTowerB1FNoop1Scene:
end
.DummyScene1:
BurnedTowerB1FNoop2Scene:
end
.LadderCallback:
BurnedTowerB1FLadderCallback:
checkevent EVENT_RELEASED_THE_BEASTS
iftrue .HideLadder
changeblock 6, 14, $02 ; floor

4
maps/CeladonCity.asm
View File

@ -13,9 +13,9 @@ CeladonCity_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, CeladonCityFlypointCallback
.FlyPoint:
CeladonCityFlypointCallback:
setflag ENGINE_FLYPOINT_CELADON
endcallback

4
maps/CeladonDeptStore6F.asm
View File

@ -10,9 +10,9 @@ CeladonDeptStore6F_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_TILES, .HideRooftopStairs
callback MAPCALLBACK_TILES, CeladonDeptStore6FHideRooftopStairsCallback
.HideRooftopStairs:
CeladonDeptStore6FHideRooftopStairsCallback:
changeblock 12, 0, $03 ; wall
endcallback

4
maps/CeruleanCity.asm
View File

@ -10,9 +10,9 @@ CeruleanCity_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_NEWMAP, CeruleanCityFlypointCallback
.FlyPoint:
CeruleanCityFlypointCallback:
setflag ENGINE_FLYPOINT_CERULEAN
endcallback

12
maps/CeruleanGym.asm
View File

@ -8,19 +8,19 @@
CeruleanGym_MapScripts:
def_scene_scripts
scene_script .DummyScene0, SCENE_CERULEANGYM_NOOP
scene_script .GruntRunsOut, SCENE_CERULEANGYM_GRUNT_RUNS_OUT
scene_script CeruleanGymNoopScene, SCENE_CERULEANGYM_NOOP
scene_script CeruleanGymGruntRunsOutScene, SCENE_CERULEANGYM_GRUNT_RUNS_OUT
def_callbacks
.DummyScene0:
CeruleanGymNoopScene:
end
.GruntRunsOut:
sdefer .GruntRunsOutScript
CeruleanGymGruntRunsOutScene:
sdefer CeruleanGymGruntRunsOutScript
end
.GruntRunsOutScript:
CeruleanGymGruntRunsOutScript:
applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsDownMovement
playsound SFX_TACKLE
applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsIntoYouMovement

Some files were not shown because too many files have changed in this diff Show More