Merge branch 'master' of https://github.com/pret/pokeemerald
also started fixing pointers in my dumps
This commit is contained in:
itskobold
+92
-110
@@ -8,127 +8,111 @@
|
||||
|
||||
|
||||
gUnknown_084973FC:: @ 84973FC
|
||||
@ 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
|
||||
.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
|
||||
@ 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
|
||||
.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
|
||||
@ replacing .incbin "baserom.gba", 0x00497490, 0xc
|
||||
.4byte PlayerNotOnBikeNotMoving
|
||||
.4byte PlayerNotOnBikeTurningInPlace
|
||||
.4byte PlayerNotOnBikeMoving
|
||||
.4byte PlayerNotOnBikeNotMoving
|
||||
.4byte PlayerNotOnBikeTurningInPlace
|
||||
.4byte PlayerNotOnBikeMoving
|
||||
|
||||
gUnknown_0849749C:: @ 849749C
|
||||
@ replacing .incbin "baserom.gba", 0x0049749c, 0x14
|
||||
.4byte MetatileBehavior_IsBumpySlope
|
||||
.4byte MetatileBehavior_IsIsolatedVerticalRail
|
||||
.4byte MetatileBehavior_IsIsolatedHorizontalRail
|
||||
.4byte MetatileBehavior_IsVerticalRail
|
||||
.4byte MetatileBehavior_IsHorizontalRail
|
||||
.4byte MetatileBehavior_IsBumpySlope
|
||||
.4byte MetatileBehavior_IsIsolatedVerticalRail
|
||||
.4byte MetatileBehavior_IsIsolatedHorizontalRail
|
||||
.4byte MetatileBehavior_IsVerticalRail
|
||||
.4byte MetatileBehavior_IsHorizontalRail
|
||||
|
||||
gUnknown_084974B0:: @ 84974B0
|
||||
@ replacing .incbin "baserom.gba", 0x004974b0, 0x8
|
||||
.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x00, 0x00
|
||||
.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x00, 0x00
|
||||
|
||||
gUnknown_084974B8:: @ 84974B8
|
||||
@ 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
|
||||
.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
|
||||
@ replacing .incbin "baserom.gba", 0x004974d8, 0x10
|
||||
.4byte MetatileBehavior_IsSouthArrowWarp
|
||||
.4byte MetatileBehavior_IsNorthArrowWarp
|
||||
.4byte MetatileBehavior_IsWestArrowWarp
|
||||
.4byte MetatileBehavior_IsEastArrowWarp
|
||||
.4byte MetatileBehavior_IsSouthArrowWarp
|
||||
.4byte MetatileBehavior_IsNorthArrowWarp
|
||||
.4byte MetatileBehavior_IsWestArrowWarp
|
||||
.4byte MetatileBehavior_IsEastArrowWarp
|
||||
|
||||
gUnknown_084974E8:: @ 84974E8
|
||||
@ replacing .incbin "baserom.gba", 0x004974e8, 0x10
|
||||
.byte 0x64, 0x69, 0x65, 0x6a, 0x66, 0x6b, 0x67, 0x6c, 0x6f, 0x70, 0x68, 0x6d, 0x89, 0x8a, 0xbf, 0xc0
|
||||
.byte 0x64, 0x69, 0x65, 0x6a, 0x66, 0x6b, 0x67, 0x6c, 0x6f, 0x70, 0x68, 0x6d, 0x89, 0x8a, 0xbf, 0xc0
|
||||
|
||||
gUnknown_084974F8:: @ 84974F8
|
||||
@ replacing .incbin "baserom.gba", 0x004974f8, 0x10
|
||||
.byte 0x00, 0x59, 0x01, 0x5a, 0x3f, 0x5b, 0x02, 0x5c, 0x6f, 0x70, 0x03, 0x5d, 0x89, 0x8a, 0xbf, 0xc0
|
||||
.byte 0x00, 0x59, 0x01, 0x5a, 0x3f, 0x5b, 0x02, 0x5c, 0x6f, 0x70, 0x03, 0x5d, 0x89, 0x8a, 0xbf, 0xc0
|
||||
|
||||
gUnknown_08497508:: @ 8497508
|
||||
@ replacing .incbin "baserom.gba", 0x00497508, 0x2
|
||||
.byte 0xe6, 0xe7
|
||||
.byte 0xe6, 0xe7
|
||||
|
||||
gUnknown_0849750A:: @ 849750A
|
||||
@ replacing .incbin "baserom.gba", 0x0049750a, 0x2
|
||||
.byte 0xeb, 0xec
|
||||
.byte 0xeb, 0xec
|
||||
|
||||
gUnknown_0849750C:: @ 849750C
|
||||
@ 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
|
||||
.byte 0x00, 0x01, 0x01, 0x02, 0x3f, 0x04, 0x02, 0x08, 0x6f, 0x10, 0x59, 0x01, 0x5a, 0x02, 0x5b, 0x04, 0x5c, 0x08, 0x70, 0x10
|
||||
|
||||
gUnknown_08497520:: @ 8497520
|
||||
@ replacing .incbin "baserom.gba", 0x00497520, 0x10
|
||||
.4byte MetatileBehavior_IsSouthArrowWarp
|
||||
.4byte MetatileBehavior_IsNorthArrowWarp
|
||||
.4byte MetatileBehavior_IsWestArrowWarp
|
||||
.4byte MetatileBehavior_IsEastArrowWarp
|
||||
.4byte MetatileBehavior_IsSouthArrowWarp
|
||||
.4byte MetatileBehavior_IsNorthArrowWarp
|
||||
.4byte MetatileBehavior_IsWestArrowWarp
|
||||
.4byte MetatileBehavior_IsEastArrowWarp
|
||||
|
||||
gUnknown_08497530:: @ 8497530
|
||||
@ replacing .incbin "baserom.gba", 0x00497530, 0xc
|
||||
.4byte sub_808C3A4
|
||||
.4byte do_boulder_dust
|
||||
.4byte sub_808C484
|
||||
.4byte sub_808C3A4
|
||||
.4byte do_boulder_dust
|
||||
.4byte sub_808C484
|
||||
|
||||
gUnknown_0849753C:: @ 849753C
|
||||
@ replacing .incbin "baserom.gba", 0x0049753c, 0x4
|
||||
.4byte sub_808C544
|
||||
.4byte sub_808C544
|
||||
|
||||
gUnknown_08497540:: @ 8497540
|
||||
@ replacing .incbin "baserom.gba", 0x00497540, 0x10
|
||||
.4byte sub_808C61C
|
||||
.4byte sub_808C644
|
||||
.4byte sub_808C6BC
|
||||
.4byte sub_808C6FC
|
||||
.4byte sub_808C61C
|
||||
.4byte sub_808C644
|
||||
.4byte sub_808C6BC
|
||||
.4byte sub_808C6FC
|
||||
|
||||
gUnknown_08497550:: @ 8497550
|
||||
.incbin "baserom.gba", 0x497550, 0x4
|
||||
@@ -137,23 +121,22 @@ gUnknown_08497554:: @ 8497554
|
||||
.incbin "baserom.gba", 0x497554, 0x8
|
||||
|
||||
gUnknown_0849755C:: @ 849755C
|
||||
@ 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
|
||||
.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
|
||||
@@ -171,6 +154,5 @@ gUnknown_084975B0:: @ 84975B0
|
||||
.incbin "baserom.gba", 0x4975b0, 0xc
|
||||
|
||||
gUnknown_084975BC:: @ 84975BC
|
||||
@ replacing .incbin "baserom.gba", 0x004975bc, 0x8
|
||||
.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
|
||||
.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
|
||||
|
||||
|
||||
Reference in New Issue
Block a user