Dump data/field_player_avatar.s

2 files changed, 89 insertions, 24 deletions

diff --git a/baserom.ips b/baserom.ips
index b8a3107e4..d7de0a120 100644
--- a/baserom.ips
+++ b/baserom.ips
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
index c11bc74b3..d89daa03c 100644
--- a/data/field_player_avatar.s
+++ b/data/field_player_avatar.s
@@ -1,73 +1,138 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 	.section .rodata
 	.align 2
 gUnknown_835B764:: @ 835B764
-	.incbin "baserom.gba", 0x35B764, 0xB0
+	.4byte MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip
+	.4byte MetatileBehavior_IsIce_2, ForcedMovement_Slip
+	.4byte MetatileBehavior_IsWalkSouth, sub_805B750
+	.4byte MetatileBehavior_IsWalkNorth, sub_805B768
+	.4byte MetatileBehavior_IsWalkWest, sub_805B780
+	.4byte MetatileBehavior_IsWalkEast, sub_805B798
+	.4byte MetatileBehavior_IsSouthwardCurrent, sub_805B82C
+	.4byte MetatileBehavior_IsNorthwardCurrent, sub_805B844
+	.4byte MetatileBehavior_IsWestwardCurrent, sub_805B85C
+	.4byte MetatileBehavior_IsEastwardCurrent, sub_805B874
+	.4byte MetatileBehavior_UnusedIsSpinRight, sub_805B7B0
+	.4byte MetatileBehavior_UnusedIsSpinLeft, sub_805B7CC
+	.4byte MetatileBehavior_UnusedIsSpinUp, sub_805B7E8
+	.4byte MetatileBehavior_UnusedIsSpinDown, sub_805B804
+	.4byte MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth
+	.4byte MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth
+	.4byte MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest
+	.4byte MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast
+	.4byte MetatileBehavior_IsWaterfall, sub_805B82C
+	.4byte MetatileBehavior_UnusedReturnFalse_7, sub_805B924
+	.4byte MetatileBehavior_UnusedReturnFalse_8, sub_805B930
+	.4byte NULL, ForcedMovement_None
 
 gUnknown_835B814:: @ 835B814
-	.incbin "baserom.gba", 0x35B814, 0xC
+	.4byte PlayerNotOnBikeNotMoving
+	.4byte sub_805B9C4
+	.4byte sub_805B9D4
 
 gUnknown_835B820:: @ 835B820
-	.incbin "baserom.gba", 0x35B820, 0x8
+	.byte 0x04, 0x04, 0x05, 0x06, 0x07
 
+	.align 2
 gUnknown_835B828:: @ 835B828
-	.incbin "baserom.gba", 0x35B828, 0x14
+	.4byte MetatileBehavior_ReturnFalse_14
+	.4byte MetatileBehavior_ReturnFalse_15
+	.4byte MetatileBehavior_ReturnFalse_16
+	.4byte MetatileBehavior_ReturnFalse_17
+	.4byte MetatileBehavior_ReturnFalse_18
 
 gUnknown_835B83C:: @ 835B83C
-	.incbin "baserom.gba", 0x35B83C, 0x8
+	.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d
 
+	.align 2
 gUnknown_835B844:: @ 835B844
-	.incbin "baserom.gba", 0x35B844, 0x20
+	.4byte sub_805BE60
+	.4byte sub_805BE74
+	.4byte sub_805BE74
+	.4byte sub_805BE90
+	.4byte nullsub_23
+	.4byte PlayerAvatarTransition_ReturnToField
+	.4byte nullsub_22
+	.4byte nullsub_22
 
 gUnknown_835B864:: @ 835B864
-	.incbin "baserom.gba", 0x35B864, 0x10
+	.4byte MetatileBehavior_IsSouthArrowWarp
+	.4byte MetatileBehavior_IsNorthArrowWarp
+	.4byte MetatileBehavior_IsWestArrowWarp
+	.4byte MetatileBehavior_IsEastArrowWarp
 
 gUnknown_835B874:: @ 835B874
-	.incbin "baserom.gba", 0x35B874, 0xC
+	.byte 0x00, 0x07, 0x01, 0x08, 0x02, 0x09, 0x03, 0x0a, 0x04, 0x0b, 0x05, 0x0c
 
 gUnknown_835B880:: @ 835B880
-	.incbin "baserom.gba", 0x35B880, 0x2
+	.byte 0x0e, 0x0f
 
 gUnknown_835B882:: @ 835B882
-	.incbin "baserom.gba", 0x35B882, 0xC
+	.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x08, 0x07, 0x01, 0x08, 0x02, 0x09, 0x08
 
 gUnknown_835B88E:: @ 835B88E
-	.incbin "baserom.gba", 0x35B88E, 0x2
+	.byte 0x06, 0x0d
 
 gUnknown_835B890:: @ 835B890
-	.incbin "baserom.gba", 0x35B890, 0x10
+	.4byte MetatileBehavior_IsSouthArrowWarp
+	.4byte MetatileBehavior_IsNorthArrowWarp
+	.4byte MetatileBehavior_IsWestArrowWarp
+	.4byte MetatileBehavior_IsEastArrowWarp
 
 gUnknown_835B8A0:: @ 835B8A0
-	.incbin "baserom.gba", 0x35B8A0, 0xC
+	.4byte sub_805CD64
+	.4byte sub_805CD84
+	.4byte sub_805CE20
 
 gUnknown_835B8AC:: @ 835B8AC
-	.incbin "baserom.gba", 0x35B8AC, 0x4
+	.4byte PlayerAvatar_DoSecretBaseMatJump
 
 gUnknown_835B8B0:: @ 835B8B0
-	.incbin "baserom.gba", 0x35B8B0, 0x10
+	.4byte sub_805CFC4
+	.4byte sub_805CFEC
+	.4byte sub_805D064
+	.4byte sub_805D0A4
 
 gUnknown_835B8C0:: @ 835B8C0
-	.incbin "baserom.gba", 0x35B8C0, 0x4
+	.byte 0x03, 0x04, 0x02, 0x01
 
 gUnknown_835B8C4:: @ 835B8C4
-	.incbin "baserom.gba", 0x35B8C4, 0x8
+	.byte 0x18, 0x18, 0x19, 0x1a, 0x1b
 
+	.align 2
 gUnknown_835B8CC:: @ 835B8CC
-	.incbin "baserom.gba", 0x35B8CC, 0x40
+	.4byte sub_805D33C
+	.4byte fish1
+	.4byte fish2
+	.4byte sub_805D430
+	.4byte sub_805D47C
+	.4byte sub_805D508
+	.4byte sub_805D574
+	.4byte sub_805D580
+	.4byte sub_805D5EC
+	.4byte sub_805D66C
+	.4byte sub_805D6C8
+	.4byte sub_805D7C0
+	.4byte sub_805D838
+	.4byte sub_805D8AC
+	.4byte sub_805D8D8
+	.4byte sub_805D980
 
 gUnknown_835B90C:: @ 835B90C
-	.incbin "baserom.gba", 0x35B90C, 0x6
+	.2byte 0x0001, 0x0001, 0x0001
 
 gUnknown_835B912:: @ 835B912
-	.incbin "baserom.gba", 0x35B912, 0x6
+	.2byte 0x0001, 0x0003, 0x0006
 
 gUnknown_835B918:: @ 835B918
-	.incbin "baserom.gba", 0x35B918, 0x2
+	.string "·$"
 
 gUnknown_835B91A:: @ 835B91A
-	.incbin "baserom.gba", 0x35B91A, 0x6
+	.2byte 0x0024, 0x0021, 0x001e
 
 gUnknown_835B920:: @ 835B920
-	.incbin "baserom.gba", 0x35B920, 0xC
+	.2byte 0x0000, 0x0000, 0x0028, 0x000a, 0x0046, 0x001e
 
 gUnknown_835B92C:: @ 835B92C
-	.incbin "baserom.gba", 0x35B92C, 0x8
+	.byte 0x01, 0x03, 0x04, 0x02, 0x01