From 4bbe3278d62f06d5fbb260ff584ca131def8a1d0 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 17 Jun 2023 23:22:19 -0400 Subject: [PATCH] Cleanup pt1 - Moved Tracks to the end of field effect scripts - Restored whitespace in scripts to minimize conflicts - Restored data/maps/map_groups.json - Proper tab uses in scripts - Allow SHADOW_SIZE_XL to be used --- data/field_effect_scripts.s | 24 +++++++++---------- data/maps/AncientTomb/scripts.inc | 1 + data/maps/DesertRuins/scripts.inc | 1 + data/maps/MossdeepCity_Gym/scripts.inc | 4 ++-- .../scripts.inc | 1 + data/maps/SootopolisCity/scripts.inc | 2 +- data/maps/map_groups.json | 1 - data/scripts/battle_pike.inc | 6 ++--- data/scripts/flash.inc | 2 +- include/constants/event_objects.h | 3 +-- src/field_effect_helpers.c | 4 ++-- 11 files changed, 25 insertions(+), 24 deletions(-) diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index c1890358d5..707125f206 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -132,14 +132,6 @@ gFieldEffectScript_SandFootprints:: field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints field_eff_end -gFieldEffectScript_TracksBug:: - field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksBug - field_eff_end - -gFieldEffectScript_TracksSpot:: - field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSpot - field_eff_end - gFieldEffectScript_JumpBigSplash:: field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash field_eff_end @@ -229,10 +221,6 @@ gFieldEffectScript_BikeTireTracks:: field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks field_eff_end -gFieldEffectScript_TracksSlither:: - field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSlither - field_eff_end - gFieldEffectScript_SandDisguisePlaceholder:: field_eff_callnative ShowSandDisguiseFieldEffect field_eff_end @@ -358,3 +346,15 @@ gFieldEffectScript_DestroyDeoxysRock:: gFieldEffectScript_MoveDeoxysRock:: field_eff_callnative FldEff_MoveDeoxysRock field_eff_end + +gFieldEffectScript_TracksBug:: + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksBug + field_eff_end + +gFieldEffectScript_TracksSpot:: + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSpot + field_eff_end + +gFieldEffectScript_TracksSlither:: + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSlither + field_eff_end diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 82241b9b9c..dd22359558 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -83,3 +83,4 @@ AncientTomb_EventScript_RanFromRegisteel:: setvar VAR_0x8004, SPECIES_REGISTEEL goto Common_EventScript_LegendaryFlewAway end + diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 031ceb382e..21473e87a3 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -83,3 +83,4 @@ DesertRuins_EventScript_RanFromRegirock:: setvar VAR_0x8004, SPECIES_REGIROCK goto Common_EventScript_LegendaryFlewAway end + diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 70bc10f5a1..74d87c699a 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_Gym_MapScripts:: - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_Gym_OnTransition + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_Gym_OnTransition map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_OnLoad .byte 0 @@ -7,7 +7,7 @@ MossdeepCity_Gym_MapScripts:: MossdeepCity_Gym_OnTransition: setflag FLAG_TEMP_HIDE_FOLLOWER @ Hide follower since it can collide with moving statues - end + end @ All the below checks are leftover from RS. FLAG_MOSSDEEP_GYM_SWITCH_X is never set MossdeepCity_Gym_OnLoad: diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index e13f56f749..3565b95809 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -438,3 +438,4 @@ SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica: .string "“S.S. ANNE\p" .string "“A replica of the luxury liner that\n" .string "circles the globe.”$" + diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index af6f68555c..4903ea5a12 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -495,7 +495,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: removeobject LOCALID_GROUDON removeobject LOCALID_KYOGRE addobject LOCALID_RAYQUAZA - hideobjectat LOCALID_RAYQUAZA, MAP_SOOTOPOLIS_CITY + hideobjectat LOCALID_RAYQUAZA, MAP_SOOTOPOLIS_CITY setvar VAR_0x8004, TRUE special Script_DoRayquazaScene waitstate diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index d0a6a8b55c..ebef431b30 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -1,5 +1,4 @@ { - "layouts_table_label": "gMapLayouts", "group_order": [ "gMapGroup_TownsAndRoutes", "gMapGroup_IndoorLittleroot", diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index e0a8c3feb1..3393f808d3 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -133,7 +133,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack:: lockall msgbox BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack, MSGBOX_DEFAULT closemessage - releaseall + releaseall end BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom:: @@ -147,7 +147,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack:: lockall msgbox BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack, MSGBOX_DEFAULT closemessage - releaseall + releaseall end BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @@ -216,7 +216,7 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack:: lockall msgbox BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack, MSGBOX_DEFAULT closemessage - releaseall + releaseall end BattleFrontier_BattlePike_EventScript_Retire:: diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc index 7444dcd5ea..5e8d7160a9 100644 --- a/data/scripts/flash.inc +++ b/data/scripts/flash.inc @@ -1,5 +1,5 @@ EventScript_UseFlash:: animateflash 1 setflashlevel 1 - releaseall + releaseall end diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 44767675ec..6821d53451 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -289,8 +289,7 @@ #define SHADOW_SIZE_S 0 #define SHADOW_SIZE_M 1 #define SHADOW_SIZE_L 2 -#define SHADOW_SIZE_XL 3 // unused; repurposed to mean no shadow -#define SHADOW_SIZE_NONE 3 +#define SHADOW_NONE 3 // Originally SHADOW_SIZE_XL, which went unused due to shadowSize in ObjectEventGraphicsInfo being only 2 bits. #define F_INANIMATE (1 << 6) #define F_DISABLE_REFLECTION_PALETTE_LOAD (1 << 7) diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 968cc3c789..482fe0b475 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -320,8 +320,8 @@ u32 FldEff_Shadow(void) } objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); - if (graphicsInfo->shadowSize == SHADOW_SIZE_NONE) // don't create a shadow at all - return 0; + if (graphicsInfo->shadowSize == SHADOW_NONE) // don't create a shadow at all + return 0; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[sShadowEffectTemplateIds[graphicsInfo->shadowSize]], 0, 0, 0x94); if (spriteId != MAX_SPRITES) {