mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
Merge pull request #1085 from GriffinRichards/doc-overworld
Document field effects / misc overworld
This commit is contained in:
GriffinR
GitHub
commit
7ada56f039
@ -52,9 +52,9 @@
|
||||
special CallTrainerHillFunction
|
||||
.endm
|
||||
|
||||
@ Unknown, dummied. Only side effect is setting VAR_RESULT to 0.
|
||||
.macro trainerhill_clearresult
|
||||
setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
|
||||
@ Unknown, dummied. E-Reader association is assumed. Only side effect is setting VAR_RESULT to 0.
|
||||
.macro trainerhill_getusingereader
|
||||
setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_IN_EREADER_MODE
|
||||
special CallTrainerHillFunction
|
||||
.endm
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
EventScript_FldEffFlash:: @ 82926F8
|
||||
EventScript_UseFlash:: @ 82926F8
|
||||
animateflash 1
|
||||
setflashradius 1
|
||||
end
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
36
gflib/io_reg.c
Normal file
36
gflib/io_reg.c
Normal file
@ -0,0 +1,36 @@
|
||||
#include "global.h"
|
||||
#include "io_reg.h"
|
||||
#include "gba/io_reg.h"
|
||||
|
||||
static const u32 sUnused[] = {
|
||||
0,
|
||||
0,
|
||||
(1 << 26) | (1 << 3),
|
||||
(1 << 26) | (1 << 3) | (1 << 1),
|
||||
(1 << 26) | (1 << 3) | (1 << 2),
|
||||
(1 << 26) | (1 << 3) | (1 << 2) | (1 << 1),
|
||||
(1 << 26) | (1 << 4),
|
||||
(1 << 26) | (1 << 4) | (1 << 2),
|
||||
(1 << 26) | (1 << 4) | (1 << 3),
|
||||
(1 << 26) | (1 << 4) | (1 << 3) | (1 << 2),
|
||||
(1 << 26) | (1 << 4) | (1 << 1),
|
||||
(1 << 26) | (1 << 4) | (1 << 2) | (1 << 1),
|
||||
(1 << 26) | (1 << 4) | (1 << 3) | (1 << 1),
|
||||
(1 << 26) | (1 << 4) | (1 << 3) | (1 << 2) | (1 << 1),
|
||||
(1 << 25) | (1 << 8),
|
||||
(1 << 27) | (1 << 10),
|
||||
};
|
||||
|
||||
const u16 gOverworldBackgroundLayerFlags[] = {
|
||||
BLDCNT_TGT2_BG0,
|
||||
BLDCNT_TGT2_BG1,
|
||||
BLDCNT_TGT2_BG2,
|
||||
BLDCNT_TGT2_BG3,
|
||||
};
|
||||
|
||||
const u16 gOrbEffectBackgroundLayerFlags[] = {
|
||||
BLDCNT_TGT1_BG0,
|
||||
BLDCNT_TGT1_BG1,
|
||||
BLDCNT_TGT1_BG2,
|
||||
BLDCNT_TGT1_BG3,
|
||||
};
|
||||
7
gflib/io_reg.h
Normal file
7
gflib/io_reg.h
Normal file
@ -0,0 +1,7 @@
|
||||
#ifndef GUARD_IO_REG_H
|
||||
#define GUARD_IO_REG_H
|
||||
|
||||
extern const u16 gOverworldBackgroundLayerFlags[];
|
||||
extern const u16 gOrbEffectBackgroundLayerFlags[];
|
||||
|
||||
#endif // GUARD_IO_REG_H
|
||||
|
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 406 B |
|
Before Width: | Height: | Size: 346 B After Width: | Height: | Size: 346 B |
|
Before Width: | Height: | Size: 273 B After Width: | Height: | Size: 273 B |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |
|
Before Width: | Height: | Size: 205 B After Width: | Height: | Size: 205 B |
BIN
graphics/field_effects/pics/record_mix_lights.png
Normal file
BIN
graphics/field_effects/pics/record_mix_lights.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 199 B |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |
|
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
|
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 255 B |
|
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 256 B |
BIN
graphics/field_effects/pics/secret_power_cave.png
Normal file
BIN
graphics/field_effects/pics/secret_power_cave.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 356 B |
BIN
graphics/field_effects/pics/secret_power_shrub.png
Normal file
BIN
graphics/field_effects/pics/secret_power_shrub.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 270 B |
BIN
graphics/field_effects/pics/secret_power_tree.png
Normal file
BIN
graphics/field_effects/pics/secret_power_tree.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 304 B |
|
Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 174 B |
|
Before Width: | Height: | Size: 205 B After Width: | Height: | Size: 205 B |
|
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 344 B |
|
Before Width: | Height: | Size: 389 B After Width: | Height: | Size: 389 B |
|
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
|
Before Width: | Height: | Size: 319 B After Width: | Height: | Size: 319 B |
|
Before Width: | Height: | Size: 100 B After Width: | Height: | Size: 100 B |
|
Before Width: | Height: | Size: 91 B After Width: | Height: | Size: 91 B |
|
Before Width: | Height: | Size: 99 B After Width: | Height: | Size: 99 B |
|
Before Width: | Height: | Size: 102 B After Width: | Height: | Size: 102 B |
|
Before Width: | Height: | Size: 184 B After Width: | Height: | Size: 184 B |
|
Before Width: | Height: | Size: 177 B After Width: | Height: | Size: 177 B |
Binary file not shown.
|
Before Width: | Height: | Size: 145 B |
Binary file not shown.
|
Before Width: | Height: | Size: 149 B |
Binary file not shown.
|
Before Width: | Height: | Size: 138 B |
Binary file not shown.
|
Before Width: | Height: | Size: 133 B |
Binary file not shown.
|
Before Width: | Height: | Size: 114 B |
Binary file not shown.
|
Before Width: | Height: | Size: 89 B |
Binary file not shown.
|
Before Width: | Height: | Size: 109 B |
Binary file not shown.
|
Before Width: | Height: | Size: 119 B |
Binary file not shown.
|
Before Width: | Height: | Size: 123 B |
Binary file not shown.
|
Before Width: | Height: | Size: 129 B |
Binary file not shown.
|
Before Width: | Height: | Size: 126 B |
Binary file not shown.
|
Before Width: | Height: | Size: 87 B |
Binary file not shown.
|
Before Width: | Height: | Size: 116 B |
Binary file not shown.
|
Before Width: | Height: | Size: 131 B |
Binary file not shown.
|
Before Width: | Height: | Size: 115 B |
Binary file not shown.
|
Before Width: | Height: | Size: 92 B |
Binary file not shown.
|
Before Width: | Height: | Size: 103 B |
Binary file not shown.
|
Before Width: | Height: | Size: 107 B |
Binary file not shown.
|
Before Width: | Height: | Size: 107 B |
@ -9,7 +9,7 @@ bool8 FldEff_Pokeball(void);
|
||||
void TransitionPhase1_Task_RunFuncs(u8 taskId);
|
||||
void GetBg0TilesDst(u16 **tilemap, u16 **tileset);
|
||||
|
||||
extern const struct SpritePalette gFieldEffectObjectPaletteInfo10;
|
||||
extern const struct SpritePalette gSpritePalette_Pokeball;
|
||||
|
||||
enum // TRANSITION_MUGSHOT
|
||||
{
|
||||
|
||||
@ -20,10 +20,10 @@
|
||||
#define FLDEFF_JUMP_SMALL_SPLASH 16
|
||||
#define FLDEFF_LONG_GRASS 17
|
||||
#define FLDEFF_JUMP_LONG_GRASS 18
|
||||
#define FLDEFF_UNKNOWN_19 19
|
||||
#define FLDEFF_UNKNOWN_20 20
|
||||
#define FLDEFF_UNKNOWN_21 21
|
||||
#define FLDEFF_UNKNOWN_22 22
|
||||
#define FLDEFF_UNUSED_GRASS 19
|
||||
#define FLDEFF_UNUSED_GRASS_2 20
|
||||
#define FLDEFF_UNUSED_SAND 21
|
||||
#define FLDEFF_WATER_SURFACING 22
|
||||
#define FLDEFF_BERRY_TREE_GROWTH_SPARKLE 23
|
||||
#define FLDEFF_DEEP_SAND_FOOTPRINTS 24
|
||||
#define FLDEFF_POKECENTER_HEAL 25
|
||||
@ -50,8 +50,8 @@
|
||||
#define FLDEFF_HEART_ICON 46
|
||||
#define FLDEFF_NOP_47 47
|
||||
#define FLDEFF_NOP_48 48
|
||||
#define FLDEFF_POP_OUT_OF_ASH 49
|
||||
#define FLDEFF_LAVARIDGE_GYM_WARP 50
|
||||
#define FLDEFF_ASH_PUFF 49
|
||||
#define FLDEFF_ASH_LAUNCH 50
|
||||
#define FLDEFF_SWEET_SCENT 51
|
||||
#define FLDEFF_SAND_PILLAR 52
|
||||
#define FLDEFF_BUBBLES 53
|
||||
@ -65,8 +65,59 @@
|
||||
#define FLDEFF_PCTURN_ON 61
|
||||
#define FLDEFF_HALL_OF_FAME_RECORD 62
|
||||
#define FLDEFF_USE_TELEPORT 63
|
||||
#define FLDEFF_RAYQUAZA 64
|
||||
#define FLDEFF_65 65
|
||||
#define FLDEFF_RAYQUAZA_SPOTLIGHT 64
|
||||
#define FLDEFF_DESTROY_DEOXYS_ROCK 65
|
||||
#define FLDEFF_MOVE_DEOXYS_ROCK 66
|
||||
|
||||
#endif
|
||||
#define FLDEFFOBJ_SHADOW_S 0
|
||||
#define FLDEFFOBJ_SHADOW_M 1
|
||||
#define FLDEFFOBJ_SHADOW_L 2
|
||||
#define FLDEFFOBJ_SHADOW_XL 3
|
||||
#define FLDEFFOBJ_TALL_GRASS 4
|
||||
#define FLDEFFOBJ_RIPPLE 5
|
||||
#define FLDEFFOBJ_ASH 6
|
||||
#define FLDEFFOBJ_SURF_BLOB 7
|
||||
#define FLDEFFOBJ_ARROW 8
|
||||
#define FLDEFFOBJ_GROUND_IMPACT_DUST 9
|
||||
#define FLDEFFOBJ_JUMP_TALL_GRASS 10
|
||||
#define FLDEFFOBJ_SAND_FOOTPRINTS 11
|
||||
#define FLDEFFOBJ_JUMP_BIG_SPLASH 12
|
||||
#define FLDEFFOBJ_SPLASH 13
|
||||
#define FLDEFFOBJ_JUMP_SMALL_SPLASH 14
|
||||
#define FLDEFFOBJ_LONG_GRASS 15
|
||||
#define FLDEFFOBJ_JUMP_LONG_GRASS 16
|
||||
#define FLDEFFOBJ_UNUSED_GRASS 17
|
||||
#define FLDEFFOBJ_UNUSED_GRASS_2 18
|
||||
#define FLDEFFOBJ_UNUSED_SAND 19
|
||||
#define FLDEFFOBJ_WATER_SURFACING 20
|
||||
#define FLDEFFOBJ_REFLECTION_DISTORTION 21
|
||||
#define FLDEFFOBJ_SPARKLE 22
|
||||
#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS 23
|
||||
#define FLDEFFOBJ_TREE_DISGUISE 24
|
||||
#define FLDEFFOBJ_MOUNTAIN_DISGUISE 25
|
||||
#define FLDEFFOBJ_BIRD 26
|
||||
#define FLDEFFOBJ_BIKE_TIRE_TRACKS 27
|
||||
#define FLDEFFOBJ_SAND_DISGUISE 28
|
||||
#define FLDEFFOBJ_SAND_PILE 29
|
||||
#define FLDEFFOBJ_SHORT_GRASS 30
|
||||
#define FLDEFFOBJ_HOT_SPRINGS_WATER 31
|
||||
#define FLDEFFOBJ_ASH_PUFF 32
|
||||
#define FLDEFFOBJ_ASH_LAUNCH 33
|
||||
#define FLDEFFOBJ_BUBBLES 34
|
||||
#define FLDEFFOBJ_SMALL_SPARKLE 35
|
||||
#define FLDEFFOBJ_RAYQUAZA 36
|
||||
|
||||
#define FLDEFF_PAL_TAG_CUT_GRASS 0x1000
|
||||
#define FLDEFF_PAL_TAG_SECRET_POWER_TREE 0x1003
|
||||
#define FLDEFF_PAL_TAG_GENERAL_0 0x1004
|
||||
#define FLDEFF_PAL_TAG_GENERAL_1 0x1005
|
||||
#define FLDEFF_PAL_TAG_POKEBALL_GLOW 0x1007
|
||||
#define FLDEFF_PAL_TAG_SECRET_POWER_PLANT 0x1008
|
||||
#define FLDEFF_PAL_TAG_POKEBALL 0x1009
|
||||
#define FLDEFF_PAL_TAG_ASH 0x100D
|
||||
#define FLDEFF_PAL_TAG_SAND_PILLAR 0x100E
|
||||
#define FLDEFF_PAL_TAG_SMALL_SPARKLE 0x100F
|
||||
#define FLDEFF_PAL_TAG_HOF_MONITOR 0x1010
|
||||
#define FLDEFF_PAL_TAG_UNKNOWN 0x1011
|
||||
|
||||
#endif // GUARD_FIELD_EFFECT_CONSTANTS_H
|
||||
|
||||
@ -497,6 +497,11 @@
|
||||
#define MAX_PC_ITEM_CAPACITY 999
|
||||
#define MAX_BERRY_CAPACITY 999
|
||||
|
||||
// Secondary IDs for rods
|
||||
#define OLD_ROD 0
|
||||
#define GOOD_ROD 1
|
||||
#define SUPER_ROD 2
|
||||
|
||||
// Check if the item is one that can be used on a Pokemon.
|
||||
#define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
|
||||
|
||||
|
||||
@ -289,31 +289,31 @@
|
||||
#define METATILE_EverGrande_Door_PokemonLeague 0x21D
|
||||
|
||||
// gTileset_PokemonCenter
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile0_Frame0 0x280
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile0_Frame1 0x282
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile0_Frame2 0x284
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile1_Frame0 0x281
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile1_Frame1 0x283
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile1_Frame2 0x285
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile2_Frame0 0x288
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile2_Frame1 0x28A
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile2_Frame2 0x28C
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile3_Frame0 0x289
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile3_Frame1 0x28B
|
||||
#define METATILE_PokemonCenter_Elevator1F_Tile3_Frame2 0x28D
|
||||
#define METATILE_PokemonCenter_Elevator2F_Tile0_Frame0 0x2A0
|
||||
#define METATILE_PokemonCenter_Elevator2F_Tile0_Frame1 0x2A2
|
||||
#define METATILE_PokemonCenter_Elevator2F_Tile0_Frame2 0x2A4
|
||||
#define METATILE_PokemonCenter_Elevator2F_Tile1_Frame0 0x2A1
|
||||
#define METATILE_PokemonCenter_Elevator2F_Tile1_Frame1 0x2A3
|
||||
#define METATILE_PokemonCenter_Elevator2F_Tile1_Frame2 0x2A5
|
||||
#define METATILE_PokemonCenter_Elevator2F_Tile2_Frame0 0x2A8
|
||||
#define METATILE_PokemonCenter_Elevator2F_Tile2_Frame1 0x2AA
|
||||
#define METATILE_PokemonCenter_Elevator2F_Tile2_Frame2 0x2AC
|
||||
#define METATILE_PokemonCenter_Floor_ShadowTop_Alt 0x2DC
|
||||
#define METATILE_PokemonCenter_Floor_Plain_Alt 0x2E4
|
||||
#define METATILE_PokemonCenter_Floor_ShadowTop 0x21E
|
||||
#define METATILE_PokemonCenter_CounterBarrier 0x25D
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile0_Frame0 0x280
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile0_Frame1 0x282
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile0_Frame2 0x284
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile1_Frame0 0x281
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile1_Frame1 0x283
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile1_Frame2 0x285
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile2_Frame0 0x288
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile2_Frame1 0x28A
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile2_Frame2 0x28C
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile3_Frame0 0x289
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile3_Frame1 0x28B
|
||||
#define METATILE_PokemonCenter_Escalator1F_Tile3_Frame2 0x28D
|
||||
#define METATILE_PokemonCenter_Escalator2F_Tile0_Frame0 0x2A0
|
||||
#define METATILE_PokemonCenter_Escalator2F_Tile0_Frame1 0x2A2
|
||||
#define METATILE_PokemonCenter_Escalator2F_Tile0_Frame2 0x2A4
|
||||
#define METATILE_PokemonCenter_Escalator2F_Tile1_Frame0 0x2A1
|
||||
#define METATILE_PokemonCenter_Escalator2F_Tile1_Frame1 0x2A3
|
||||
#define METATILE_PokemonCenter_Escalator2F_Tile1_Frame2 0x2A5
|
||||
#define METATILE_PokemonCenter_Escalator2F_Tile2_Frame0 0x2A8
|
||||
#define METATILE_PokemonCenter_Escalator2F_Tile2_Frame1 0x2AA
|
||||
#define METATILE_PokemonCenter_Escalator2F_Tile2_Frame2 0x2AC
|
||||
#define METATILE_PokemonCenter_Floor_ShadowTop_Alt 0x2DC
|
||||
#define METATILE_PokemonCenter_Floor_Plain_Alt 0x2E4
|
||||
#define METATILE_PokemonCenter_Floor_ShadowTop 0x21E
|
||||
#define METATILE_PokemonCenter_CounterBarrier 0x25D
|
||||
|
||||
// gTileset_InsideOfTruck
|
||||
#define METATILE_InsideOfTruck_ExitLight_Top 0x208
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
#define TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS 6
|
||||
#define TRAINER_HILL_FUNC_GET_CHALLENGE_TIME 7
|
||||
#define TRAINER_HILL_FUNC_GET_ALL_FLOORS_USED 8
|
||||
#define TRAINER_HILL_FUNC_CLEAR_RESULT 9
|
||||
#define TRAINER_HILL_FUNC_GET_IN_EREADER_MODE 9
|
||||
#define TRAINER_HILL_FUNC_IN_CHALLENGE 10
|
||||
#define TRAINER_HILL_FUNC_POST_BATTLE_TEXT 11
|
||||
#define TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS 12
|
||||
|
||||
@ -16,11 +16,7 @@ enum SpinnerRunnerFollowPatterns
|
||||
RUNFOLLOW_SOUTH_EAST_WEST
|
||||
};
|
||||
|
||||
struct UnkStruct_085094AC
|
||||
{
|
||||
const union AnimCmd *const *anims;
|
||||
u8 animPos[4];
|
||||
};
|
||||
#define FIGURE_8_LENGTH 72
|
||||
|
||||
#define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN (1 << 0)
|
||||
#define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE (1 << 1)
|
||||
@ -43,6 +39,12 @@ struct UnkStruct_085094AC
|
||||
#define GROUND_EFFECT_FLAG_HOT_SPRINGS (1 << 18)
|
||||
#define GROUND_EFFECT_FLAG_SEAWEED (1 << 19)
|
||||
|
||||
struct UnkStruct_085094AC
|
||||
{
|
||||
const union AnimCmd *const *anims;
|
||||
u8 animPos[4];
|
||||
};
|
||||
|
||||
struct PairedPalettes
|
||||
{
|
||||
u16 tag;
|
||||
@ -98,7 +100,7 @@ void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8);
|
||||
const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId);
|
||||
void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
|
||||
void FreeAndReserveObjectSpritePalettes(void);
|
||||
void sub_808E82C(u8, u8, u8, s16, s16);
|
||||
void SetObjectEventSpritePosByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
|
||||
void sub_808E7E4(u8, u8, u8);
|
||||
void sub_808E78C(u8, u8, u8, u8);
|
||||
void sub_808E75C(s16, s16);
|
||||
@ -174,8 +176,6 @@ u8 sub_809785C(struct Sprite *);
|
||||
u8 sub_80978E4(struct Sprite *);
|
||||
void SetAndStartSpriteAnim(struct Sprite *, u8, u8);
|
||||
bool8 SpriteAnimEnded(struct Sprite *);
|
||||
void sub_8097750(struct Sprite *);
|
||||
bool8 sub_8097758(struct Sprite *);
|
||||
void CreateLevitateMovementTask(struct ObjectEvent *);
|
||||
void DestroyExtraMovementTask(u8);
|
||||
void UnfreezeObjectEvents(void);
|
||||
@ -191,8 +191,8 @@ u8 GetLedgeJumpDirection(s16, s16, u8);
|
||||
void CameraObjectSetFollowedObjectId(u8 objectId);
|
||||
u16 GetObjectPaletteTag(u8 palSlot);
|
||||
void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible);
|
||||
s16 sub_809773C(s16 a1);
|
||||
s16 sub_8097728(s16 a1);
|
||||
s16 GetFigure8XOffset(s16 idx);
|
||||
s16 GetFigure8YOffset(s16 idx);
|
||||
void CameraObjectReset2(void);
|
||||
u8 GetObjectEventBerryTreeId(u8 objectEventId);
|
||||
void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
|
||||
|
||||
@ -372,10 +372,11 @@ extern const u8 SecretBase_Text_Trainer8Defeated[];
|
||||
extern const u8 SecretBase_Text_Trainer9Defeated[];
|
||||
|
||||
//field effects
|
||||
extern const u8 EventScript_FldEffStrength[];
|
||||
extern const u8 EventScript_UseStrength[];
|
||||
extern const u8 EventScript_FailSweetScent[];
|
||||
extern const u8 EventScript_FldEffFlash[];
|
||||
extern const u8 EventScript_FldEffRockSmash[];
|
||||
extern const u8 EventScript_UseFlash[];
|
||||
extern const u8 EventScript_UseCut[];
|
||||
extern const u8 EventScript_UseRockSmash[];
|
||||
|
||||
//player pc
|
||||
extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC[];
|
||||
@ -587,4 +588,26 @@ extern u8 BerryTree_EventScript_ItemUsePlantBerry[];
|
||||
extern u8 BerryTree_EventScript_ItemUseWailmerPail[];
|
||||
extern u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[];
|
||||
|
||||
// overworld
|
||||
extern const u8 EventScript_WhiteOut[];
|
||||
extern const u8 EventScript_ResetMrBriney[];
|
||||
extern const u8 EventScript_DoLinkRoomExit[];
|
||||
extern const u8 CableClub_EventScript_TooBusyToNotice[];
|
||||
extern const u8 CableClub_EventScript_ReadTrainerCard[];
|
||||
extern const u8 CableClub_EventScript_ReadTrainerCardColored[];
|
||||
extern const u8 EventScript_BattleColosseum_4P_PlayerSpot0[];
|
||||
extern const u8 EventScript_BattleColosseum_4P_PlayerSpot1[];
|
||||
extern const u8 EventScript_BattleColosseum_4P_PlayerSpot2[];
|
||||
extern const u8 EventScript_BattleColosseum_4P_PlayerSpot3[];
|
||||
extern const u8 EventScript_RecordCenter_Spot0[];
|
||||
extern const u8 EventScript_RecordCenter_Spot1[];
|
||||
extern const u8 EventScript_RecordCenter_Spot2[];
|
||||
extern const u8 EventScript_RecordCenter_Spot3[];
|
||||
extern const u8 EventScript_BattleColosseum_2P_PlayerSpot0[];
|
||||
extern const u8 EventScript_BattleColosseum_2P_PlayerSpot1[];
|
||||
extern const u8 EventScript_TradeCenter_Chair1[];
|
||||
extern const u8 EventScript_TradeCenter_Chair0[];
|
||||
extern const u8 EventScript_ConfirmLeaveTradeRoom[];
|
||||
extern const u8 EventScript_TerminateLink[];
|
||||
|
||||
#endif // GUARD_EVENT_SCRIPTS_H
|
||||
|
||||
@ -23,7 +23,7 @@ void DrawWholeMapView(void);
|
||||
void CurrentMapDrawMetatileAt(int x, int y);
|
||||
void sub_8089C08(s16 *a0, s16 *a1);
|
||||
void DrawDoorMetatileAt(int x, int y, u16 *arr);
|
||||
void move_tilemap_camera_to_upper_left_corner(void);
|
||||
void ResetFieldCamera(void);
|
||||
void sub_8057A58(void);
|
||||
void ResetCameraUpdateInfo(void);
|
||||
u32 InitCameraUpdateCallback(u8 a);
|
||||
|
||||
@ -34,7 +34,7 @@ bool8 sub_8068870(u16 a);
|
||||
bool8 sub_8068894(void);
|
||||
bool8 sub_8068A64(struct MapPosition *, u16);
|
||||
u8 sub_8068F18(void);
|
||||
bool8 dive_warp(struct MapPosition *position, u16 b);
|
||||
bool8 TryDoDiveWarp(struct MapPosition *position, u16 b);
|
||||
int SetCableClubWarp(void);
|
||||
u8 TrySetDiveWarp(void);
|
||||
const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction);
|
||||
|
||||
@ -16,7 +16,7 @@ void ReturnToFieldFromFlyMapSelect(void);
|
||||
u8 AddNewGameBirchObject(s16, s16, u8);
|
||||
void FieldEffectStop(struct Sprite *sprite, u8 id);
|
||||
u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
|
||||
void CreateTeleportFieldEffectTask(void);
|
||||
void FldEff_TeleportWarpOut(void);
|
||||
void FieldEffectActiveListRemove(u8 id);
|
||||
void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8);
|
||||
void FieldEffectActiveListAdd(u8 id);
|
||||
@ -39,12 +39,8 @@ void StartEscalatorWarp(u8 metatileBehavior, u8 priority);
|
||||
void StartLavaridgeGymB1FWarp(u8 priority);
|
||||
void StartLavaridgeGym1FWarp(u8 priority);
|
||||
|
||||
void sub_80B9C28(s16*, u8);
|
||||
void sub_80B9C54(s16*, u8);
|
||||
void sub_80B9CDC(s16*, u8);
|
||||
|
||||
void SpriteCB_PopOutOfAsh(struct Sprite*);
|
||||
void SpriteCB_LavaridgeGymWarp(struct Sprite*);
|
||||
void SpriteCB_AshPuff(struct Sprite*);
|
||||
void SpriteCB_AshLaunch(struct Sprite*);
|
||||
|
||||
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
|
||||
void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
|
||||
|
||||
@ -8,20 +8,22 @@
|
||||
// Exported ROM declarations
|
||||
u8 CreateWarpArrowSprite(void);
|
||||
u8 sub_8155800(u8 oldSpriteId);
|
||||
void sub_81555AC(u8, u8);
|
||||
void SetSurfBobState(u8 spriteId, u8 value);
|
||||
void SetSurfBobWhileFlyingOutState(u8 spriteId, u8 value);
|
||||
void SetSurfBobWhileFishingState(u8 spriteId, u8 value, s16 data1);
|
||||
bool8 sub_8155DA0(struct ObjectEvent *);
|
||||
void sub_8155D78(struct ObjectEvent *);
|
||||
void StartAshFieldEffect(s16, s16, u16, s16);
|
||||
void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8);
|
||||
u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*);
|
||||
u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
|
||||
void sub_8155F80(struct Sprite*);
|
||||
void UpdateRayquazaSpotlightEffect(struct Sprite*);
|
||||
void UpdateShadowFieldEffect(struct Sprite*);
|
||||
void UpdateTallGrassFieldEffect(struct Sprite*);
|
||||
void WaitFieldEffectSpriteAnim(struct Sprite*);
|
||||
void UpdateAshFieldEffect(struct Sprite*);
|
||||
void UpdateSurfBlobFieldEffect(struct Sprite*);
|
||||
void sub_8156194(struct Sprite*);
|
||||
void UpdateJumpImpactEffect(struct Sprite*);
|
||||
void UpdateFootprintsTireTracksFieldEffect(struct Sprite*);
|
||||
void UpdateSplashFieldEffect(struct Sprite*);
|
||||
void UpdateLongGrassFieldEffect(struct Sprite*);
|
||||
@ -33,7 +35,5 @@ void UpdateBubblesFieldEffect(struct Sprite*);
|
||||
void UpdateSparkleFieldEffect(struct Sprite*);
|
||||
void SetSpriteInvisible(u8 spriteId);
|
||||
void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
|
||||
void sub_8155604(u8 spriteId, u8 value, s16 data1);
|
||||
void sub_81555D8(u8 spriteId, u8 value);
|
||||
|
||||
#endif //GUARD_FIELD_EFFECT_HELPERS_H
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef GUARD_FIELD_PLAYER_AVATAR_H
|
||||
#define GUARD_FIELD_PLAYER_AVATAR_H
|
||||
|
||||
void player_step(u8 a, u16 b, u16 c);
|
||||
void PlayerStep(u8 direction, u16 newKeys, u16 heldKeys);
|
||||
void ClearPlayerAvatarInfo(void);
|
||||
void SetPlayerAvatarExtraStateTransition(u8, u8);
|
||||
u8 GetPlayerAvatarGenderByGraphicsId(u8);
|
||||
@ -39,7 +39,7 @@ void sub_808BCF4(void);
|
||||
void sub_808D074(u8);
|
||||
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
|
||||
u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8, u8);
|
||||
void sub_808C114(void);
|
||||
void SetPlayerAvatarFieldMove(void);
|
||||
u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
|
||||
void SetPlayerAvatarStateMask(u8 a);
|
||||
u8 GetPlayerAvatarGraphicsIdByStateId(u8 a);
|
||||
@ -47,9 +47,9 @@ u8 GetJumpSpecialMovementAction(u32);
|
||||
bool8 PartyHasMonWithSurf(void);
|
||||
bool8 IsPlayerFacingSurfableFishableWater(void);
|
||||
bool8 IsPlayerSurfingNorth(void);
|
||||
void sub_808C228(u8 direction);
|
||||
void SetPlayerAvatarWatering(u8 direction);
|
||||
u8 GetPlayerAvatarFlags(void);
|
||||
void sub_808B578(void);
|
||||
void UpdatePlayerAvatarTransitionState(void);
|
||||
u8 GetFRLGAvatarGraphicsIdByGender(u8);
|
||||
u8 GetRSAvatarGraphicsIdByGender(u8);
|
||||
void PlayerWheelieInPlace(u8 direction);
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
#ifndef GUARD_FIELD_SCREEN_EFFECT_H
|
||||
#define GUARD_FIELD_SCREEN_EFFECT_H
|
||||
|
||||
extern const s32 gMaxFlashLevel;
|
||||
|
||||
void WarpFadeInScreen(void);
|
||||
void WarpFadeOutScreen(void);
|
||||
void FadeInFromBlack(void);
|
||||
@ -26,7 +28,7 @@ void DoFallWarp(void);
|
||||
void DoEscalatorWarp(u8 metatileBehavior);
|
||||
void DoLavaridgeGymB1FWarp(void);
|
||||
void DoLavaridgeGym1FWarp(void);
|
||||
void DoTeleportWarp(void);
|
||||
void DoTeleportTileWarp(void);
|
||||
void DoMossdeepGymWarp(void);
|
||||
void DoPortholeWarp(void);
|
||||
void DoCableClubWarp(void);
|
||||
|
||||
@ -30,25 +30,21 @@ struct MapConnection *sub_8088950(u8 direction, int x, int y);
|
||||
bool8 sub_80889A8(u8 direction, int x, int y, struct MapConnection *connection);
|
||||
bool8 sub_8088A0C(int x, int src_width, int dest_width, int offset);
|
||||
void save_serialize_map(void);
|
||||
void sub_8088B3C(u16 x, u16 y);
|
||||
void SetCameraFocusCoords(u16 x, u16 y);
|
||||
void InitMap(void);
|
||||
void InitMapFromSavedGame(void);
|
||||
void InitTrainerHillMap(void);
|
||||
void InitBattlePyramidMap(bool8 setPlayerPosition);
|
||||
void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout);
|
||||
void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout);
|
||||
void apply_map_tileset2_palette(struct MapLayout const *mapLayout);
|
||||
void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout);
|
||||
void copy_map_tileset1_to_vram(const struct MapLayout *);
|
||||
void copy_map_tileset2_to_vram(const struct MapLayout *);
|
||||
struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *connection);
|
||||
void CopyMapTilesetsToVram(struct MapLayout const *mapLayout);
|
||||
void LoadMapTilesetPalettes(struct MapLayout const *mapLayout);
|
||||
void LoadSecondaryTilesetPalette(struct MapLayout const *mapLayout);
|
||||
void CopySecondaryTilesetToVramUsingHeap(struct MapLayout const *mapLayout);
|
||||
void CopyPrimaryTilesetToVram(const struct MapLayout *);
|
||||
void CopySecondaryTilesetToVram(const struct MapLayout *);
|
||||
struct MapHeader const *const GetMapHeaderFromConnection(struct MapConnection *connection);
|
||||
struct MapConnection *GetConnectionAtCoords(s16 x, s16 y);
|
||||
void MapGridSetMetatileImpassabilityAt(int x, int y, bool32 impassable);
|
||||
|
||||
void SpriteCB_PokeballGlow(struct Sprite *);
|
||||
void SpriteCB_PokecenterMonitor(struct Sprite *);
|
||||
void SpriteCB_HallOfFameMonitor(struct Sprite *);
|
||||
|
||||
// field_region_map.c
|
||||
void FieldInitRegionMap(MainCallback callback);
|
||||
|
||||
|
||||
@ -9,22 +9,13 @@ bool8 FldEff_CutGrass(void);
|
||||
void FixLongGrassMetatilesWindowTop(s16 x, s16 y);
|
||||
void FixLongGrassMetatilesWindowBottom(s16 x, s16 y);
|
||||
|
||||
extern const struct SpritePalette gFieldEffectObjectPaletteInfo6;
|
||||
extern const struct SpritePalette gSpritePalette_CutGrass;
|
||||
extern struct MapPosition gPlayerFacingPosition;
|
||||
|
||||
// groundshake
|
||||
bool8 sub_81BE66C(void);
|
||||
void sub_81BE6AC(void);
|
||||
void sub_81BE6B8(void);
|
||||
void sub_81BE72C(void);
|
||||
void sub_81BE79C(void);
|
||||
void sub_81BE7F4(void);
|
||||
void sub_81BE994(void);
|
||||
|
||||
// escalator
|
||||
void sub_80E1558(u8 var);
|
||||
void sub_80E1570(void);
|
||||
bool8 sub_80E1584(void);
|
||||
void StartEscalator(bool8 var);
|
||||
void StopEscalator(void);
|
||||
bool8 IsEscalatorMoving(void);
|
||||
|
||||
// soft-boiled
|
||||
bool8 SetUpFieldMove_SoftBoiled(void);
|
||||
@ -39,7 +30,7 @@ bool8 GetMapPairFadeFromType(u8 a1, u8 a2);
|
||||
|
||||
// strength
|
||||
bool8 SetUpFieldMove_Strength(void);
|
||||
bool8 sub_8145E2C(void);
|
||||
bool8 FldEff_UseStrength(void);
|
||||
|
||||
// sweet scent
|
||||
bool8 SetUpFieldMove_SweetScent(void);
|
||||
@ -55,7 +46,7 @@ bool8 FldEff_UseDig(void);
|
||||
|
||||
// rock smash
|
||||
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
|
||||
u8 oei_task_add(void);
|
||||
u8 CreateFieldMoveTask(void);
|
||||
bool8 SetUpFieldMove_RockSmash(void);
|
||||
bool8 FldEff_UseRockSmash(void);
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
#ifndef GUARD_FLDEFF_MISC_H
|
||||
#define GUARD_FLDEFF_MISC_H
|
||||
|
||||
void sub_80F9BCC(u16 a0, u16 a1, u8 a2);
|
||||
void sub_80F9BF4(u16 a0, u16 a1, u8 a2);
|
||||
bool8 sub_80F9C1C(void);
|
||||
bool8 sub_80F9C30(void);
|
||||
void ComputerScreenOpenEffect(u16 a0, u16 a1, u8 a2);
|
||||
void ComputerScreenCloseEffect(u16 a0, u16 a1, u8 a2);
|
||||
bool8 IsComputerScreenOpenEffectActive(void);
|
||||
bool8 IsComputerScreenCloseEffectActive(void);
|
||||
bool8 SetUpFieldMove_SecretPower(void);
|
||||
bool8 FldEff_UseSecretPowerCave(void);
|
||||
bool8 FldEff_SecretPowerCave(void);
|
||||
@ -15,22 +15,22 @@ bool8 FldEff_SecretPowerShrub(void);
|
||||
bool8 FldEff_SecretBasePCTurnOn(void);
|
||||
void DoSecretBasePCTurnOffEffect(void);
|
||||
void PopSecretBaseBalloon(s16 metatileId, s16 x, s16 y);
|
||||
bool8 FldEff_NopA6FC(void);
|
||||
bool8 FldEff_NopA700(void);
|
||||
bool8 FldEff_Nop47(void);
|
||||
bool8 FldEff_Nop48(void);
|
||||
void ShatterSecretBaseBreakableDoor(s16 x, s16 y);
|
||||
void PlaySecretBaseMusicNoteMatSound(s16 metatileId);
|
||||
void DoSecretBaseGlitterMatSparkle(void);
|
||||
bool8 FldEff_SandPillar(void);
|
||||
void InteractWithShieldOrTVDecoration(void);
|
||||
bool8 sub_80FADE4(u16 arg0, u8 arg1);
|
||||
bool8 IsLargeBreakableDecoration(u16 arg0, u8 arg1);
|
||||
void FldEffPoison_Start(void);
|
||||
bool32 FldEffPoison_IsActive(void);
|
||||
void DoWateringBerryTreeAnim(void);
|
||||
u8 CreateRecordMixingSprite(void);
|
||||
void DestroyRecordMixingSprite(void);
|
||||
u8 CreateRecordMixingLights(void);
|
||||
void DestroyRecordMixingLights(void);
|
||||
|
||||
extern const struct SpritePalette gFieldEffectObjectPaletteInfo7;
|
||||
extern const struct SpritePalette gFieldEffectObjectPaletteInfo8;
|
||||
extern const struct SpritePalette gSpritePalette_SecretPower_Cave;
|
||||
extern const struct SpritePalette gSpritePalette_SecretPower_Plant;
|
||||
extern const struct SpritePalette gFieldEffectObjectPaletteInfo9;
|
||||
extern const u16 gTilesetPalettes_SecretBase[][16];
|
||||
|
||||
|
||||
@ -247,14 +247,14 @@ enum {
|
||||
PLAYER_AVATAR_STATE_WATERING,
|
||||
};
|
||||
|
||||
#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << PLAYER_AVATAR_STATE_NORMAL)
|
||||
#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << PLAYER_AVATAR_STATE_MACH_BIKE)
|
||||
#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << PLAYER_AVATAR_STATE_ACRO_BIKE)
|
||||
#define PLAYER_AVATAR_FLAG_SURFING (1 << PLAYER_AVATAR_STATE_SURFING)
|
||||
#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER)
|
||||
#define PLAYER_AVATAR_FLAG_5 (1 << PLAYER_AVATAR_STATE_FIELD_MOVE)
|
||||
#define PLAYER_AVATAR_FLAG_6 (1 << PLAYER_AVATAR_STATE_FISHING)
|
||||
#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING)
|
||||
#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0)
|
||||
#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1)
|
||||
#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2)
|
||||
#define PLAYER_AVATAR_FLAG_SURFING (1 << 3)
|
||||
#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4)
|
||||
#define PLAYER_AVATAR_FLAG_5 (1 << 5)
|
||||
#define PLAYER_AVATAR_FLAG_FORCED_MOVE (1 << 6)
|
||||
#define PLAYER_AVATAR_FLAG_DASH (1 << 7)
|
||||
|
||||
enum
|
||||
{
|
||||
|
||||
@ -30,7 +30,7 @@ extern const u16 gUnknown_0860F074[];
|
||||
|
||||
void FreeAllOverworldWindowBuffers(void);
|
||||
void InitStandardTextBoxWindows(void);
|
||||
void sub_8197200(void);
|
||||
void InitTextBoxGfxAndPrinters(void);
|
||||
u16 RunTextPrintersAndIsPrinter0Active(void);
|
||||
void LoadMessageBoxAndBorderGfx(void);
|
||||
void DrawDialogueFrame(u8 windowId, bool8 copyToVram);
|
||||
@ -64,8 +64,8 @@ void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirs
|
||||
void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
|
||||
s8 Menu_ProcessInputNoWrapClearOnChoose(void);
|
||||
s8 ProcessMenuInput_other(void);
|
||||
void do_scheduled_bg_tilemap_copies_to_vram(void);
|
||||
void clear_scheduled_bg_copies_to_vram(void);
|
||||
void DoScheduledBgTilemapCopiesToVram(void);
|
||||
void ClearScheduledBgCopiesToVram(void);
|
||||
void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str);
|
||||
void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 a2, u8 a3);
|
||||
void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds);
|
||||
|
||||
@ -24,6 +24,8 @@
|
||||
#define MOVEMENT_MODE_FROZEN 1
|
||||
#define MOVEMENT_MODE_SCRIPTED 2
|
||||
|
||||
#define SKIP_OBJECT_EVENT_LOAD 1
|
||||
|
||||
struct InitialPlayerAvatarState
|
||||
{
|
||||
u8 transitionFlags;
|
||||
@ -99,8 +101,7 @@ void SetDefaultFlashLevel(void);
|
||||
void Overworld_SetFlashLevel(s32 flashLevel);
|
||||
u8 Overworld_GetFlashLevel(void);
|
||||
void SetCurrentMapLayout(u16 mapLayoutId);
|
||||
void sub_8085540(u8 var);
|
||||
u8 sub_808554C(void);
|
||||
void SetObjectEventLoadFlag(u8 var);
|
||||
u16 GetLocationMusic(struct WarpData *warp);
|
||||
u16 GetCurrLocationDefaultMusic(void);
|
||||
u16 GetWarpDestinationMusic(void);
|
||||
@ -135,11 +136,9 @@ void SetUnusedCallback(void *a0);
|
||||
void CB2_NewGame(void);
|
||||
void CB2_WhiteOut(void);
|
||||
void CB2_LoadMap(void);
|
||||
void sub_8086024(void);
|
||||
void CB2_ReturnToFieldContestHall(void);
|
||||
void CB2_ReturnToFieldCableClub(void);
|
||||
void CB2_ReturnToField(void);
|
||||
void CB2_ReturnToFieldLocal(void);
|
||||
void CB2_ReturnToFieldLink(void);
|
||||
void CB2_ReturnToFieldFromMultiplayer(void);
|
||||
void CB2_ReturnToFieldWithOpenMenu(void);
|
||||
void CB2_ReturnToFieldContinueScript(void);
|
||||
|
||||
@ -75,7 +75,7 @@ void FillHillTrainerParty(void);
|
||||
void FillHillTrainersParties(void);
|
||||
u8 GetTrainerEncounterMusicIdInTrainerHill(u16 trainerId);
|
||||
u8 GetNumFloorsInTrainerHillChallenge(void);
|
||||
void sub_81D64C0(void);
|
||||
bool32 sub_81D6534(void);
|
||||
void TryLoadTrainerHillEReaderPalette(void);
|
||||
bool32 OnTrainerHillEReaderChallengeFloor(void);
|
||||
|
||||
#endif // GUARD_TRAINER_HILL_H
|
||||
|
||||
@ -30,12 +30,12 @@ void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent);
|
||||
void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent);
|
||||
void AlertTVOfNewCoinTotal(u16 nCoinsPaidOut);
|
||||
void TryPutSecretBaseSecretsOnAir(void);
|
||||
void sub_80EDB44(void);
|
||||
void TryPutTodaysRivalTrainerOnAir(void);
|
||||
void sub_80EDC60(const u16 *words);
|
||||
void sub_80EDA80(void);
|
||||
void ReceivePokeNewsData(void *src, u32 size, u8 masterIdx);
|
||||
void sub_80F0BB8(void);
|
||||
void sub_80ED950(bool8 flag);
|
||||
void RecordFishingAttemptForTV(bool8 caughtFish);
|
||||
void IncrementDailySlotsUses(void);
|
||||
void IncrementDailyRouletteUses(void);
|
||||
void IncrementDailyWildBattles(void);
|
||||
|
||||
@ -440,7 +440,7 @@ SECTIONS {
|
||||
gflib/window.o(.rodata);
|
||||
gflib/text.o(.rodata);
|
||||
gflib/sprite.o(.rodata);
|
||||
data/io_reg.o(.rodata);
|
||||
gflib/io_reg.o(.rodata);
|
||||
gflib/string_util.o(.rodata);
|
||||
src/link.o(.rodata);
|
||||
src/link.o(.rodata.str1.4);
|
||||
|
||||
@ -582,16 +582,16 @@ $(FLDEFFGFXDIR)/arrow.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/ash.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/sparkle.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/bike_hop_big_splash.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/jump_big_splash.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/bike_hop_small_splash.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/jump_small_splash.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 1
|
||||
|
||||
$(FLDEFFGFXDIR)/bike_hop_tall_grass.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/jump_tall_grass.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 1
|
||||
|
||||
$(FLDEFFGFXDIR)/bike_tire_tracks.4bpp: %.4bpp: %.png
|
||||
@ -606,7 +606,7 @@ $(FLDEFFGFXDIR)/deep_sand_footprints.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/ground_impact_dust.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 1
|
||||
|
||||
$(FLDEFFGFXDIR)/jump_out_of_ash.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/ash_puff.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/long_grass.4bpp: %.4bpp: %.png
|
||||
@ -642,23 +642,35 @@ $(FLDEFFGFXDIR)/unknown_16.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/unknown_17.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/unknown_18.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/unused_grass_2.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/unknown_19.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/unused_sand.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/unknown_20.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/water_surfacing.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/unknown_29.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/sand_pile.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 1
|
||||
|
||||
$(FLDEFFGFXDIR)/lavaridge_gym_warp.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/ash_launch.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/unknown_35.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/small_sparkle.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/unused_grass.4bpp: %.4bpp: %.png
|
||||
$(FLDEFFGFXDIR)/unused_grass_3.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/secret_power_cave.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/secret_power_shrub.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/secret_power_tree.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 2 -mheight 2
|
||||
|
||||
$(FLDEFFGFXDIR)/record_mix_lights.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -mwidth 4 -mheight 1
|
||||
|
||||
@ -402,7 +402,7 @@ static void sub_81C501C(void)
|
||||
RunTasks();
|
||||
AnimateSprites();
|
||||
BuildOamBuffer();
|
||||
do_scheduled_bg_tilemap_copies_to_vram();
|
||||
DoScheduledBgTilemapCopiesToVram();
|
||||
UpdatePaletteFade();
|
||||
}
|
||||
|
||||
@ -424,7 +424,7 @@ static bool8 sub_81C5078(void)
|
||||
{
|
||||
case 0:
|
||||
SetVBlankHBlankCallbacksToNull();
|
||||
clear_scheduled_bg_copies_to_vram();
|
||||
ClearScheduledBgCopiesToVram();
|
||||
gMain.state++;
|
||||
break;
|
||||
case 1:
|
||||
|
||||
@ -749,7 +749,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_Pokeball[] =
|
||||
static const struct SpriteTemplate sSpriteTemplate_Pokeball =
|
||||
{
|
||||
.tileTag = 0xFFFF,
|
||||
.paletteTag = 4105,
|
||||
.paletteTag = FLDEFF_PAL_TAG_POKEBALL,
|
||||
.oam = &gObjectEventBaseOam_32x32,
|
||||
.anims = sSpriteAnimTable_Pokeball,
|
||||
.images = sSpriteImage_Pokeball,
|
||||
@ -798,7 +798,7 @@ static const union AnimCmd *const sSpriteAnimTable_UnusedBrendanLass[] =
|
||||
static const struct SpriteTemplate sSpriteTemplate_UnusedBrendan =
|
||||
{
|
||||
.tileTag = 0xFFFF,
|
||||
.paletteTag = 4106,
|
||||
.paletteTag = 0x100A,
|
||||
.oam = &sOam_UnusedBrendanLass,
|
||||
.anims = sSpriteAnimTable_UnusedBrendanLass,
|
||||
.images = sImageTable_UnusedBrendan,
|
||||
@ -809,7 +809,7 @@ static const struct SpriteTemplate sSpriteTemplate_UnusedBrendan =
|
||||
static const struct SpriteTemplate sSpriteTemplate_UnusedLass =
|
||||
{
|
||||
.tileTag = 0xFFFF,
|
||||
.paletteTag = 4106,
|
||||
.paletteTag = 0x100A,
|
||||
.oam = &sOam_UnusedBrendanLass,
|
||||
.anims = sSpriteAnimTable_UnusedBrendanLass,
|
||||
.images = sImageTable_UnusedLass,
|
||||
@ -817,12 +817,9 @@ static const struct SpriteTemplate sSpriteTemplate_UnusedLass =
|
||||
.callback = SpriteCb_TrainerPic
|
||||
};
|
||||
|
||||
static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/field_effects/palettes/10.gbapal");
|
||||
static const u16 sFieldEffectPal_Pokeball[] = INCBIN_U16("graphics/field_effects/palettes/pokeball.gbapal");
|
||||
|
||||
const struct SpritePalette gFieldEffectObjectPaletteInfo10 =
|
||||
{
|
||||
gFieldEffectObjectPalette10, 0x1009
|
||||
};
|
||||
const struct SpritePalette gSpritePalette_Pokeball = {sFieldEffectPal_Pokeball, FLDEFF_PAL_TAG_POKEBALL};
|
||||
|
||||
static const u16 sMugshotPal_Sidney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal");
|
||||
static const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal");
|
||||
@ -848,10 +845,7 @@ static const u16 *const sPlayerMugshotsPals[GENDER_COUNT] =
|
||||
};
|
||||
|
||||
static const u16 sUnusedTrainerPalette[] = INCBIN_U16("graphics/battle_transitions/unused_trainer.gbapal");
|
||||
static const struct SpritePalette sSpritePalette_UnusedTrainer =
|
||||
{
|
||||
sUnusedTrainerPalette, 0x100A
|
||||
};
|
||||
static const struct SpritePalette sSpritePalette_UnusedTrainer = {sUnusedTrainerPalette, 0x100A};
|
||||
|
||||
static const u16 sBigPokeball_Tilemap[] = INCBIN_U16("graphics/battle_transitions/big_pokeball_map.bin");
|
||||
static const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/elite_four_bg_map.bin");
|
||||
@ -1323,7 +1317,7 @@ static bool8 Phase2_BigPokeball_Func1(struct Task *task)
|
||||
GetBg0TilesDst(&tilemap, &tileset);
|
||||
CpuFill16(0, tilemap, 0x800);
|
||||
CpuCopy16(sBigPokeball_Tileset, tileset, 0x580);
|
||||
LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
|
||||
LoadPalette(sFieldEffectPal_Pokeball, 0xF0, 0x20);
|
||||
|
||||
task->tState++;
|
||||
return FALSE;
|
||||
@ -1629,7 +1623,7 @@ static bool8 Phase2_PokeballsTrail_Func1(struct Task *task)
|
||||
GetBg0TilesDst(&tilemap, &tileset);
|
||||
CpuSet(sPokeballTrail_Tileset, tileset, 0x20);
|
||||
CpuFill32(0, tilemap, 0x800);
|
||||
LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
|
||||
LoadPalette(sFieldEffectPal_Pokeball, 0xF0, 0x20);
|
||||
|
||||
task->tState++;
|
||||
return FALSE;
|
||||
@ -2919,7 +2913,7 @@ static bool8 Phase2_RectangularSpiral_Func1(struct Task *task)
|
||||
CpuCopy16(sShrinkingBoxTileset, tileset, 0x20);
|
||||
CpuCopy16(sShrinkingBoxTileset + 0x70, tileset + 0x20, 0x20);
|
||||
CpuFill16(0xF000, tilemap, 0x800);
|
||||
LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
|
||||
LoadPalette(sFieldEffectPal_Pokeball, 0xF0, 0x20);
|
||||
|
||||
task->tData3 = 1;
|
||||
task->tState++;
|
||||
@ -3428,7 +3422,7 @@ static bool8 Phase2_GridSquares_Func1(struct Task *task)
|
||||
GetBg0TilesDst(&tilemap, &tileset);
|
||||
CpuSet(sShrinkingBoxTileset, tileset, 0x10);
|
||||
CpuFill16(0xF000, tilemap, 0x800);
|
||||
LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
|
||||
LoadPalette(sFieldEffectPal_Pokeball, 0xF0, 0x20);
|
||||
|
||||
task->tState++;
|
||||
return FALSE;
|
||||
|
||||
@ -1076,7 +1076,7 @@ int sub_802104C(void)
|
||||
return 0;
|
||||
|
||||
InitStandardTextBoxWindows();
|
||||
sub_8197200();
|
||||
InitTextBoxGfxAndPrinters();
|
||||
sub_8022588(var0);
|
||||
sub_8022600(var0);
|
||||
gPaletteFade.bufferTransferDisabled = TRUE;
|
||||
|
||||
@ -186,7 +186,7 @@ static void CB2_BerryTagScreen(void)
|
||||
RunTasks();
|
||||
AnimateSprites();
|
||||
BuildOamBuffer();
|
||||
do_scheduled_bg_tilemap_copies_to_vram();
|
||||
DoScheduledBgTilemapCopiesToVram();
|
||||
UpdatePaletteFade();
|
||||
}
|
||||
|
||||
@ -217,7 +217,7 @@ static bool8 InitBerryTagScreen(void)
|
||||
case 0:
|
||||
SetVBlankHBlankCallbacksToNull();
|
||||
ResetVramOamAndBgCntRegs();
|
||||
clear_scheduled_bg_copies_to_vram();
|
||||
ClearScheduledBgCopiesToVram();
|
||||
gMain.state++;
|
||||
break;
|
||||
case 1:
|
||||
|
||||
@ -835,7 +835,7 @@ static void Bike_UpdateDirTimerHistory(u8 dir)
|
||||
|
||||
gPlayerAvatar.directionHistory = (gPlayerAvatar.directionHistory << 4) | (dir & 0xF);
|
||||
|
||||
for (i = 7; i != 0; i--)
|
||||
for (i = ARRAY_COUNT(gPlayerAvatar.dirTimerHistory) - 1; i != 0; i--)
|
||||
gPlayerAvatar.dirTimerHistory[i] = gPlayerAvatar.dirTimerHistory[i - 1];
|
||||
gPlayerAvatar.dirTimerHistory[0] = 1;
|
||||
}
|
||||
@ -846,7 +846,7 @@ static void Bike_UpdateABStartSelectHistory(u8 input)
|
||||
|
||||
gPlayerAvatar.abStartSelectHistory = (gPlayerAvatar.abStartSelectHistory << 4) | (input & 0xF);
|
||||
|
||||
for (i = 7; i != 0; i--)
|
||||
for (i = ARRAY_COUNT(gPlayerAvatar.abStartSelectTimerHistory) - 1; i != 0; i--)
|
||||
gPlayerAvatar.abStartSelectTimerHistory[i] = gPlayerAvatar.abStartSelectTimerHistory[i - 1];
|
||||
gPlayerAvatar.abStartSelectTimerHistory[0] = 1;
|
||||
}
|
||||
@ -1000,10 +1000,10 @@ void BikeClearState(int newDirHistory, int newAbStartHistory)
|
||||
gPlayerAvatar.directionHistory = newDirHistory;
|
||||
gPlayerAvatar.abStartSelectHistory = newAbStartHistory;
|
||||
|
||||
for (i = 0; i < 8; i++)
|
||||
for (i = 0; i < ARRAY_COUNT(gPlayerAvatar.dirTimerHistory); i++)
|
||||
gPlayerAvatar.dirTimerHistory[i] = 0;
|
||||
|
||||
for (i = 0; i < 8; i++)
|
||||
for (i = 0; i < ARRAY_COUNT(gPlayerAvatar.abStartSelectTimerHistory); i++)
|
||||
gPlayerAvatar.abStartSelectTimerHistory[i] = 0;
|
||||
}
|
||||
|
||||
|
||||
@ -86,12 +86,12 @@ bool8 ShouldDoBrailleDigEffect(void)
|
||||
|
||||
void DoBrailleDigEffect(void)
|
||||
{
|
||||
MapGridSetMetatileIdAt(16, 8, METATILE_ID(Cave, SealedChamberEntrance_TopLeft));
|
||||
MapGridSetMetatileIdAt(17, 8, METATILE_ID(Cave, SealedChamberEntrance_TopMid));
|
||||
MapGridSetMetatileIdAt(18, 8, METATILE_ID(Cave, SealedChamberEntrance_TopRight));
|
||||
MapGridSetMetatileIdAt(16, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | METATILE_COLLISION_MASK);
|
||||
MapGridSetMetatileIdAt(17, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
|
||||
MapGridSetMetatileIdAt(18, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | METATILE_COLLISION_MASK);
|
||||
MapGridSetMetatileIdAt(16, 8, METATILE_Cave_SealedChamberEntrance_TopLeft);
|
||||
MapGridSetMetatileIdAt(17, 8, METATILE_Cave_SealedChamberEntrance_TopMid);
|
||||
MapGridSetMetatileIdAt(18, 8, METATILE_Cave_SealedChamberEntrance_TopRight);
|
||||
MapGridSetMetatileIdAt(16, 9, METATILE_Cave_SealedChamberEntrance_BottomLeft | METATILE_COLLISION_MASK);
|
||||
MapGridSetMetatileIdAt(17, 9, METATILE_Cave_SealedChamberEntrance_BottomMid);
|
||||
MapGridSetMetatileIdAt(18, 9, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK);
|
||||
DrawWholeMapView();
|
||||
PlaySE(SE_BAN);
|
||||
FlagSet(FLAG_SYS_BRAILLE_DIG);
|
||||
@ -164,7 +164,7 @@ void DoBrailleRegisteelEffect(void)
|
||||
|
||||
bool8 FldEff_UseFlyAncientTomb(void)
|
||||
{
|
||||
u8 taskId = oei_task_add();
|
||||
u8 taskId = CreateFieldMoveTask();
|
||||
|
||||
gTasks[taskId].data[8] = (u32)UseRegisteelHm_Callback >> 16;
|
||||
gTasks[taskId].data[9] = (u32)UseRegisteelHm_Callback;
|
||||
@ -279,12 +279,12 @@ void UseRegirockHm_Callback(void)
|
||||
|
||||
void DoBrailleRegirockEffect(void)
|
||||
{
|
||||
MapGridSetMetatileIdAt(14, 26, METATILE_ID(Cave, SealedChamberEntrance_TopLeft));
|
||||
MapGridSetMetatileIdAt(15, 26, METATILE_ID(Cave, SealedChamberEntrance_TopMid));
|
||||
MapGridSetMetatileIdAt(16, 26, METATILE_ID(Cave, SealedChamberEntrance_TopRight));
|
||||
MapGridSetMetatileIdAt(14, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | METATILE_COLLISION_MASK);
|
||||
MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
|
||||
MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | METATILE_COLLISION_MASK);
|
||||
MapGridSetMetatileIdAt(14, 26, METATILE_Cave_SealedChamberEntrance_TopLeft);
|
||||
MapGridSetMetatileIdAt(15, 26, METATILE_Cave_SealedChamberEntrance_TopMid);
|
||||
MapGridSetMetatileIdAt(16, 26, METATILE_Cave_SealedChamberEntrance_TopRight);
|
||||
MapGridSetMetatileIdAt(14, 27, METATILE_Cave_SealedChamberEntrance_BottomLeft | METATILE_COLLISION_MASK);
|
||||
MapGridSetMetatileIdAt(15, 27, METATILE_Cave_SealedChamberEntrance_BottomMid);
|
||||
MapGridSetMetatileIdAt(16, 27, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK);
|
||||
DrawWholeMapView();
|
||||
PlaySE(SE_BAN);
|
||||
FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED);
|
||||
@ -318,12 +318,12 @@ void UseRegisteelHm_Callback(void)
|
||||
|
||||
void DoBrailleRegisteelEffect(void)
|
||||
{
|
||||
MapGridSetMetatileIdAt(14, 26, METATILE_ID(Cave, SealedChamberEntrance_TopLeft));
|
||||
MapGridSetMetatileIdAt(15, 26, METATILE_ID(Cave, SealedChamberEntrance_TopMid));
|
||||
MapGridSetMetatileIdAt(16, 26, METATILE_ID(Cave, SealedChamberEntrance_TopRight));
|
||||
MapGridSetMetatileIdAt(14, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | METATILE_COLLISION_MASK);
|
||||
MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
|
||||
MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | METATILE_COLLISION_MASK);
|
||||
MapGridSetMetatileIdAt(14, 26, METATILE_Cave_SealedChamberEntrance_TopLeft);
|
||||
MapGridSetMetatileIdAt(15, 26, METATILE_Cave_SealedChamberEntrance_TopMid);
|
||||
MapGridSetMetatileIdAt(16, 26, METATILE_Cave_SealedChamberEntrance_TopRight);
|
||||
MapGridSetMetatileIdAt(14, 27, METATILE_Cave_SealedChamberEntrance_BottomLeft | METATILE_COLLISION_MASK);
|
||||
MapGridSetMetatileIdAt(15, 27, METATILE_Cave_SealedChamberEntrance_BottomMid);
|
||||
MapGridSetMetatileIdAt(16, 27, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK);
|
||||
DrawWholeMapView();
|
||||
PlaySE(SE_BAN);
|
||||
FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED);
|
||||
@ -410,7 +410,7 @@ bool32 BrailleWait_CheckButtonPress(void)
|
||||
// this used to be FldEff_UseFlyAncientTomb . why did GF merge the 2 functions?
|
||||
bool8 FldEff_UsePuzzleEffect(void)
|
||||
{
|
||||
u8 taskId = oei_task_add();
|
||||
u8 taskId = CreateFieldMoveTask();
|
||||
|
||||
if (sBraillePuzzleCallbackFlag == REGISTEEL_PUZZLE)
|
||||
{
|
||||
|
||||
@ -8,70 +8,70 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Ash;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Splash;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Bird;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle;
|
||||
const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza;
|
||||
|
||||
const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
|
||||
&gFieldEffectObjectTemplate_ShadowSmall,
|
||||
&gFieldEffectObjectTemplate_ShadowMedium,
|
||||
&gFieldEffectObjectTemplate_ShadowLarge,
|
||||
&gFieldEffectObjectTemplate_ShadowExtraLarge,
|
||||
&gFieldEffectObjectTemplate_TallGrass,
|
||||
&gFieldEffectObjectTemplate_Ripple,
|
||||
&gFieldEffectObjectTemplate_Ash,
|
||||
&gFieldEffectObjectTemplate_SurfBlob,
|
||||
&gFieldEffectObjectTemplate_Arrow,
|
||||
&gFieldEffectObjectTemplate_GroundImpactDust,
|
||||
&gFieldEffectObjectTemplate_BikeHopTallGrass,
|
||||
&gFieldEffectObjectTemplate_SandFootprints,
|
||||
&gFieldEffectObjectTemplate_BikeHopBigSplash,
|
||||
&gFieldEffectObjectTemplate_Splash,
|
||||
&gFieldEffectObjectTemplate_BikeHopSmallSplash,
|
||||
&gFieldEffectObjectTemplate_LongGrass,
|
||||
&gFieldEffectObjectTemplate_Unknown16,
|
||||
&gFieldEffectObjectTemplate_Unknown17,
|
||||
&gFieldEffectObjectTemplate_Unknown18,
|
||||
&gFieldEffectObjectTemplate_Unknown19,
|
||||
&gFieldEffectObjectTemplate_Unknown20,
|
||||
&gFieldEffectObjectTemplate_Unknown21,
|
||||
&gFieldEffectObjectTemplate_BerryTreeGrowthSparkle,
|
||||
&gFieldEffectObjectTemplate_DeepSandFootprints,
|
||||
&gFieldEffectObjectTemplate_TreeDisguise,
|
||||
&gFieldEffectObjectTemplate_MountainDisguise,
|
||||
&gFieldEffectObjectTemplate_Bird,
|
||||
&gFieldEffectObjectTemplate_BikeTireTracks,
|
||||
&gFieldEffectObjectTemplate_SandDisguisePlaceholder,
|
||||
&gFieldEffectObjectTemplate_Unknown29,
|
||||
&gFieldEffectObjectTemplate_ShortGrass,
|
||||
&gFieldEffectObjectTemplate_HotSpringsWater,
|
||||
&gFieldEffectObjectTemplate_JumpOutOfAsh,
|
||||
&gFieldEffectObjectTemplate_LavaridgeGymWarp,
|
||||
&gFieldEffectObjectTemplate_Bubbles,
|
||||
&gFieldEffectObjectTemplate_Unknown35,
|
||||
&gFieldEffectObjectTemplate_Rayquaza,
|
||||
[FLDEFFOBJ_SHADOW_S] = &gFieldEffectObjectTemplate_ShadowSmall,
|
||||
[FLDEFFOBJ_SHADOW_M] = &gFieldEffectObjectTemplate_ShadowMedium,
|
||||
[FLDEFFOBJ_SHADOW_L] = &gFieldEffectObjectTemplate_ShadowLarge,
|
||||
[FLDEFFOBJ_SHADOW_XL] = &gFieldEffectObjectTemplate_ShadowExtraLarge,
|
||||
[FLDEFFOBJ_TALL_GRASS] = &gFieldEffectObjectTemplate_TallGrass,
|
||||
[FLDEFFOBJ_RIPPLE] = &gFieldEffectObjectTemplate_Ripple,
|
||||
[FLDEFFOBJ_ASH] = &gFieldEffectObjectTemplate_Ash,
|
||||
[FLDEFFOBJ_SURF_BLOB] = &gFieldEffectObjectTemplate_SurfBlob,
|
||||
[FLDEFFOBJ_ARROW] = &gFieldEffectObjectTemplate_Arrow,
|
||||
[FLDEFFOBJ_GROUND_IMPACT_DUST] = &gFieldEffectObjectTemplate_GroundImpactDust,
|
||||
[FLDEFFOBJ_JUMP_TALL_GRASS] = &gFieldEffectObjectTemplate_JumpTallGrass,
|
||||
[FLDEFFOBJ_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_SandFootprints,
|
||||
[FLDEFFOBJ_JUMP_BIG_SPLASH] = &gFieldEffectObjectTemplate_JumpBigSplash,
|
||||
[FLDEFFOBJ_SPLASH] = &gFieldEffectObjectTemplate_Splash,
|
||||
[FLDEFFOBJ_JUMP_SMALL_SPLASH] = &gFieldEffectObjectTemplate_JumpSmallSplash,
|
||||
[FLDEFFOBJ_LONG_GRASS] = &gFieldEffectObjectTemplate_LongGrass,
|
||||
[FLDEFFOBJ_JUMP_LONG_GRASS] = &gFieldEffectObjectTemplate_JumpLongGrass,
|
||||
[FLDEFFOBJ_UNUSED_GRASS] = &gFieldEffectObjectTemplate_UnusedGrass,
|
||||
[FLDEFFOBJ_UNUSED_GRASS_2] = &gFieldEffectObjectTemplate_UnusedGrass2,
|
||||
[FLDEFFOBJ_UNUSED_SAND] = &gFieldEffectObjectTemplate_UnusedSand,
|
||||
[FLDEFFOBJ_WATER_SURFACING] = &gFieldEffectObjectTemplate_WaterSurfacing,
|
||||
[FLDEFFOBJ_REFLECTION_DISTORTION] = &gFieldEffectObjectTemplate_ReflectionDistortion,
|
||||
[FLDEFFOBJ_SPARKLE] = &gFieldEffectObjectTemplate_Sparkle,
|
||||
[FLDEFFOBJ_DEEP_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_DeepSandFootprints,
|
||||
[FLDEFFOBJ_TREE_DISGUISE] = &gFieldEffectObjectTemplate_TreeDisguise,
|
||||
[FLDEFFOBJ_MOUNTAIN_DISGUISE] = &gFieldEffectObjectTemplate_MountainDisguise,
|
||||
[FLDEFFOBJ_BIRD] = &gFieldEffectObjectTemplate_Bird,
|
||||
[FLDEFFOBJ_BIKE_TIRE_TRACKS] = &gFieldEffectObjectTemplate_BikeTireTracks,
|
||||
[FLDEFFOBJ_SAND_DISGUISE] = &gFieldEffectObjectTemplate_SandDisguisePlaceholder,
|
||||
[FLDEFFOBJ_SAND_PILE] = &gFieldEffectObjectTemplate_SandPile,
|
||||
[FLDEFFOBJ_SHORT_GRASS] = &gFieldEffectObjectTemplate_ShortGrass,
|
||||
[FLDEFFOBJ_HOT_SPRINGS_WATER] = &gFieldEffectObjectTemplate_HotSpringsWater,
|
||||
[FLDEFFOBJ_ASH_PUFF] = &gFieldEffectObjectTemplate_AshPuff,
|
||||
[FLDEFFOBJ_ASH_LAUNCH] = &gFieldEffectObjectTemplate_AshLaunch,
|
||||
[FLDEFFOBJ_BUBBLES] = &gFieldEffectObjectTemplate_Bubbles,
|
||||
[FLDEFFOBJ_SMALL_SPARKLE] = &gFieldEffectObjectTemplate_SmallSparkle,
|
||||
[FLDEFFOBJ_RAYQUAZA] = &gFieldEffectObjectTemplate_Rayquaza,
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3426,7 +3426,7 @@ const struct Item gItems[] =
|
||||
.pocket = POCKET_KEY_ITEMS,
|
||||
.type = 2,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_Rod,
|
||||
.secondaryId = 0,
|
||||
.secondaryId = OLD_ROD,
|
||||
},
|
||||
|
||||
[ITEM_GOOD_ROD] =
|
||||
@ -3440,7 +3440,7 @@ const struct Item gItems[] =
|
||||
.pocket = POCKET_KEY_ITEMS,
|
||||
.type = 2,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_Rod,
|
||||
.secondaryId = 1,
|
||||
.secondaryId = GOOD_ROD,
|
||||
},
|
||||
|
||||
[ITEM_SUPER_ROD] =
|
||||
@ -3454,7 +3454,7 @@ const struct Item gItems[] =
|
||||
.pocket = POCKET_KEY_ITEMS,
|
||||
.type = 2,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_Rod,
|
||||
.secondaryId = 2,
|
||||
.secondaryId = SUPER_ROD,
|
||||
},
|
||||
|
||||
[ITEM_SS_TICKET] =
|
||||
|
||||
@ -252,7 +252,7 @@ const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/m
|
||||
const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal");
|
||||
const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/object_events/pics/misc/ss_tidal.4bpp");
|
||||
const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal");
|
||||
const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effects/pics/berry_tree_growth_sparkle.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Sparkle[] = INCBIN_U32("graphics/field_effects/pics/sparkle.4bpp");
|
||||
const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp");
|
||||
const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp");
|
||||
const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp");
|
||||
@ -293,43 +293,43 @@ const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/field_effec
|
||||
const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/field_effects/pics/shadow_medium.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_large.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_extra_large.4bpp");
|
||||
const u32 filler_8368A08[0x48] = {};
|
||||
static const u32 sFiller[0x48] = {};
|
||||
const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effects/pics/cut_grass.4bpp");
|
||||
const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effects/pics/cut_grass.4bpp");
|
||||
const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effects/palettes/06.gbapal");
|
||||
const u16 gFieldEffectPal_CutGrass[] = INCBIN_U16("graphics/field_effects/palettes/cut_grass.gbapal");
|
||||
const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/field_effects/pics/ripple.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/field_effects/pics/ash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/field_effects/pics/arrow.4bpp");
|
||||
const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/00.gbapal");
|
||||
const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/01.gbapal");
|
||||
const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/general_0.gbapal");
|
||||
const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal");
|
||||
const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/field_effects/pics/ground_impact_dust.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_tall_grass.4bpp");
|
||||
const u32 gUnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp");
|
||||
const u32 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U32("graphics/field_effects/pics/jump_tall_grass.4bpp");
|
||||
const u32 gUnusedGrass3[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_3.4bpp");
|
||||
const u32 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/field_effects/pics/unknown_17.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/field_effects/pics/unknown_18.4bpp");
|
||||
const u32 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_2.4bpp");
|
||||
const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/field_effects/pics/long_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/field_effects/pics/tall_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/field_effects/pics/short_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/field_effects/pics/sand_footprints.4bpp");
|
||||
const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/field_effects/pics/deep_sand_footprints.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/field_effects/pics/bike_tire_tracks.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/field_effects/pics/unknown_19.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/field_effects/pics/unknown_29.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_big_splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U32("graphics/field_effects/pics/unused_sand.4bpp");
|
||||
const u32 gFieldEffectObjectPic_SandPile[] = INCBIN_U32("graphics/field_effects/pics/sand_pile.4bpp");
|
||||
const u32 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U32("graphics/field_effects/pics/jump_big_splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/field_effects/pics/splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_small_splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/field_effects/pics/unknown_20.4bpp");
|
||||
const u32 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/jump_small_splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U32("graphics/field_effects/pics/water_surfacing.4bpp");
|
||||
const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effects/pics/tree_disguise.4bpp");
|
||||
const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effects/pics/mountain_disguise.4bpp");
|
||||
const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/field_effects/pics/sand_disguise_placeholder.4bpp");
|
||||
const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effects/pics/hot_springs_water.4bpp");
|
||||
const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effects/palettes/02.gbapal");
|
||||
const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/field_effects/pics/jump_out_of_ash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/field_effects/pics/lavaridge_gym_warp.4bpp");
|
||||
const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/field_effects/palettes/ash.gbapal");
|
||||
const u32 gFieldEffectObjectPic_AshPuff[] = INCBIN_U32("graphics/field_effects/pics/ash_puff.4bpp");
|
||||
const u32 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U32("graphics/field_effects/pics/ash_launch.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/field_effects/pics/bubbles.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/field_effects/pics/unknown_35.4bpp");
|
||||
const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effects/palettes/03.gbapal");
|
||||
const u32 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U32("graphics/field_effects/pics/small_sparkle.4bpp");
|
||||
const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/field_effects/palettes/small_sparkle.gbapal");
|
||||
const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/field_effects/pics/bird.4bpp");
|
||||
const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp");
|
||||
const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/object_events/pics/people/scott.4bpp");
|
||||
|
||||
@ -4629,7 +4629,7 @@ static void sub_802A7A8(void)
|
||||
ChangeBgX(3, 0, 0);
|
||||
ChangeBgY(3, 0, 0);
|
||||
InitStandardTextBoxWindows();
|
||||
sub_8197200();
|
||||
InitTextBoxGfxAndPrinters();
|
||||
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
|
||||
SetBgTilemapBuffer(3, gUnknown_02022CF8->tilemapBuffers[0]);
|
||||
SetBgTilemapBuffer(1, gUnknown_02022CF8->tilemapBuffers[1]);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user