From 992d382eeffeaa76f8ac9e8b695bba8b6a819f7b Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Mon, 18 Oct 2021 18:53:05 +0000 Subject: [PATCH] Merge pull request #472 from lioniac/master --- pokefirered.sym | 40 ++++++++++++++++++++-------------------- pokefirered_rev1.sym | 40 ++++++++++++++++++++-------------------- pokeleafgreen.sym | 40 ++++++++++++++++++++-------------------- pokeleafgreen_rev1.sym | 40 ++++++++++++++++++++-------------------- 4 files changed, 80 insertions(+), 80 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index e6a52d706..7e10788a5 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -2999,7 +2999,7 @@ 08056e80 l 00000088 sub_8056E80 08056f08 l 00000012 sub_8056F08 08056f1c l 00000108 InitOverworldGraphicsRegisters -08057024 l 00000050 sub_8057024 +08057024 l 00000050 ResumeMap 08057074 l 00000028 sub_8057074 0805709c l 00000064 mli4_mapscripts_and_other 08057100 l 00000012 ReloadObjectsAndRunReturnToFieldMapScript @@ -3939,9 +3939,9 @@ 08063a20 g 00000024 MoveCoords 08063a44 g 00000028 sub_8063A44 08063a6c l 00000068 MoveCoordsInDirection -08063ad4 g 00000048 sub_8063AD4 +08063ad4 g 00000048 GetMapCoordsFromSpritePos 08063b1c g 000000a8 SetSpritePosToMapCoords -08063bc4 g 0000004a sub_8063BC4 +08063bc4 g 0000004a SetSpritePosToOffsetMapCoords 08063c10 l 00000040 GetObjectEventMovingCameraOffset 08063c50 g 0000001e ObjectEventMoveDestCoords 08063c70 g 00000016 ObjectEventIsMovementOverridden @@ -4005,12 +4005,12 @@ 080646fc g 0000005c do_go_anim 08064758 g 0000002e StartRunningAnim 08064788 g 00000038 npc_obj_ministep_stop_on_arrival -080647c0 g 00000070 sub_80647C0 -08064830 g 0000002c sub_8064830 +080647c0 g 00000070 InitNpcForWalkSlow +08064830 g 0000002c InitWalkSlow 0806485c g 00000038 an_walk_any_2 -08064894 g 00000070 sub_8064894 -08064904 g 0000002c sub_8064904 -08064930 g 00000038 sub_8064930 +08064894 g 00000070 InitNpcForWalkSlow2 +08064904 g 0000002c InitWalkSlow2 +08064930 g 00000038 UpdateWalkSlow 08064968 l 0000001e MovementActionFunc_x9B_0 08064988 l 0000001e MovementActionFunc_x9B_1 080649a8 l 0000001e MovementActionFunc_x9C_0 @@ -4142,7 +4142,7 @@ 08065e90 l 0000001e MovementAction_PlayerRunLeft_Step1 08065eb0 l 0000001e MovementAction_PlayerRunRight_Step0 08065ed0 l 0000001e MovementAction_PlayerRunRight_Step1 -08065ef0 g 00000070 sub_8065EF0 +08065ef0 g 00000070 InitNpcForWalkSlow3 08065f60 g 0000002c sub_8065F60 08065f8c g 00000038 sub_8065F8C 08065fc4 l 0000001e MovementActionFunc_x41_0 @@ -4392,16 +4392,16 @@ 08068b1c l 00000024 oct_little_steps 08068b40 g 00000012 oamt_npc_ministep_reset 08068b54 g 00000068 obj_npc_ministep -08068bbc g 0000000e sub_8068BBC -08068bcc g 0000003a sub_8068BCC -08068c08 g 0000000e sub_8068C08 +08068bbc g 0000000e SetSpriteDataForNormalStep +08068bcc g 0000003a NpcTakeStep +08068c08 g 0000000e SetSpriteDataForNormalStep3 08068c18 g 0000003e sub_8068C18 -08068c58 g 0000000e sub_8068C58 -08068c68 g 0000003c sub_8068C68 -08068ca4 g 0000000e sub_8068CA4 +08068c58 g 0000000e SetSpriteDataForNormalStep2 +08068c68 g 0000003c UpdateWalkSlowAnim +08068ca4 g 0000000e SetSpriteDataForNormalStep4 08068cb4 g 0000004a sub_8068CB4 08068d00 l 0000001c GetJumpYDisplacement -08068d1c g 0000001e sub_8068D1C +08068d1c g 0000001e SetJumpSpriteData 08068d3c g 00000088 sub_8068D3C 08068dc4 g 00000094 sub_8068DC4 08068e58 g 00000004 SetMovementDelay @@ -8808,10 +8808,10 @@ 080dc4ec l 0000000c sub_80DC4EC 080dc4f8 g 00000058 UpdateSurfBlobFieldEffect 080dc550 l 00000038 SynchroniseSurfAnim -080dc588 l 00000094 sub_80DC588 +080dc588 l 00000094 SynchroniseSurfPosition 080dc61c l 00000092 CreateBobbingEffect -080dc6b0 g 00000050 sub_80DC6B0 -080dc700 l 00000040 sub_80DC700 +080dc6b0 g 00000050 StartUnderwaterSurfBlobBobbing +080dc700 l 00000040 SpriteCB_UnderwaterSurfBlob 080dc740 g 00000070 FldEff_Dust 080dc7b0 g 000000bc FldEff_SandPile 080dc86c g 000000cc UpdateSandPileFieldEffect @@ -8829,7 +8829,7 @@ 080dcc90 g 0000004e UpdateSparkleFieldEffect 080dcce0 g 0000003a UpdateJumpImpactEffect 080dcd1c g 0000002a WaitFieldEffectSpriteAnim -080dcd48 l 000000c8 sub_80DCD48 +080dcd48 l 000000c8 UpdateGrassFieldEffectSubpriority 080dce10 g 00000068 sub_80DCE10 080dce10 l 00000000 .gcc2_compiled. 080dce78 l 0000006c sub_80DCE78 diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 1ec93bb44..00eb7fc0d 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -2999,7 +2999,7 @@ 08056e94 l 00000088 sub_8056E80 08056f1c l 00000012 sub_8056F08 08056f30 l 00000108 InitOverworldGraphicsRegisters -08057038 l 00000050 sub_8057024 +08057038 l 00000050 ResumeMap 08057088 l 00000028 sub_8057074 080570b0 l 00000064 mli4_mapscripts_and_other 08057114 l 00000012 ReloadObjectsAndRunReturnToFieldMapScript @@ -3939,9 +3939,9 @@ 08063a34 g 00000024 MoveCoords 08063a58 g 00000028 sub_8063A44 08063a80 l 00000068 MoveCoordsInDirection -08063ae8 g 00000048 sub_8063AD4 +08063ae8 g 00000048 GetMapCoordsFromSpritePos 08063b30 g 000000a8 SetSpritePosToMapCoords -08063bd8 g 0000004a sub_8063BC4 +08063bd8 g 0000004a SetSpritePosToOffsetMapCoords 08063c24 l 00000040 GetObjectEventMovingCameraOffset 08063c64 g 0000001e ObjectEventMoveDestCoords 08063c84 g 00000016 ObjectEventIsMovementOverridden @@ -4005,12 +4005,12 @@ 08064710 g 0000005c do_go_anim 0806476c g 0000002e StartRunningAnim 0806479c g 00000038 npc_obj_ministep_stop_on_arrival -080647d4 g 00000070 sub_80647C0 -08064844 g 0000002c sub_8064830 +080647d4 g 00000070 InitNpcForWalkSlow +08064844 g 0000002c InitWalkSlow 08064870 g 00000038 an_walk_any_2 -080648a8 g 00000070 sub_8064894 -08064918 g 0000002c sub_8064904 -08064944 g 00000038 sub_8064930 +080648a8 g 00000070 InitNpcForWalkSlow2 +08064918 g 0000002c InitWalkSlow2 +08064944 g 00000038 UpdateWalkSlow 0806497c l 0000001e MovementActionFunc_x9B_0 0806499c l 0000001e MovementActionFunc_x9B_1 080649bc l 0000001e MovementActionFunc_x9C_0 @@ -4142,7 +4142,7 @@ 08065ea4 l 0000001e MovementAction_PlayerRunLeft_Step1 08065ec4 l 0000001e MovementAction_PlayerRunRight_Step0 08065ee4 l 0000001e MovementAction_PlayerRunRight_Step1 -08065f04 g 00000070 sub_8065EF0 +08065f04 g 00000070 InitNpcForWalkSlow3 08065f74 g 0000002c sub_8065F60 08065fa0 g 00000038 sub_8065F8C 08065fd8 l 0000001e MovementActionFunc_x41_0 @@ -4392,16 +4392,16 @@ 08068b30 l 00000024 oct_little_steps 08068b54 g 00000012 oamt_npc_ministep_reset 08068b68 g 00000068 obj_npc_ministep -08068bd0 g 0000000e sub_8068BBC -08068be0 g 0000003a sub_8068BCC -08068c1c g 0000000e sub_8068C08 +08068bd0 g 0000000e SetSpriteDataForNormalStep +08068be0 g 0000003a NpcTakeStep +08068c1c g 0000000e SetSpriteDataForNormalStep3 08068c2c g 0000003e sub_8068C18 -08068c6c g 0000000e sub_8068C58 -08068c7c g 0000003c sub_8068C68 -08068cb8 g 0000000e sub_8068CA4 +08068c6c g 0000000e SetSpriteDataForNormalStep2 +08068c7c g 0000003c UpdateWalkSlowAnim +08068cb8 g 0000000e SetSpriteDataForNormalStep4 08068cc8 g 0000004a sub_8068CB4 08068d14 l 0000001c GetJumpYDisplacement -08068d30 g 0000001e sub_8068D1C +08068d30 g 0000001e SetJumpSpriteData 08068d50 g 00000088 sub_8068D3C 08068dd8 g 00000094 sub_8068DC4 08068e6c g 00000004 SetMovementDelay @@ -8808,10 +8808,10 @@ 080dc500 l 0000000c sub_80DC4EC 080dc50c g 00000058 UpdateSurfBlobFieldEffect 080dc564 l 00000038 SynchroniseSurfAnim -080dc59c l 00000094 sub_80DC588 +080dc59c l 00000094 SynchroniseSurfPosition 080dc630 l 00000092 CreateBobbingEffect -080dc6c4 g 00000050 sub_80DC6B0 -080dc714 l 00000040 sub_80DC700 +080dc6c4 g 00000050 StartUnderwaterSurfBlobBobbing +080dc714 l 00000040 SpriteCB_UnderwaterSurfBlob 080dc754 g 00000070 FldEff_Dust 080dc7c4 g 000000bc FldEff_SandPile 080dc880 g 000000cc UpdateSandPileFieldEffect @@ -8829,7 +8829,7 @@ 080dcca4 g 0000004e UpdateSparkleFieldEffect 080dccf4 g 0000003a UpdateJumpImpactEffect 080dcd30 g 0000002a WaitFieldEffectSpriteAnim -080dcd5c l 000000c8 sub_80DCD48 +080dcd5c l 000000c8 UpdateGrassFieldEffectSubpriority 080dce24 g 00000068 sub_80DCE10 080dce24 l 00000000 .gcc2_compiled. 080dce8c l 0000006c sub_80DCE78 diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index 4e621a9c4..6941167a2 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -2999,7 +2999,7 @@ 08056e80 l 00000088 sub_8056E80 08056f08 l 00000012 sub_8056F08 08056f1c l 00000108 InitOverworldGraphicsRegisters -08057024 l 00000050 sub_8057024 +08057024 l 00000050 ResumeMap 08057074 l 00000028 sub_8057074 0805709c l 00000064 mli4_mapscripts_and_other 08057100 l 00000012 ReloadObjectsAndRunReturnToFieldMapScript @@ -3939,9 +3939,9 @@ 08063a20 g 00000024 MoveCoords 08063a44 g 00000028 sub_8063A44 08063a6c l 00000068 MoveCoordsInDirection -08063ad4 g 00000048 sub_8063AD4 +08063ad4 g 00000048 GetMapCoordsFromSpritePos 08063b1c g 000000a8 SetSpritePosToMapCoords -08063bc4 g 0000004a sub_8063BC4 +08063bc4 g 0000004a SetSpritePosToOffsetMapCoords 08063c10 l 00000040 GetObjectEventMovingCameraOffset 08063c50 g 0000001e ObjectEventMoveDestCoords 08063c70 g 00000016 ObjectEventIsMovementOverridden @@ -4005,12 +4005,12 @@ 080646fc g 0000005c do_go_anim 08064758 g 0000002e StartRunningAnim 08064788 g 00000038 npc_obj_ministep_stop_on_arrival -080647c0 g 00000070 sub_80647C0 -08064830 g 0000002c sub_8064830 +080647c0 g 00000070 InitNpcForWalkSlow +08064830 g 0000002c InitWalkSlow 0806485c g 00000038 an_walk_any_2 -08064894 g 00000070 sub_8064894 -08064904 g 0000002c sub_8064904 -08064930 g 00000038 sub_8064930 +08064894 g 00000070 InitNpcForWalkSlow2 +08064904 g 0000002c InitWalkSlow2 +08064930 g 00000038 UpdateWalkSlow 08064968 l 0000001e MovementActionFunc_x9B_0 08064988 l 0000001e MovementActionFunc_x9B_1 080649a8 l 0000001e MovementActionFunc_x9C_0 @@ -4142,7 +4142,7 @@ 08065e90 l 0000001e MovementAction_PlayerRunLeft_Step1 08065eb0 l 0000001e MovementAction_PlayerRunRight_Step0 08065ed0 l 0000001e MovementAction_PlayerRunRight_Step1 -08065ef0 g 00000070 sub_8065EF0 +08065ef0 g 00000070 InitNpcForWalkSlow3 08065f60 g 0000002c sub_8065F60 08065f8c g 00000038 sub_8065F8C 08065fc4 l 0000001e MovementActionFunc_x41_0 @@ -4392,16 +4392,16 @@ 08068b1c l 00000024 oct_little_steps 08068b40 g 00000012 oamt_npc_ministep_reset 08068b54 g 00000068 obj_npc_ministep -08068bbc g 0000000e sub_8068BBC -08068bcc g 0000003a sub_8068BCC -08068c08 g 0000000e sub_8068C08 +08068bbc g 0000000e SetSpriteDataForNormalStep +08068bcc g 0000003a NpcTakeStep +08068c08 g 0000000e SetSpriteDataForNormalStep3 08068c18 g 0000003e sub_8068C18 -08068c58 g 0000000e sub_8068C58 -08068c68 g 0000003c sub_8068C68 -08068ca4 g 0000000e sub_8068CA4 +08068c58 g 0000000e SetSpriteDataForNormalStep2 +08068c68 g 0000003c UpdateWalkSlowAnim +08068ca4 g 0000000e SetSpriteDataForNormalStep4 08068cb4 g 0000004a sub_8068CB4 08068d00 l 0000001c GetJumpYDisplacement -08068d1c g 0000001e sub_8068D1C +08068d1c g 0000001e SetJumpSpriteData 08068d3c g 00000088 sub_8068D3C 08068dc4 g 00000094 sub_8068DC4 08068e58 g 00000004 SetMovementDelay @@ -8810,10 +8810,10 @@ 080dc4c4 l 0000000c sub_80DC4EC 080dc4d0 g 00000058 UpdateSurfBlobFieldEffect 080dc528 l 00000038 SynchroniseSurfAnim -080dc560 l 00000094 sub_80DC588 +080dc560 l 00000094 SynchroniseSurfPosition 080dc5f4 l 00000092 CreateBobbingEffect -080dc688 g 00000050 sub_80DC6B0 -080dc6d8 l 00000040 sub_80DC700 +080dc688 g 00000050 StartUnderwaterSurfBlobBobbing +080dc6d8 l 00000040 SpriteCB_UnderwaterSurfBlob 080dc718 g 00000070 FldEff_Dust 080dc788 g 000000bc FldEff_SandPile 080dc844 g 000000cc UpdateSandPileFieldEffect @@ -8831,7 +8831,7 @@ 080dcc68 g 0000004e UpdateSparkleFieldEffect 080dccb8 g 0000003a UpdateJumpImpactEffect 080dccf4 g 0000002a WaitFieldEffectSpriteAnim -080dcd20 l 000000c8 sub_80DCD48 +080dcd20 l 000000c8 UpdateGrassFieldEffectSubpriority 080dcde8 g 00000068 sub_80DCE10 080dcde8 l 00000000 .gcc2_compiled. 080dce50 l 0000006c sub_80DCE78 diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 9578e2de6..4be6b3e45 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -2999,7 +2999,7 @@ 08056e94 l 00000088 sub_8056E80 08056f1c l 00000012 sub_8056F08 08056f30 l 00000108 InitOverworldGraphicsRegisters -08057038 l 00000050 sub_8057024 +08057038 l 00000050 ResumeMap 08057088 l 00000028 sub_8057074 080570b0 l 00000064 mli4_mapscripts_and_other 08057114 l 00000012 ReloadObjectsAndRunReturnToFieldMapScript @@ -3939,9 +3939,9 @@ 08063a34 g 00000024 MoveCoords 08063a58 g 00000028 sub_8063A44 08063a80 l 00000068 MoveCoordsInDirection -08063ae8 g 00000048 sub_8063AD4 +08063ae8 g 00000048 GetMapCoordsFromSpritePos 08063b30 g 000000a8 SetSpritePosToMapCoords -08063bd8 g 0000004a sub_8063BC4 +08063bd8 g 0000004a SetSpritePosToOffsetMapCoords 08063c24 l 00000040 GetObjectEventMovingCameraOffset 08063c64 g 0000001e ObjectEventMoveDestCoords 08063c84 g 00000016 ObjectEventIsMovementOverridden @@ -4005,12 +4005,12 @@ 08064710 g 0000005c do_go_anim 0806476c g 0000002e StartRunningAnim 0806479c g 00000038 npc_obj_ministep_stop_on_arrival -080647d4 g 00000070 sub_80647C0 -08064844 g 0000002c sub_8064830 +080647d4 g 00000070 InitNpcForWalkSlow +08064844 g 0000002c InitWalkSlow 08064870 g 00000038 an_walk_any_2 -080648a8 g 00000070 sub_8064894 -08064918 g 0000002c sub_8064904 -08064944 g 00000038 sub_8064930 +080648a8 g 00000070 InitNpcForWalkSlow2 +08064918 g 0000002c InitWalkSlow2 +08064944 g 00000038 UpdateWalkSlow 0806497c l 0000001e MovementActionFunc_x9B_0 0806499c l 0000001e MovementActionFunc_x9B_1 080649bc l 0000001e MovementActionFunc_x9C_0 @@ -4142,7 +4142,7 @@ 08065ea4 l 0000001e MovementAction_PlayerRunLeft_Step1 08065ec4 l 0000001e MovementAction_PlayerRunRight_Step0 08065ee4 l 0000001e MovementAction_PlayerRunRight_Step1 -08065f04 g 00000070 sub_8065EF0 +08065f04 g 00000070 InitNpcForWalkSlow3 08065f74 g 0000002c sub_8065F60 08065fa0 g 00000038 sub_8065F8C 08065fd8 l 0000001e MovementActionFunc_x41_0 @@ -4392,16 +4392,16 @@ 08068b30 l 00000024 oct_little_steps 08068b54 g 00000012 oamt_npc_ministep_reset 08068b68 g 00000068 obj_npc_ministep -08068bd0 g 0000000e sub_8068BBC -08068be0 g 0000003a sub_8068BCC -08068c1c g 0000000e sub_8068C08 +08068bd0 g 0000000e SetSpriteDataForNormalStep +08068be0 g 0000003a NpcTakeStep +08068c1c g 0000000e SetSpriteDataForNormalStep3 08068c2c g 0000003e sub_8068C18 -08068c6c g 0000000e sub_8068C58 -08068c7c g 0000003c sub_8068C68 -08068cb8 g 0000000e sub_8068CA4 +08068c6c g 0000000e SetSpriteDataForNormalStep2 +08068c7c g 0000003c UpdateWalkSlowAnim +08068cb8 g 0000000e SetSpriteDataForNormalStep4 08068cc8 g 0000004a sub_8068CB4 08068d14 l 0000001c GetJumpYDisplacement -08068d30 g 0000001e sub_8068D1C +08068d30 g 0000001e SetJumpSpriteData 08068d50 g 00000088 sub_8068D3C 08068dd8 g 00000094 sub_8068DC4 08068e6c g 00000004 SetMovementDelay @@ -8810,10 +8810,10 @@ 080dc4d8 l 0000000c sub_80DC4EC 080dc4e4 g 00000058 UpdateSurfBlobFieldEffect 080dc53c l 00000038 SynchroniseSurfAnim -080dc574 l 00000094 sub_80DC588 +080dc574 l 00000094 SynchroniseSurfPosition 080dc608 l 00000092 CreateBobbingEffect -080dc69c g 00000050 sub_80DC6B0 -080dc6ec l 00000040 sub_80DC700 +080dc69c g 00000050 StartUnderwaterSurfBlobBobbing +080dc6ec l 00000040 SpriteCB_UnderwaterSurfBlob 080dc72c g 00000070 FldEff_Dust 080dc79c g 000000bc FldEff_SandPile 080dc858 g 000000cc UpdateSandPileFieldEffect @@ -8831,7 +8831,7 @@ 080dcc7c g 0000004e UpdateSparkleFieldEffect 080dcccc g 0000003a UpdateJumpImpactEffect 080dcd08 g 0000002a WaitFieldEffectSpriteAnim -080dcd34 l 000000c8 sub_80DCD48 +080dcd34 l 000000c8 UpdateGrassFieldEffectSubpriority 080dcdfc g 00000068 sub_80DCE10 080dcdfc l 00000000 .gcc2_compiled. 080dce64 l 0000006c sub_80DCE78