field_effect dataroms

quite a few pointers and stuff done

3 files changed, 209 insertions, 32 deletions

diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s
index 97086af0d..015318e5a 100644
--- a/data/field_effect_helpers.s
+++ b/data/field_effect_helpers.s
@@ -7,19 +7,27 @@ gUnknown_085CDC38:: @ 85CDC38
 	.incbin "baserom.gba", 0x5cdc38, 0x6
 
 gUnknown_085CDC3E:: @ 85CDC3E
-	.incbin "baserom.gba", 0x5cdc3e, 0x4
+@ replacing .incbin "baserom.gba", 0x005cdc3e, 0x4
+.byte 0x00, 0x01, 0x02, 0x03
 
 gUnknown_085CDC42:: @ 85CDC42
-	.incbin "baserom.gba", 0x5cdc42, 0xa
+@ replacing .incbin "baserom.gba", 0x005cdc42, 0xa
+.2byte 0x0004, 0x0004, 0x0004, 0x0010, 0x0000
 
 gUnknown_085CDC4C:: @ 85CDC4C
-	.incbin "baserom.gba", 0x5cdc4c, 0x8
+@ replacing .incbin "baserom.gba", 0x005cdc4c, 0x8
+.4byte sub_8154C7C
+.4byte sub_8154CA0
 
 gUnknown_085CDC54:: @ 85CDC54
-	.incbin "baserom.gba", 0x5cdc54, 0xc
+@ replacing .incbin "baserom.gba", 0x005cdc54, 0xc
+.4byte sub_815547C
+.4byte sub_81554AC
+.4byte sub_815550C
 
 gUnknown_085CDC60:: @ 85CDC60
 	.incbin "baserom.gba", 0x5cdc60, 0xa
 
 gUnknown_085CDC6A:: @ 85CDC6A
 	.incbin "baserom.gba", 0x5cdc6a, 0x96
+
diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s
index 8b8b00cf9..78742a058 100644
--- a/data/field_ground_effect.s
+++ b/data/field_ground_effect.s
@@ -5,34 +5,110 @@
     .align 2, 0
 
 gUnknown_0850E5DC:: @ 850E5DC
-	.incbin "baserom.gba", 0x50e5dc, 0x8
+@ replacing .incbin "baserom.gba", 0x0050e5dc, 0x8
+.4byte 0x00000020, 0x00000010
 
 gUnknown_0850E5E4:: @ 850E5E4
-	.incbin "baserom.gba", 0x50e5e4, 0x18
+@ replacing .incbin "baserom.gba", 0x0050e5e4, 0x18
+.4byte MetatileBehavior_IsTallGrass
+.4byte MetatileBehavior_IsLongGrass
+.4byte MetatileBehavior_IsPuddle
+.4byte MetatileBehavior_IsSurfableWaterOrUnderwater
+.4byte MetatileBehavior_IsShallowFlowingWater
+.4byte ShouldDoJumpLandingDustEffect
 
 gUnknown_0850E5FC:: @ 850E5FC
-	.incbin "baserom.gba", 0x50e5fc, 0x18
+@ replacing .incbin "baserom.gba", 0x0050e5fc, 0x18
+.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
 
 gUnknown_0850E614:: @ 850E614
-	.incbin "baserom.gba", 0x50e614, 0x10
+@ replacing .incbin "baserom.gba", 0x0050e614, 0x10
+.4byte MetatileBehavior_IsJumpSouth
+.4byte MetatileBehavior_IsJumpNorth
+.4byte MetatileBehavior_IsJumpWest
+.4byte MetatileBehavior_IsJumpEast
 
 gUnknown_0850E624:: @ 850E624
-	.incbin "baserom.gba", 0x50e624, 0x10
+@ replacing .incbin "baserom.gba", 0x0050e624, 0x10
+.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
 
 gUnknown_0850E634:: @ 850E634
-	.incbin "baserom.gba", 0x50e634, 0x10
+@ replacing .incbin "baserom.gba", 0x0050e634, 0x10
+.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
 
 gUnknown_0850E644:: @ 850E644
-	.incbin "baserom.gba", 0x50e644, 0x10
+@ replacing .incbin "baserom.gba", 0x0050e644, 0x10
+.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
 
 gUnknown_0850E654:: @ 850E654
-	.incbin "baserom.gba", 0x50e654, 0xc
+@ replacing .incbin "baserom.gba", 0x0050e654, 0xc
+.4byte DoTracksGroundEffect_None
+.4byte DoTracksGroundEffect_Footprints
+.4byte DoTracksGroundEffect_BikeTireTracks
 
 gUnknown_0850E660:: @ 850E660
 	.incbin "baserom.gba", 0x50e660, 0x4
 
 gUnknown_0850E664:: @ 850E664
-	.incbin "baserom.gba", 0x50e664, 0x10
+@ replacing .incbin "baserom.gba", 0x0050e664, 0x10
+.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
 
 gUnknown_0850E674:: @ 850E674
-	.incbin "baserom.gba", 0x50e674, 0xe0
+@ replacing .incbin "baserom.gba", 0x0050e674, 0xe0
+.4byte GroundEffect_SpawnOnTallGrass
+.4byte GroundEffect_StepOnTallGrass
+.4byte GroundEffect_SpawnOnLongGrass
+.4byte GroundEffect_StepOnLongGrass
+.4byte GroundEffect_WaterReflection
+.4byte GroundEffect_IceReflection
+.4byte GroundEffect_FlowingWater
+.4byte GroundEffect_SandTracks
+.4byte GroundEffect_DeepSandTracks
+.4byte GroundEffect_Ripple
+.4byte GroundEffect_StepOnPuddle
+.4byte GroundEffect_SandHeap
+.4byte GroundEffect_JumpOnTallGrass
+.4byte GroundEffect_JumpOnLongGrass
+.4byte GroundEffect_JumpOnShallowWater
+.4byte GroundEffect_JumpOnWater
+.4byte GroundEffect_JumpLandingDust
+.4byte GroundEffect_ShortGrass
+.4byte GroundEffect_HotSprings
+.4byte GroundEffect_Seaweed
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte little_step
+.4byte double_little_steps
+.4byte double_little_steps
+.4byte double_little_steps
+.4byte double_little_steps
+.4byte double_little_steps
+.4byte double_little_steps
+.4byte double_little_steps
+.4byte double_little_steps
+.4byte double_little_steps
+.4byte triple_little_steps
+.4byte triple_little_steps
+.4byte double_little_steps
+.4byte triple_little_steps
+.4byte triple_little_steps
+.4byte quad_little_steps
+.4byte quad_little_steps
+.4byte quad_little_steps
+.4byte quad_little_steps
+.4byte oct_little_steps
+.4byte oct_little_steps
+
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
index 952485463..082f04d64 100644
--- a/data/field_player_avatar.s
+++ b/data/field_player_avatar.s
@@ -8,52 +8,127 @@
 
 
 gUnknown_084973FC:: @ 84973FC
-	.incbin "baserom.gba", 0x4973fc, 0x48
+@ replacing .incbin "baserom.gba", 0x004973fc, 0x48
+.4byte MetatileBehavior_IsTrickHouseSlipperyFloor
+.4byte MetatileBehavior_IsIce_2
+.4byte MetatileBehavior_IsWalkSouth
+.4byte MetatileBehavior_IsWalkNorth
+.4byte MetatileBehavior_IsWalkWest
+.4byte MetatileBehavior_IsWalkEast
+.4byte MetatileBehavior_IsSouthwardCurrent
+.4byte MetatileBehavior_IsNorthwardCurrent
+.4byte MetatileBehavior_IsWestwardCurrent
+.4byte MetatileBehavior_IsEastwardCurrent
+.4byte MetatileBehavior_IsSlideSouth
+.4byte MetatileBehavior_IsSlideNorth
+.4byte MetatileBehavior_IsSlideWest
+.4byte MetatileBehavior_IsSlideEast
+.4byte MetatileBehavior_IsWaterfall
+.4byte MetatileBehavior_IsSecretBaseJumpMat
+.4byte MetatileBehavior_IsSecretBaseSpinMat
+.4byte MetatileBehavior_IsMuddySlope
 
 gUnknown_08497444:: @ 8497444
-	.incbin "baserom.gba", 0x497444, 0x4c
+@ replacing .incbin "baserom.gba", 0x00497444, 0x4c
+.4byte ForcedMovement_None
+.4byte ForcedMovement_Slip
+.4byte ForcedMovement_Slip
+.4byte ForcedMovement_WalkSouth
+.4byte ForcedMovement_WalkNorth
+.4byte ForcedMovement_WalkWest
+.4byte ForcedMovement_WalkEast
+.4byte ForcedMovement_PushedSouthByCurrent
+.4byte ForcedMovement_PushedNorthByCurrent
+.4byte ForcedMovement_PushedWestByCurrent
+.4byte ForcedMovement_PushedEastByCurrent
+.4byte ForcedMovement_SlideSouth
+.4byte ForcedMovement_SlideNorth
+.4byte ForcedMovement_SlideWest
+.4byte ForcedMovement_SlideEast
+.4byte ForcedMovement_PushedSouthByCurrent
+.4byte ForcedMovement_0xBB
+.4byte ForcedMovement_0xBC
+.4byte ForcedMovement_MuddySlope
 
 gUnknown_08497490:: @ 8497490
-	.incbin "baserom.gba", 0x497490, 0xc
+@ replacing .incbin "baserom.gba", 0x00497490, 0xc
+.4byte PlayerNotOnBikeNotMoving
+.4byte PlayerNotOnBikeTurningInPlace
+.4byte PlayerNotOnBikeMoving
 
 gUnknown_0849749C:: @ 849749C
-	.incbin "baserom.gba", 0x49749c, 0x14
+@ replacing .incbin "baserom.gba", 0x0049749c, 0x14
+.4byte MetatileBehavior_IsBumpySlope
+.4byte MetatileBehavior_IsIsolatedVerticalRail
+.4byte MetatileBehavior_IsIsolatedHorizontalRail
+.4byte MetatileBehavior_IsVerticalRail
+.4byte MetatileBehavior_IsHorizontalRail
 
 gUnknown_084974B0:: @ 84974B0
-	.incbin "baserom.gba", 0x4974b0, 0x8
+@ replacing .incbin "baserom.gba", 0x004974b0, 0x8
+.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x00, 0x00
 
 gUnknown_084974B8:: @ 84974B8
-	.incbin "baserom.gba", 0x4974b8, 0x20
+@ replacing .incbin "baserom.gba", 0x004974b8, 0x20
+.4byte PlayerAvatarTransition_Normal
+.4byte PlayerAvatarTransition_MachBike
+.4byte PlayerAvatarTransition_AcroBike
+.4byte PlayerAvatarTransition_Surfing
+.4byte PlayerAvatarTransition_Underwater
+.4byte PlayerAvatarTransition_ReturnToField
+.4byte PlayerAvatarTransition_Dummy
+.4byte PlayerAvatarTransition_Dummy
 
 gUnknown_084974D8:: @ 84974D8
-	.incbin "baserom.gba", 0x4974d8, 0x10
+@ replacing .incbin "baserom.gba", 0x004974d8, 0x10
+.4byte MetatileBehavior_IsSouthArrowWarp
+.4byte MetatileBehavior_IsNorthArrowWarp
+.4byte MetatileBehavior_IsWestArrowWarp
+.4byte MetatileBehavior_IsEastArrowWarp
 
 gUnknown_084974E8:: @ 84974E8
-	.incbin "baserom.gba", 0x4974e8, 0x10
+@ replacing .incbin "baserom.gba", 0x004974e8, 0x10
+.byte 0x64, 0x69, 0x65, 0x6a, 0x66, 0x6b, 0x67, 0x6c, 0x6f, 0x70, 0x68, 0x6d, 0x89, 0x8a, 0xbf, 0xc0
 
 gUnknown_084974F8:: @ 84974F8
-	.incbin "baserom.gba", 0x4974f8, 0x10
+@ replacing .incbin "baserom.gba", 0x004974f8, 0x10
+.byte 0x00, 0x59, 0x01, 0x5a, 0x3f, 0x5b, 0x02, 0x5c, 0x6f, 0x70, 0x03, 0x5d, 0x89, 0x8a, 0xbf, 0xc0
 
 gUnknown_08497508:: @ 8497508
-	.incbin "baserom.gba", 0x497508, 0x2
+@ replacing .incbin "baserom.gba", 0x00497508, 0x2
+.byte 0xe6, 0xe7
 
 gUnknown_0849750A:: @ 849750A
-	.incbin "baserom.gba", 0x49750a, 0x2
+@ replacing .incbin "baserom.gba", 0x0049750a, 0x2
+.byte 0xeb, 0xec
 
 gUnknown_0849750C:: @ 849750C
-	.incbin "baserom.gba", 0x49750c, 0x14
+@ replacing .incbin "baserom.gba", 0x0049750c, 0x14
+.byte 0x00, 0x01, 0x01, 0x02, 0x3f, 0x04, 0x02, 0x08, 0x6f, 0x10, 0x59, 0x01, 0x5a, 0x02, 0x5b, 0x04, 0x5c, 0x08, 0x70, 0x10
 
 gUnknown_08497520:: @ 8497520
-	.incbin "baserom.gba", 0x497520, 0x10
+@ replacing .incbin "baserom.gba", 0x00497520, 0x10
+.4byte MetatileBehavior_IsSouthArrowWarp
+.4byte MetatileBehavior_IsNorthArrowWarp
+.4byte MetatileBehavior_IsWestArrowWarp
+.4byte MetatileBehavior_IsEastArrowWarp
 
 gUnknown_08497530:: @ 8497530
-	.incbin "baserom.gba", 0x497530, 0xc
+@ replacing .incbin "baserom.gba", 0x00497530, 0xc
+.4byte sub_808C3A4
+.4byte do_boulder_dust
+.4byte sub_808C484
 
 gUnknown_0849753C:: @ 849753C
-	.incbin "baserom.gba", 0x49753c, 0x4
+@ replacing .incbin "baserom.gba", 0x0049753c, 0x4
+.4byte sub_808C544
 
 gUnknown_08497540:: @ 8497540
-	.incbin "baserom.gba", 0x497540, 0x10
+@ replacing .incbin "baserom.gba", 0x00497540, 0x10
+.4byte sub_808C61C
+.4byte sub_808C644
+.4byte sub_808C6BC
+.4byte sub_808C6FC
 
 gUnknown_08497550:: @ 8497550
 	.incbin "baserom.gba", 0x497550, 0x4
@@ -62,7 +137,23 @@ gUnknown_08497554:: @ 8497554
 	.incbin "baserom.gba", 0x497554, 0x8
 
 gUnknown_0849755C:: @ 849755C
-	.incbin "baserom.gba", 0x49755c, 0x40
+@ replacing .incbin "baserom.gba", 0x0049755c, 0x40
+.4byte fish0
+.4byte fish1
+.4byte fish2
+.4byte fish3
+.4byte fish4
+.4byte fish5
+.4byte fish6
+.4byte fish7
+.4byte fish8
+.4byte fish9
+.4byte fishA_wait_for_a_pressed
+.4byte fishB
+.4byte fishC
+.4byte fishD
+.4byte fishE
+.4byte fishF
 
 gUnknown_0849759C:: @ 849759C
 	.incbin "baserom.gba", 0x49759c, 0x6
@@ -80,4 +171,6 @@ gUnknown_084975B0:: @ 84975B0
 	.incbin "baserom.gba", 0x4975b0, 0xc
 
 gUnknown_084975BC:: @ 84975BC
-	.incbin "baserom.gba", 0x4975bc, 0x8
+@ replacing .incbin "baserom.gba", 0x004975bc, 0x8
+.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
+