summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/field_effect_scripts.s244
-rw-r--r--data/io_reg.s37
-rw-r--r--data/maps/BirthIsland_Exterior/scripts.inc4
-rw-r--r--data/maps/TrainerHill_Entrance/scripts.inc4
-rw-r--r--data/scripts/field_move_scripts.inc15
-rw-r--r--data/scripts/flash.inc2
-rw-r--r--data/scripts/trainer_hill.inc4
7 files changed, 138 insertions, 172 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 4aef859d8..c57f19a04 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -5,73 +5,73 @@
.align 2
gFieldEffectScriptPointers:: @ 82DB9D4
- .4byte gFieldEffectScript_ExclamationMarkIcon1
- .4byte gFieldEffectScript_UseCutOnTallGrass
- .4byte gFieldEffectScript_UseCutOnTree
- .4byte gFieldEffectScript_Shadow
- .4byte gFieldEffectScript_TallGrass
- .4byte gFieldEffectScript_Ripple
- .4byte gFieldEffectScript_FieldMoveShowMon
- .4byte gFieldEffectScript_Ash
- .4byte gFieldEffectScript_SurfBlob
- .4byte gFieldEffectScript_UseSurf
- .4byte gFieldEffectScript_GroundImpactDust
- .4byte gFieldEffectScript_UseSecretPowerCave
- .4byte gFieldEffectScript_BikeHopTallGrass
- .4byte gFieldEffectScript_SandFootprints
- .4byte gFieldEffectScript_BikeHopBigSplash
- .4byte gFieldEffectScript_Splash
- .4byte gFieldEffectScript_BikeHopSmallSplash
- .4byte gFieldEffectScript_LongGrass
- .4byte gFieldEffectScript_JumpLongGrass
- .4byte gFieldEffectScript_Unknown19
- .4byte gFieldEffectScript_Unknown20
- .4byte gFieldEffectScript_Unknown21
- .4byte gFieldEffectScript_Unknown22
- .4byte gFieldEffectScript_BerryTreeGrowthSparkle
- .4byte gFieldEffectScript_DeepSandFootprints
- .4byte gFieldEffectScript_PokeCenterHeal
- .4byte gFieldEffectScript_UseSecretPowerTree
- .4byte gFieldEffectScript_UseSecretPowerShrub
- .4byte gFieldEffectScript_TreeDisguise
- .4byte gFieldEffectScript_MountainDisguise
- .4byte gFieldEffectScript_NPCUseFly
- .4byte gFieldEffectScript_UseFly
- .4byte gFieldEffectScript_FlyIn
- .4byte gFieldEffectScript_QuestionMarkIcon
- .4byte gFieldEffectScript_FeetInFlowingWater
- .4byte gFieldEffectScript_BikeTireTracks
- .4byte gFieldEffectScript_SandDisguisePlaceholder
- .4byte gFieldEffectScript_UseRockSmash
- .4byte gFieldEffectScript_UseDig
- .4byte gFieldEffectScript_SandPile
- .4byte gFieldEffectScript_UseStrength
- .4byte gFieldEffectScript_ShortGrass
- .4byte gFieldEffectScript_HotSpringsWater
- .4byte gFieldEffectScript_UseWaterfall
- .4byte gFieldEffectScript_UseDive
- .4byte gFieldEffectScript_Pokeball
- .4byte gFieldEffectScript_HeartIcon
- .4byte gFieldEffectScript_Unknown47
- .4byte gFieldEffectScript_Unknown48
- .4byte gFieldEffectScript_JumpOutOfAsh
- .4byte gFieldEffectScript_LavaridgeGymWarp
- .4byte gFieldEffectScript_SweetScent
- .4byte gFieldEffectScript_SandPillar
- .4byte gFieldEffectScript_Bubbles
- .4byte gFieldEffectScript_Sparkle
- .4byte gFieldEffectScript_ShowSecretPowerCave
- .4byte gFieldEffectScript_ShowSecretPowerTree
- .4byte gFieldEffectScript_ShowSecretPowerShrub
- .4byte gFieldEffectScript_ShowCutGrass
- .4byte gFieldEffectScript_FieldMoveShowMonInit
- .4byte gFieldEffectScript_UsePuzzleEffect
- .4byte gFieldEffectScript_SecretBaseBootPC
- .4byte gFieldEffectScript_HallOfFameRecord
- .4byte gFieldEffectScript_UseTeleport
- .4byte gFieldEffectScript_Rayquaza
- .4byte gFieldEffectScript_Unknown65
- .4byte gFieldEffectScript_MoveDeoxysRock
+ .4byte gFieldEffectScript_ExclamationMarkIcon1 @ FLDEFF_EXCLAMATION_MARK_ICON
+ .4byte gFieldEffectScript_UseCutOnTallGrass @ FLDEFF_USE_CUT_ON_GRASS
+ .4byte gFieldEffectScript_UseCutOnTree @ FLDEFF_USE_CUT_ON_TREE
+ .4byte gFieldEffectScript_Shadow @ FLDEFF_SHADOW
+ .4byte gFieldEffectScript_TallGrass @ FLDEFF_TALL_GRASS
+ .4byte gFieldEffectScript_Ripple @ FLDEFF_RIPPLE
+ .4byte gFieldEffectScript_FieldMoveShowMon @ FLDEFF_FIELD_MOVE_SHOW_MON
+ .4byte gFieldEffectScript_Ash @ FLDEFF_ASH
+ .4byte gFieldEffectScript_SurfBlob @ FLDEFF_SURF_BLOB
+ .4byte gFieldEffectScript_UseSurf @ FLDEFF_USE_SURF
+ .4byte gFieldEffectScript_GroundImpactDust @ FLDEFF_DUST
+ .4byte gFieldEffectScript_UseSecretPowerCave @ FLDEFF_USE_SECRET_POWER_CAVE
+ .4byte gFieldEffectScript_JumpTallGrass @ FLDEFF_JUMP_TALL_GRASS
+ .4byte gFieldEffectScript_SandFootprints @ FLDEFF_SAND_FOOTPRINTS
+ .4byte gFieldEffectScript_JumpBigSplash @ FLDEFF_JUMP_BIG_SPLASH
+ .4byte gFieldEffectScript_Splash @ FLDEFF_SPLASH
+ .4byte gFieldEffectScript_JumpSmallSplash @ FLDEFF_JUMP_SMALL_SPLASH
+ .4byte gFieldEffectScript_LongGrass @ FLDEFF_LONG_GRASS
+ .4byte gFieldEffectScript_JumpLongGrass @ FLDEFF_JUMP_LONG_GRASS
+ .4byte gFieldEffectScript_UnusedGrass @ FLDEFF_UNUSED_GRASS
+ .4byte gFieldEffectScript_UnusedGrass2 @ FLDEFF_UNUSED_GRASS_2
+ .4byte gFieldEffectScript_UnusedSand @ FLDEFF_UNUSED_SAND
+ .4byte gFieldEffectScript_WaterSurfacing @ FLDEFF_WATER_SURFACING
+ .4byte gFieldEffectScript_BerryTreeGrowthSparkle @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE
+ .4byte gFieldEffectScript_DeepSandFootprints @ FLDEFF_DEEP_SAND_FOOTPRINTS
+ .4byte gFieldEffectScript_PokeCenterHeal @ FLDEFF_POKECENTER_HEAL
+ .4byte gFieldEffectScript_UseSecretPowerTree @ FLDEFF_USE_SECRET_POWER_TREE
+ .4byte gFieldEffectScript_UseSecretPowerShrub @ FLDEFF_USE_SECRET_POWER_SHRUB
+ .4byte gFieldEffectScript_TreeDisguise @ FLDEFF_TREE_DISGUISE
+ .4byte gFieldEffectScript_MountainDisguise @ FLDEFF_MOUNTAIN_DISGUISE
+ .4byte gFieldEffectScript_NPCUseFly @ FLDEFF_NPCFLY_OUT
+ .4byte gFieldEffectScript_UseFly @ FLDEFF_USE_FLY
+ .4byte gFieldEffectScript_FlyIn @ FLDEFF_FLY_IN
+ .4byte gFieldEffectScript_QuestionMarkIcon @ FLDEFF_QUESTION_MARK_ICON
+ .4byte gFieldEffectScript_FeetInFlowingWater @ FLDEFF_FEET_IN_FLOWING_WATER
+ .4byte gFieldEffectScript_BikeTireTracks @ FLDEFF_BIKE_TIRE_TRACKS
+ .4byte gFieldEffectScript_SandDisguisePlaceholder @ FLDEFF_SAND_DISGUISE
+ .4byte gFieldEffectScript_UseRockSmash @ FLDEFF_USE_ROCK_SMASH
+ .4byte gFieldEffectScript_UseDig @ FLDEFF_USE_DIG
+ .4byte gFieldEffectScript_SandPile @ FLDEFF_SAND_PILE
+ .4byte gFieldEffectScript_UseStrength @ FLDEFF_USE_STRENGTH
+ .4byte gFieldEffectScript_ShortGrass @ FLDEFF_SHORT_GRASS
+ .4byte gFieldEffectScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER
+ .4byte gFieldEffectScript_UseWaterfall @ FLDEFF_USE_WATERFALL
+ .4byte gFieldEffectScript_UseDive @ FLDEFF_USE_DIVE
+ .4byte gFieldEffectScript_Pokeball @ FLDEFF_POKEBALL
+ .4byte gFieldEffectScript_HeartIcon @ FLDEFF_HEART_ICON
+ .4byte gFieldEffectScript_Nop47 @ FLDEFF_NOP_47
+ .4byte gFieldEffectScript_Nop48 @ FLDEFF_NOP_48
+ .4byte gFieldEffectScript_AshPuff @ FLDEFF_ASH_PUFF
+ .4byte gFieldEffectScript_AshLaunch @ FLDEFF_ASH_LAUNCH
+ .4byte gFieldEffectScript_SweetScent @ FLDEFF_SWEET_SCENT
+ .4byte gFieldEffectScript_SandPillar @ FLDEFF_SAND_PILLAR
+ .4byte gFieldEffectScript_Bubbles @ FLDEFF_BUBBLES
+ .4byte gFieldEffectScript_Sparkle @ FLDEFF_SPARKLE
+ .4byte gFieldEffectScript_ShowSecretPowerCave @ FLDEFF_SECRET_POWER_CAVE
+ .4byte gFieldEffectScript_ShowSecretPowerTree @ FLDEFF_SECRET_POWER_TREE
+ .4byte gFieldEffectScript_ShowSecretPowerShrub @ FLDEFF_SECRET_POWER_SHRUB
+ .4byte gFieldEffectScript_ShowCutGrass @ FLDEFF_CUT_GRASS
+ .4byte gFieldEffectScript_FieldMoveShowMonInit @ FLDEFF_FIELD_MOVE_SHOW_MON_INIT
+ .4byte gFieldEffectScript_UsePuzzleEffect @ FLDEFF_USE_TOMB_PUZZLE_EFFECT
+ .4byte gFieldEffectScript_SecretBaseBootPC @ FLDEFF_PCTURN_ON
+ .4byte gFieldEffectScript_HallOfFameRecord @ FLDEFF_HALL_OF_FAME_RECORD
+ .4byte gFieldEffectScript_UseTeleport @ FLDEFF_USE_TELEPORT
+ .4byte gFieldEffectScript_RayquazaSpotlight @ FLDEFF_RAYQUAZA_SPOTLIGHT
+ .4byte gFieldEffectScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK
+ .4byte gFieldEffectScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK
gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
field_eff_callnative FldEff_ExclamationMarkIcon
@@ -90,11 +90,11 @@ gFieldEffectScript_Shadow:: @ 82DBAF2
field_eff_end
gFieldEffectScript_TallGrass:: @ 82DBAF8
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_TallGrass
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_TallGrass
field_eff_end
gFieldEffectScript_Ripple:: @ 82DBB02
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ripple
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ripple
field_eff_end
gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
@@ -102,7 +102,7 @@ gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
field_eff_end
gFieldEffectScript_Ash:: @ 82DBB12
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ash
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ash
field_eff_end
gFieldEffectScript_SurfBlob:: @ 82DBB1C
@@ -114,55 +114,55 @@ gFieldEffectScript_UseSurf:: @ 82DBB22
field_eff_end
gFieldEffectScript_GroundImpactDust:: @ 82DBB28
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Dust
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Dust
field_eff_end
gFieldEffectScript_UseSecretPowerCave:: @ 82DBB32
field_eff_callnative FldEff_UseSecretPowerCave
field_eff_end
-gFieldEffectScript_BikeHopTallGrass:: @ 82DBB38
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpTallGrass
+gFieldEffectScript_JumpTallGrass:: @ 82DBB38
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpTallGrass
field_eff_end
gFieldEffectScript_SandFootprints:: @ 82DBB42
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandFootprints
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints
field_eff_end
-gFieldEffectScript_BikeHopBigSplash:: @ 82DBB4C
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpBigSplash
+gFieldEffectScript_JumpBigSplash:: @ 82DBB4C
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash
field_eff_end
gFieldEffectScript_Splash:: @ 82DBB56
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Splash
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Splash
field_eff_end
-gFieldEffectScript_BikeHopSmallSplash:: @ 82DBB60
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpSmallSplash
+gFieldEffectScript_JumpSmallSplash:: @ 82DBB60
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpSmallSplash
field_eff_end
gFieldEffectScript_LongGrass:: @ 82DBB6A
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_LongGrass
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_LongGrass
field_eff_end
gFieldEffectScript_JumpLongGrass:: @ 82DBB74
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpLongGrass
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass
field_eff_end
-gFieldEffectScript_Unknown19:: @ 82DBB7E
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown19
+gFieldEffectScript_UnusedGrass:: @ 82DBB7E
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass
field_eff_end
-gFieldEffectScript_Unknown20:: @ 82DBB88
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown20
+gFieldEffectScript_UnusedGrass2:: @ 82DBB88
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass2
field_eff_end
-gFieldEffectScript_Unknown21:: @ 82DBB92
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown21
+gFieldEffectScript_UnusedSand:: @ 82DBB92
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_UnusedSand
field_eff_end
-gFieldEffectScript_Unknown22:: @ 82DBB9C
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown22
+gFieldEffectScript_WaterSurfacing:: @ 82DBB9C
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_WaterSurfacing
field_eff_end
gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6
@@ -170,12 +170,12 @@ gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6
field_eff_end
gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_DeepSandFootprints
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_DeepSandFootprints
field_eff_end
gFieldEffectScript_PokeCenterHeal:: @ 82DBBB6
- field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_PokecenterHeal
+ field_eff_loadfadedpal gSpritePalette_PokeballGlow
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal
field_eff_end
gFieldEffectScript_UseSecretPowerTree:: @ 82DBBC5
@@ -211,11 +211,11 @@ gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
field_eff_end
gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_FeetInFlowingWater
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_FeetInFlowingWater
field_eff_end
gFieldEffectScript_BikeTireTracks:: @ 82DBBFF
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_BikeTireTracks
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks
field_eff_end
gFieldEffectScript_SandDisguisePlaceholder:: @ 82DBC09
@@ -227,7 +227,7 @@ gFieldEffectScript_UseRockSmash:: @ 82DBC0F
field_eff_end
gFieldEffectScript_UseStrength:: @ 82DBC15
- field_eff_callnative sub_8145E2C
+ field_eff_callnative FldEff_UseStrength
field_eff_end
gFieldEffectScript_UseDig:: @ 82DBC1B
@@ -235,15 +235,15 @@ gFieldEffectScript_UseDig:: @ 82DBC1B
field_eff_end
gFieldEffectScript_SandPile:: @ 82DBC21
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandPile
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandPile
field_eff_end
gFieldEffectScript_ShortGrass:: @ 82DBC2B
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_ShortGrass
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShortGrass
field_eff_end
gFieldEffectScript_HotSpringsWater:: @ 82DBC35
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_HotSpringsWater
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_HotSpringsWater
field_eff_end
gFieldEffectScript_UseWaterfall:: @ 82DBC3F
@@ -255,28 +255,28 @@ gFieldEffectScript_UseDive:: @ 82DBC45
field_eff_end
gFieldEffectScript_Pokeball:: @ 82DBC4B
- field_eff_loadpal gFieldEffectObjectPaletteInfo10
+ field_eff_loadpal gSpritePalette_Pokeball
field_eff_callnative FldEff_Pokeball
field_eff_end
gFieldEffectScript_HeartIcon:: @ 82DBC56
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_HeartIcon
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_HeartIcon
field_eff_end
-gFieldEffectScript_Unknown47:: @ 82DBC60
- field_eff_callnative FldEff_NopA6FC
+gFieldEffectScript_Nop47:: @ 82DBC60
+ field_eff_callnative FldEff_Nop47
field_eff_end
-gFieldEffectScript_Unknown48:: @ 82DBC66
- field_eff_callnative FldEff_NopA700
+gFieldEffectScript_Nop48:: @ 82DBC66
+ field_eff_callnative FldEff_Nop48
field_eff_end
-gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_PopOutOfAsh
+gFieldEffectScript_AshPuff:: @ 82DBC6C
+ field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshPuff
field_eff_end
-gFieldEffectScript_LavaridgeGymWarp:: @ 82DBC76
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_LavaridgeGymWarp
+gFieldEffectScript_AshLaunch:: @ 82DBC76
+ field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshLaunch
field_eff_end
gFieldEffectScript_SweetScent:: @ 82DBC80
@@ -284,31 +284,31 @@ gFieldEffectScript_SweetScent:: @ 82DBC80
field_eff_end
gFieldEffectScript_SandPillar:: @ 82DBC86
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar
+ field_eff_loadfadedpal_callnative gSpritePalette_SandPillar, FldEff_SandPillar
field_eff_end
gFieldEffectScript_Bubbles:: @ 82DBC90
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Bubbles
+ field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Bubbles
field_eff_end
gFieldEffectScript_Sparkle:: @ 82DBC9A
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, FldEff_Sparkle
+ field_eff_loadfadedpal_callnative gSpritePalette_SmallSparkle, FldEff_Sparkle
field_eff_end
gFieldEffectScript_ShowSecretPowerCave:: @ 82DBCA4
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave
+ field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Cave, FldEff_SecretPowerCave
field_eff_end
gFieldEffectScript_ShowSecretPowerTree:: @ 82DBCAE
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree
+ field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerTree
field_eff_end
gFieldEffectScript_ShowSecretPowerShrub:: @ 82DBCB8
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub
+ field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerShrub
field_eff_end
gFieldEffectScript_ShowCutGrass:: @ 82DBCC2
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass
+ field_eff_loadfadedpal_callnative gSpritePalette_CutGrass, FldEff_CutGrass
field_eff_end
gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
@@ -324,22 +324,22 @@ gFieldEffectScript_SecretBaseBootPC:: @ 82DBCD8
field_eff_end
gFieldEffectScript_HallOfFameRecord:: @ 82DBCDE
- field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, FldEff_HallOfFameRecord
+ field_eff_loadfadedpal gSpritePalette_PokeballGlow
+ field_eff_loadfadedpal_callnative gSpritePalette_HofMonitor, FldEff_HallOfFameRecord
field_eff_end
gFieldEffectScript_UseTeleport:: @ 82DBCED
field_eff_callnative FldEff_UseTeleport
field_eff_end
-gFieldEffectScript_Rayquaza:: @ 82DBCF3
- field_eff_callnative sub_80B8F98
+gFieldEffectScript_RayquazaSpotlight:: @ 82DBCF3
+ field_eff_callnative FldEff_RayquazaSpotlight
field_eff_end
-gFieldEffectScript_Unknown65:: @ 82DBCF9
- field_eff_callnative sub_80B9ADC
+gFieldEffectScript_DestroyDeoxysRock:: @ 82DBCF9
+ field_eff_callnative FldEff_DestroyDeoxysRock
field_eff_end
gFieldEffectScript_MoveDeoxysRock:: @ 82DBCFF
- field_eff_callnative Fldeff_MoveDeoxysRock
+ field_eff_callnative FldEff_MoveDeoxysRock
field_eff_end
diff --git a/data/io_reg.s b/data/io_reg.s
deleted file mode 100644
index 0941b4345..000000000
--- a/data/io_reg.s
+++ /dev/null
@@ -1,37 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-
-
-.align 2
-gUnref_82EC784:: @ 82EC784
- .4byte 0x00000000
- .4byte 0x00000000
- .4byte 0x04000008
- .4byte 0x0400000A
- .4byte 0x0400000C
- .4byte 0x0400000E
- .4byte 0x04000010
- .4byte 0x04000014
- .4byte 0x04000018
- .4byte 0x0400001C
- .4byte 0x04000012
- .4byte 0x04000016
- .4byte 0x0400001A
- .4byte 0x0400001E
- .4byte 0x02000100
- .4byte 0x08000400
-
-gOverworldBackgroundLayerFlags:: @ 82EC7C4
- .2byte BLDCNT_TGT2_BG0
- .2byte BLDCNT_TGT2_BG1
- .2byte BLDCNT_TGT2_BG2
- .2byte BLDCNT_TGT2_BG3
-
-gOrbEffectBackgroundLayerFlags:: @ 82EC7CC
- .2byte BLDCNT_TGT1_BG0
- .2byte BLDCNT_TGT1_BG1
- .2byte BLDCNT_TGT1_BG2
- .2byte BLDCNT_TGT1_BG3
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 6bc902426..5c06e6f3a 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -71,9 +71,9 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1
setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
setfieldeffectargument 1, 58
setfieldeffectargument 2, 26
- dofieldeffect FLDEFF_65
+ dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
playbgm MUS_RG_DEOEYE, 0
- waitfieldeffect FLDEFF_65
+ waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
addobject LOCALID_DEOXYS
applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
waitmovement 0
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 9cf3be806..077709053 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -23,8 +23,8 @@ TrainerHill_Entrance_OnWarp: @ 82680CF
TrainerHill_Entrance_OnResume: @ 82680D0
trainerhill_resumetimer
setvar VAR_TEMP_0, 0
- trainerhill_clearresult
- compare VAR_RESULT, 0 @ VAR_RESULT always 0 here
+ trainerhill_getusingereader
+ compare VAR_RESULT, FALSE @ VAR_RESULT always FALSE here
goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant
setobjectxy OBJ_EVENT_ID_PLAYER, 9, 6
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 56e3297b6..2d689348b 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -1,4 +1,4 @@
-
+@ Interact with cuttable tree
EventScript_CutTree:: @ 82906BB
lockall
goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
@@ -18,7 +18,8 @@ EventScript_CutTree:: @ 82906BB
goto EventScript_CutTreeDown
end
-EventScript_FldEffCut:: @ 8290705
+@ Use cut from party menu
+EventScript_UseCut:: @ 8290705
lockall
dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
@@ -58,6 +59,7 @@ Text_CantCut: @ 829077D
.string "This tree looks like it can be\n"
.string "CUT down!$"
+@ Interact with smashable rock
EventScript_RockSmash:: @ 82907A6
lockall
goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
@@ -77,7 +79,8 @@ EventScript_RockSmash:: @ 82907A6
goto EventScript_SmashRock
end
-EventScript_FldEffRockSmash:: @ 82907F0
+@ Use rock smash from party menu
+EventScript_UseRockSmash:: @ 82907F0
lockall
dofieldeffect FLDEFF_USE_ROCK_SMASH
waitstate
@@ -89,10 +92,10 @@ EventScript_SmashRock:: @ 82907FB
waitmovement 0
removeobject VAR_LAST_TALKED
specialvar VAR_RESULT, TryUpdateRusturfTunnelState
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_EndSmash
special RockSmashWildEncounter
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq EventScript_EndSmash
waitstate
releaseall
@@ -141,7 +144,7 @@ EventScript_StrengthBoulder:: @ 82908BA
goto EventScript_ActivateStrength
end
-EventScript_FldEffStrength:: @ 82908FD
+EventScript_UseStrength:: @ 82908FD
lockall
dofieldeffect FLDEFF_USE_STRENGTH
waitstate
diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc
index 916b50719..bb4ae84eb 100644
--- a/data/scripts/flash.inc
+++ b/data/scripts/flash.inc
@@ -1,4 +1,4 @@
-EventScript_FldEffFlash:: @ 82926F8
+EventScript_UseFlash:: @ 82926F8
animateflash 1
setflashradius 1
end
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index ca692e1ef..34d0462bb 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -32,8 +32,8 @@ EventScript_TrainerHillTimer:: @ 82C8393
TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6
setvar VAR_TEMP_2, 1
- trainerhill_clearresult
- compare VAR_RESULT, 1 @ VAR_RESULT always 0 here
+ trainerhill_getusingereader
+ compare VAR_RESULT, TRUE @ VAR_RESULT always FALSE here
goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 17:32:02 +0000