Skip to content

Commit

Permalink
fix mapId discrepencies + more documentation and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@red031000
red031000 committed Oct 11, 2024
1 parent 0b978c2 commit 35ab3d0
Show file tree
Hide file tree
Showing 49 changed files with 172 additions and 182 deletions.
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F1AFC.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
.public sub_0205DFEC
.public MapObject_Delete
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetSpriteID
.public MapObject_GetFlagID
.public MapObject_GetNextFacingDirection
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_01_021F8D80.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_01_021F944C.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
.public sub_0205F1A0
.public MapObjectManager_GetObjects2
.public MapObjectArray_NextObject
.public FldObjSys_GetMModelNarc
.public MapObjectManager_GetMapModelNarc
.public MapObject_SetFlagsBits
.public MapObject_ClearFlagsBits
.public MapObject_GetFlagsBits
.public MapObject_GetFlagsBitsMask
.public MapObject_TestFlagsBits
.public MapObject_GetID
.public MapObject_GetSpriteID
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FD1B8.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.public sub_0205F09C
.public sub_0205F0A8
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetSpriteID
.public sub_0205F544
.public MapObject_CheckFlag25
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FD41C.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.public MapObjectManager_GetPriority
.public MapObject_TestFlagsBits
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetSpriteID
.public MapObject_GetFacingDirection
.public sub_0205F544
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FDA14.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.public sub_0205F09C
.public sub_0205F0A8
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetSpriteID
.public MapObject_GetFacingDirection
.public MapObject_GetManager
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FE780.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.public sub_0205F09C
.public sub_0205F0A8
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetFacingDirection
.public MapObject_GetFieldSystem
.public MapObject_GetPositionVec
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FEEEC.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.public sub_0205F0F8
.public MapObject_TestFlagsBits
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetSpriteID
.public MapObject_GetFacingDirection
.public MapObject_GetCurrentX
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FF464.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.public sub_0205F0F8
.public MapObject_TestFlagsBits
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetSpriteID
.public MapObject_GetFieldSystem
.public MapObject_CheckFlag26
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FF6B0.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.public sub_02023F70
.public sub_0205F09C
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetFieldSystem
.public MapObject_GetCurrentX
.public MapObject_GetCurrentY
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FF854.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.public sub_0205F0F8
.public MapObject_TestFlagsBits
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetSpriteID
.public MapObject_GetFacingDirection
.public MapObject_GetCurrentX
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FFC0C.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.public sub_0205F0F8
.public MapObject_TestFlagsBits
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetSpriteID
.public MapObject_GetFacingDirection
.public MapObject_GetCurrentX
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_02200040.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.public sub_02023F70
.public sub_0205F09C
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetFieldSystem
.public MapObject_GetCurrentX
.public MapObject_GetCurrentY
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_022001E4.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.public GF_AssertFail
.public sub_0205F0A8
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public sub_0205F538
.public MapObject_GetPositionVec
.public MapObject_GetFacingVec
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_022006A8.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.public sub_0205F09C
.public sub_0205F0A8
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetFieldSystem
.public MapObject_GetPositionVec
.public MapObject_GetFacingVec
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_02200858.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.public sub_0205F09C
.public sub_0205F0A8
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public sub_0205F504
.public MapObject_GetCurrentX
.public MapObject_GetCurrentY
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_022031C0.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.public sub_0205F09C
.public sub_0205F0F8
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetSpriteID
.public MapObject_GetFacingDirection
.public sub_0205F484
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_02203A18.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
.public TaskManager_GetStatePtr
.public sub_0205F0A8
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetMapID
.public sub_0205F538
.public MapObject_GetPositionVec
.public MapObject_GetFacingVec
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_022053EC.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
.public PlayerAvatar_GetMapObject
.public MapObject_Remove
.public sub_0205F1A0
.public FldObjSys_GetMModelNarc
.public MapObjectManager_GetMapModelNarc
.public MapObject_GetID
.public MapObject_GetSpriteID
.public MapObject_SetFacingDirection
Expand Down
4 changes: 2 additions & 2 deletions asm/include/unk_0205FD20.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
.public MapObjectManager_GetObjectCount
.public MapObjectManager_GetObjects2
.public MapObjectArray_NextObject
.public MapObject_GetFlagsWord
.public MapObject_GetFlags
.public MapObject_SetFlagsBits
.public MapObject_ClearFlagsBits
.public MapObject_GetFlagsBits
.public MapObject_GetFlagsBitsMask
.public MapObject_TestFlagsBits
.public MapObject_GetID
.public MapObject_GetSpriteID
Expand Down
2 changes: 1 addition & 1 deletion asm/include/unk_02061284.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.public sub_0205DE98
.public MapObject_SetFlagsBits
.public MapObject_ClearFlagsBits
.public MapObject_GetFlagsBits
.public MapObject_GetFlagsBitsMask
.public MapObject_GetMovement
.public MapObject_GetType
.public MapObject_GetInitialFacingDirection
Expand Down
4 changes: 2 additions & 2 deletions asm/include/unk_020658D4.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
.public MapObjectManager_GetNextObjectWithFlagFromIndex
.public MapObject_SetFlagsBits
.public MapObject_ClearFlagsBits
.public MapObject_GetFlagsBits
.public MapObject_GetFlagsBitsMask
.public MapObject_TestFlagsBits
.public sub_0205F254
.public MapObject_GetMapID
.public MapObject_GetType
.public MapObject_GetFacingDirection
.public sub_0205F328
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021F1AFC.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ ov01_021F1F8C: ; 0x021F1F8C
mov r6, #0
_021F1F96:
add r0, r5, #0
bl sub_0205F254
bl MapObject_GetMapID
ldrh r1, [r4]
cmp r1, r0
bne _021F1FF4
Expand Down
10 changes: 5 additions & 5 deletions asm/overlay_01_021F8D80.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,15 +715,15 @@ FldObjSys_OpenMModelNarc: ; 0x021F927C
bl NARC_New
add r1, r0, #0
add r0, r4, #0
bl FldObjSys_SetMModelNarc
bl MapObjectManager_SetMapModelNarc
pop {r4, pc}
.balign 4, 0
thumb_func_end FldObjSys_OpenMModelNarc

thumb_func_start FldObjSys_CloseMModelNarc
FldObjSys_CloseMModelNarc: ; 0x021F9294
push {r3, lr}
bl FldObjSys_GetMModelNarc
bl MapObjectManager_GetMapModelNarc
bl NARC_Delete
pop {r3, pc}
thumb_func_end FldObjSys_CloseMModelNarc
Expand All @@ -740,7 +740,7 @@ ov01_021F92A0: ; 0x021F92A0
mov r1, #1
add r0, r4, #0
lsl r1, r1, #0xe
bl MapObject_GetFlagsBits
bl MapObject_GetFlagsBitsMask
cmp r0, #0
beq _021F92DA
add r0, r4, #0
Expand Down Expand Up @@ -840,7 +840,7 @@ _021F935E:
mov r1, #1
add r0, r4, #0
lsl r1, r1, #8
bl MapObject_GetFlagsBits
bl MapObject_GetFlagsBitsMask
cmp r0, #0
beq _021F9370
mov r0, #1
Expand All @@ -855,7 +855,7 @@ ReadMModelFromNarcInternal: ; 0x021F9374
push {r4, r5, r6, lr}
add r4, r1, #0
add r5, r2, #0
bl FldObjSys_GetMModelNarc
bl MapObjectManager_GetMapModelNarc
add r1, r4, #0
add r6, r0, #0
bl NARC_GetMemberSize
Expand Down
4 changes: 2 additions & 2 deletions asm/overlay_01_021F944C.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ _021F98F8:
mov r0, #0x41
lsl r0, r0, #2
ldr r0, [r5, r0]
bl FldObjSys_GetMModelNarc
bl MapObjectManager_GetMapModelNarc
add r2, r0, #0
mov r0, #0
str r0, [sp]
Expand Down Expand Up @@ -2095,7 +2095,7 @@ ov01_021FA2D4: ; 0x021FA2D4
push {r3, lr}
mov r1, #1
lsl r1, r1, #0x16
bl MapObject_GetFlagsBits
bl MapObject_GetFlagsBitsMask
cmp r0, #0
beq _021FA2E6
mov r0, #1
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021FD1B8.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ ov01_021FD328: ; 0x021FD328
bl sub_0205F544
b _021FD368
_021FD364:
bl sub_0205F254
bl MapObject_GetMapID
_021FD368:
str r0, [r4, #8]
add r4, #0xc
Expand Down
4 changes: 2 additions & 2 deletions asm/overlay_01_021FD41C.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ ov01_021FD6C8: ; 0x021FD6C8
bl sub_0205F544
b _021FD70E
_021FD70A:
bl sub_0205F254
bl MapObject_GetMapID
_021FD70E:
str r0, [r4, #8]
mov r0, #1
Expand Down Expand Up @@ -506,7 +506,7 @@ ov01_021FD784: ; 0x021FD784
bl sub_0205F544
b _021FD7CA
_021FD7C6:
bl sub_0205F254
bl MapObject_GetMapID
_021FD7CA:
str r0, [r4, #8]
mov r0, #1
Expand Down
4 changes: 2 additions & 2 deletions asm/overlay_01_021FDA14.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ ov01_021FDAC0: ; 0x021FDAC0
bl MapObject_GetID
str r0, [r4]
ldr r0, [r4, #0x20]
bl sub_0205F254
bl MapObject_GetMapID
str r0, [r4, #4]
ldr r0, [r4, #0x20]
bl MapObject_GetSpriteID
Expand Down Expand Up @@ -776,7 +776,7 @@ ov01_021FDFD4: ; 0x021FDFD4
bl MapObject_GetID
str r0, [r4]
ldr r0, [r4, #0x20]
bl sub_0205F254
bl MapObject_GetMapID
str r0, [r4, #4]
ldr r0, [r4, #0x20]
bl MapObject_GetSpriteID
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021FE780.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ ov01_021FE868: ; 0x021FE868
bl MapObject_GetID
str r0, [r5, #0xc]
add r0, r4, #0
bl sub_0205F254
bl MapObject_GetMapID
str r0, [r5, #0x10]
ldr r0, [r7]
str r0, [r5, #8]
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021FEEEC.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ _021FF188:
bl MapObject_GetID
str r0, [r4, #8]
ldr r0, [r4, #0x30]
bl sub_0205F254
bl MapObject_GetMapID
str r0, [r4, #0xc]
ldr r0, [r4, #0x18]
lsl r0, r0, #0x10
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021FF464.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ ov01_021FF54C: ; 0x021FF54C
bl MapObject_GetID
str r0, [r4, #8]
ldr r0, [r4, #0x20]
bl sub_0205F254
bl MapObject_GetMapID
str r0, [r4, #0xc]
add r0, r5, #0
add r1, sp, #0
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021FF6B0.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ ov01_021FF7B0: ; 0x021FF7B0
bl MapObject_GetID
str r0, [r4, #4]
ldr r0, [r4, #0x1c]
bl sub_0205F254
bl MapObject_GetMapID
str r0, [r4, #8]
add r0, r5, #0
add r1, sp, #0
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021FF854.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ _021FFA08:
bl MapObject_GetID
str r0, [r4, #8]
ldr r0, [r4, #0x30]
bl sub_0205F254
bl MapObject_GetMapID
str r0, [r4, #0xc]
ldr r0, [r4, #0x18]
lsl r0, r0, #0x10
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021FFC0C.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ _021FFCBC:
bl MapObject_GetID
str r0, [r4, #8]
ldr r0, [r4, #0x30]
bl sub_0205F254
bl MapObject_GetMapID
str r0, [r4, #0xc]
ldr r0, [r4, #0x18]
lsl r0, r0, #0x10
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_02200040.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ ov01_02200140: ; 0x02200140
bl MapObject_GetID
str r0, [r4, #4]
ldr r0, [r4, #0x1c]
bl sub_0205F254
bl MapObject_GetMapID
str r0, [r4, #8]
add r0, r5, #0
add r1, sp, #0
Expand Down
Loading

0 comments on commit 35ab3d0

Please sign in to comment.