Merge pull request #343 from red031000/master

continuing documentation and cleanup of map_object

asm/include/overlay_01_021E5900.inc

@@ -80,7 +80,7 @@
 .public sub_0205C46C
 .public PlayerAvatar_GetFacingDirection
 .public GetPlayerXCoord
-.public GetPlayerYCoord
+.public GetPlayerZCoord
 .public PlayerAvatar_GetPositionVecConst
 .public sub_0205E104
 .public sub_0205E4C8

asm/include/overlay_01_021E6880.inc

@@ -110,7 +110,7 @@
 .public MetatileBehavior_IsHeadbutt
 .public PlayerAvatar_GetFacingDirection
 .public GetPlayerXCoord
-.public GetPlayerYCoord
+.public GetPlayerZCoord
 .public sub_0205C6CC
 .public sub_0205C6D4
 .public PlayerAvatar_GetMapObject

asm/include/overlay_01_021E90C0.inc

@@ -34,8 +34,8 @@
 .public PlayerAvatar_GetFacingDirection
 .public PlayerAvatar_GetMapObject
 .public MapObject_SetVisible
-.public MapObject_GetPrevX
-.public MapObject_GetPrevY
+.public MapObject_GetPreviousX
+.public MapObject_GetPreviousZ
 .public MapObject_AreBitsSetForMovementScriptInit
 .public MapObject_SetHeldMovement
 .public MapObject_IsMovementPaused

asm/include/overlay_01_021F1AFC.inc

@@ -33,7 +33,7 @@
 .public sub_0205BA30
 .public PlayerAvatar_GetFacingDirection
 .public GetPlayerXCoord
-.public GetPlayerYCoord
+.public GetPlayerZCoord
 .public PlayerAvatar_GetMapObject
 .public PlayerAvatar_SetState
 .public PlayerAvatar_GetState
@@ -54,9 +54,9 @@
 .public sub_0205DFEC
 .public MapObject_Delete
 .public MapObject_GetID
-.public sub_0205F254
+.public MapObject_GetMapID
 .public MapObject_GetSpriteID
-.public MapObject_GetFlagID
+.public MapObject_GetEventFlag
 .public MapObject_GetNextFacingDirection
 .public MapObject_GetManager
 .public sub_0205F484
@@ -67,12 +67,12 @@
 .public MapObject_CheckFlag28
 .public MapObject_GetCurrentX
 .public MapObject_SetCurrentX
-.public MapObject_SetCurrentHeight
-.public MapObject_GetCurrentY
 .public MapObject_SetCurrentY
-.public MapObject_GetPositionVec
-.public MapObject_SetPositionVec
-.public sub_0205FB58
+.public MapObject_GetCurrentZ
+.public MapObject_SetCurrentZ
+.public MapObject_CopyPositionVector
+.public MapObject_SetPositionVector
+.public MapObjectManager_GetFirstObjectWithXAndZ
 .public sub_0205FC94
 .public sub_02060BB8
 .public GetDeltaXByFacingDirection

asm/include/overlay_01_021F3F50.inc

@@ -42,7 +42,7 @@
 .public FieldSystem_SyncMapObjectsToSave
 .public PlayerAvatar_GetFacingDirection
 .public GetPlayerXCoord
-.public GetPlayerYCoord
+.public GetPlayerZCoord
 .public Field_SaveStatsPrinter_Print
 .public Field_SaveStatsPrinter_RemoveFromScreen
 .public Field_SaveStatsPrinter_New

asm/include/overlay_01_021F72DC.inc

@@ -10,7 +10,7 @@
 .public GF_AssertFail
 .public GetFirstAliveMonInParty_CrashIfNone
 .public MapObjectManager_GetFirstActiveObjectByID
-.public MapObjectManager_GetFieldSystemPtr
+.public MapObjectManager_GetFieldSystem
 .public MapObject_SetFlagsBits
 .public MapObject_ClearFlagsBits
 .public MapObject_TestFlagsBits
@@ -25,16 +25,16 @@
 .public sub_0205F40C
 .public sub_0205F484
 .public MapObject_SetPreviousX
-.public MapObject_SetPreviousHeight
 .public MapObject_SetPreviousY
+.public MapObject_SetPreviousZ
 .public MapObject_GetCurrentX
-.public MapObject_GetCurrentHeight
 .public MapObject_GetCurrentY
-.public MapObject_GetPositionVec
-.public MapObject_SetPositionVec
-.public MapObject_GetFacingVec
-.public MapObject_SetFacingVec
-.public MapObject_GetFacingVecPtr
+.public MapObject_GetCurrentZ
+.public MapObject_CopyPositionVector
+.public MapObject_SetPositionVector
+.public MapObject_CopyFacingVector
+.public MapObject_SetFacingVector
+.public MapObject_GetFacingVector
 .public sub_0205FCD4
 .public MapObject_ClearHeldMovement
 .public sub_02064084

asm/include/overlay_01_021F8D80.inc

@@ -18,11 +18,11 @@
 .public MapObjectManager_GetFlagsBitsMask
 .public MapObjectManager_GetPriority
 .public sub_0205F1A0
-.public FldObjSys_SetMModelNarc
-.public FldObjSys_GetMModelNarc
+.public MapObjectManager_SetMapModelNarc
+.public MapObjectManager_GetMapModelNarc
 .public MapObject_SetFlagsBits
 .public MapObject_ClearFlagsBits
-.public MapObject_GetFlagsBits
+.public MapObject_GetFlagsBitsMask
 .public MapObject_TestFlagsBits
 .public MapObject_GetSpriteID
 .public MapObject_SetFacingDirection
@@ -35,11 +35,11 @@
 .public sub_0205F5D4
 .public MapObject_CheckFlag14
 .public MapObject_SetVisible
-.public sub_0205F714
+.public MapObject_CheckMovementPaused
 .public MapObject_CheckFlag4
-.public MapObject_GetPositionVec
-.public MapObject_GetFacingVec
-.public MapObject_SetFacingVec
+.public MapObject_CopyPositionVector
+.public MapObject_CopyFacingVector
+.public MapObject_SetFacingVector
 .public sub_0205F990
 .public sub_0205F9A0
 .public sub_0205F9B0
@@ -60,7 +60,7 @@
 .public ov01_021F91F8
 .public ov01_021F9250
 .public ov01_021F92A0
-.public GetObjectEventGfxInfoPtr
+.public ObjectEvent_GetGraphicsInfo
 .public GetMoveModelNoBySpriteId
 .public ov01_021F9318
 .public ov01_021F9344

asm/include/overlay_01_021F944C.inc

@@ -46,25 +46,25 @@
 .public sub_0205E38C
 .public sub_0205E420
 .public MapObjectManager_GetNextObjectWithFlagFromIndex
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObjectManager_GetObjectCount
 .public MapObjectManager_GetPriority
 .public sub_0205F1A0
-.public sub_0205F1AC
-.public sub_0205F1C4
-.public FldObjSys_GetMModelNarc
+.public MapObjectManager_GetObjects2
+.public MapObjectArray_NextObject
+.public MapObjectManager_GetMapModelNarc
 .public MapObject_SetFlagsBits
 .public MapObject_ClearFlagsBits
-.public MapObject_GetFlagsBits
+.public MapObject_GetFlagsBitsMask
 .public MapObject_TestFlagsBits
 .public MapObject_GetID
 .public MapObject_GetSpriteID
 .public MapObject_GetManager
 .public sub_0205F484
 .public sub_0205F4C0
-.public MapObject_IsInUse
+.public MapObject_CheckActive
 .public MapObject_CheckFlag24
-.public MapObject_GetPositionVec
+.public MapObject_CopyPositionVector
 .public sub_02060FA8
 .public sub_02068B48
 .public NNS_G3dMdlGetMdlFogEnableFlag

asm/include/overlay_01_021FC05C.inc

@@ -17,7 +17,7 @@
 .public TaskManager_GetEnvironment
 .public GetMetatileBehaviorAt
 .public GetPlayerXCoord
-.public GetPlayerYCoord
+.public GetPlayerZCoord
 .public G2x_SetBlendAlpha_
 .public memset
 .public _s32_div_f

asm/include/overlay_01_021FCE98.inc

@@ -9,7 +9,7 @@
 .public TaskManager_GetStatePtr
 .public PlayerAvatar_GetState
 .public PlayerAvatar_GetGender
-.public MapObject_GetPositionVec
+.public MapObject_CopyPositionVector
 .public FollowMon_GetMapObject
 .public FollowMon_IsVisible
 .public FieldSystem_UnkSub108_AddMonMood

asm/include/overlay_01_021FD1B8.inc

@@ -1,15 +1,15 @@
 #include <nitro/fs/overlay.h>
 #pragma once
 .public GF_AssertFail
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0A8
 .public MapObject_GetID
-.public sub_0205F254
+.public MapObject_GetMapID
 .public MapObject_GetSpriteID
 .public sub_0205F544
 .public MapObject_CheckFlag25
-.public MapObject_GetPositionVec
-.public MapObject_GetFacingVec
+.public MapObject_CopyPositionVector
+.public MapObject_CopyFacingVector
 .public sub_02068D98
 .public sub_02068DA8
 .public sub_02068DB8

asm/include/overlay_01_021FD41C.inc

@@ -3,18 +3,18 @@
 .public SysTask_CreateOnMainQueue
 .public SysTask_Destroy
 .public GF_RTC_GetTimeOfDay
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0F8
 .public MapObjectManager_GetPriority
 .public MapObject_TestFlagsBits
 .public MapObject_GetID
-.public sub_0205F254
+.public MapObject_GetMapID
 .public MapObject_GetSpriteID
 .public MapObject_GetFacingDirection
 .public sub_0205F544
 .public sub_0205F5E8
 .public MapObject_CheckFlag25
-.public MapObject_GetPositionVec
+.public MapObject_CopyPositionVector
 .public sub_02068D90
 .public sub_02068D98
 .public sub_02068DA8

asm/include/overlay_01_021FDA14.inc

@@ -13,18 +13,18 @@
 .public sub_02023F70
 .public sub_02023FC0
 .public PlayerAvatar_GetMapObject
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0A8
 .public MapObject_GetID
-.public sub_0205F254
+.public MapObject_GetMapID
 .public MapObject_GetSpriteID
 .public MapObject_GetFacingDirection
 .public MapObject_GetManager
 .public MapObject_GetFieldSystem
 .public MapObject_CheckVisible
 .public MapObject_CheckFlag24
-.public MapObject_GetPositionVec
-.public MapObject_GetFacingVec
+.public MapObject_CopyPositionVector
+.public MapObject_CopyFacingVector
 .public sub_0206121C
 .public sub_02068D18
 .public sub_02068D90

asm/include/overlay_01_021FE200.inc

@@ -1,13 +1,13 @@
 #include <nitro/fs/overlay.h>
 #pragma once
 .public GF_AssertFail
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_TestFlagsBits
 .public MapObject_GetFacingDirection
-.public MapObject_GetPreviousFacing
-.public MapObject_GetPrevX
-.public MapObject_GetPrevY
-.public MapObject_GetPosVecYCoord
+.public MapObject_GetPreviousFacingDirection
+.public MapObject_GetPreviousX
+.public MapObject_GetPreviousZ
+.public MapObject_GetPositionVectorYCoord
 .public sub_020611C8
 .public sub_02068D90
 .public sub_02068D98

asm/include/overlay_01_021FE780.inc

@@ -1,13 +1,13 @@
 #include <nitro/fs/overlay.h>
 #pragma once
 .public sub_02020DA4
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0A8
 .public MapObject_GetID
-.public sub_0205F254
+.public MapObject_GetMapID
 .public MapObject_GetFacingDirection
 .public MapObject_GetFieldSystem
-.public MapObject_GetPositionVec
+.public MapObject_CopyPositionVector
 .public sub_0205F9A0
 .public sub_0206121C
 .public sub_02068D74

asm/include/overlay_01_021FEA0C.inc

@@ -2,9 +2,9 @@
 #pragma once
 .public sub_02020DA4
 .public GF_AssertFail
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_GetFieldSystem
-.public MapObject_GetPositionVec
+.public MapObject_CopyPositionVector
 .public sub_0205F9A0
 .public sub_0206121C
 .public sub_02068D74

asm/include/overlay_01_021FEC38.inc

@@ -1,8 +1,8 @@
 #include <nitro/fs/overlay.h>
 #pragma once
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_TestFlagsBits
-.public MapObject_GetPrevHeight
+.public MapObject_GetPreviousY
 .public sub_020611C8
 .public sub_02068D98
 .public sub_02068DB8

asm/include/overlay_01_021FED9C.inc

@@ -1,7 +1,7 @@
 #include <nitro/fs/overlay.h>
 #pragma once
-.public sub_0205F09C
-.public MapObject_GetPrevHeight
+.public MapObject_GetPriorityPlusValue
+.public MapObject_GetPreviousY
 .public sub_020611C8
 .public sub_02068D98
 .public sub_02068DB8

asm/include/overlay_01_021FEEEC.inc

@@ -6,18 +6,18 @@
 .public sub_02023F04
 .public sub_02023F1C
 .public sub_02023F70
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0F8
 .public MapObject_TestFlagsBits
 .public MapObject_GetID
-.public sub_0205F254
+.public MapObject_GetMapID
 .public MapObject_GetSpriteID
 .public MapObject_GetFacingDirection
 .public MapObject_GetCurrentX
-.public MapObject_GetCurrentHeight
 .public MapObject_GetCurrentY
-.public MapObject_GetPositionVec
-.public MapObject_GetPosVecYCoord
+.public MapObject_GetCurrentZ
+.public MapObject_CopyPositionVector
+.public MapObject_GetPositionVectorYCoord
 .public sub_0206121C
 .public sub_02068D90
 .public sub_02068D98

asm/include/overlay_01_021FF464.inc

@@ -6,16 +6,16 @@
 .public sub_02023F04
 .public sub_02023F1C
 .public sub_02023F70
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0F8
 .public MapObject_TestFlagsBits
 .public MapObject_GetID
-.public sub_0205F254
+.public MapObject_GetMapID
 .public MapObject_GetSpriteID
 .public MapObject_GetFieldSystem
 .public MapObject_CheckFlag26
-.public MapObject_GetPositionVec
-.public MapObject_GetFacingVec
+.public MapObject_CopyPositionVector
+.public MapObject_CopyFacingVector
 .public sub_02068D90
 .public sub_02068D98
 .public sub_02068DA8

asm/include/overlay_01_021FF6B0.inc

@@ -4,13 +4,13 @@
 .public sub_02023E50
 .public sub_02023F04
 .public sub_02023F70
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_GetID
-.public sub_0205F254
+.public MapObject_GetMapID
 .public MapObject_GetFieldSystem
 .public MapObject_GetCurrentX
-.public MapObject_GetCurrentY
-.public MapObject_GetPositionVec
+.public MapObject_GetCurrentZ
+.public MapObject_CopyPositionVector
 .public sub_020611C8
 .public sub_02068D98
 .public sub_02068DB8