Skip to content

Commit

Permalink
*screams*
Browse files Browse the repository at this point in the history
  • Loading branch information
@red031000
red031000 committed Mar 7, 2024
1 parent 6dc810f commit 4c92516
Show file tree
Hide file tree
Showing 45 changed files with 175 additions and 172 deletions.
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F1348.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
.public sub_02025AAC
.public sub_02025ABC
.public sub_02026E18
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public sub_020689C8
.public sub_020689F8
.public sub_02068B0C
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_01_021F1AFC.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
.public sub_0205DE38
.public sub_0205DEC0
.public sub_0205DFEC
.public DeleteMapObject
.public MapObject_Delete
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetGfxID
.public MapObject_GetFlagID
.public MapObject_GetFlagId
.public MapObject_GetNextFacing
.public MapObject_GetManager
.public sub_0205F484
.public sub_0205F504
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_UnpauseMovement
.public sub_0205F73C
.public MapObject_CheckFlag28
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F8D80.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.public FldObjSys_GetMModelNarc
.public MapObject_SetFlagsBits
.public MapObject_ClearFlagsBits
.public MapObject_GetFlagsMask
.public MapObject_GetFlagsBits
.public MapObject_TestFlagsBits
.public MapObject_GetGfxID
.public MapObject_SetFacingDirection
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F944C.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
.public FldObjSys_GetMModelNarc
.public MapObject_SetFlagsBits
.public MapObject_ClearFlagsBits
.public MapObject_GetFlagsMask
.public MapObject_GetFlagsBits
.public MapObject_TestFlagsBits
.public MapObject_GetID
.public MapObject_GetGfxID
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 @@ -20,7 +20,7 @@
.public MapObject_GetGfxID
.public MapObject_GetFacingDirection
.public MapObject_GetManager
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_CheckVisible
.public MapObject_CheckFlag24
.public MapObject_GetPositionVec
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 @@ -6,7 +6,7 @@
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetFacingDirection
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_GetPositionVec
.public sub_0205F9A0
.public sub_0206121C
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021FEA0C.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.public sub_02020DA4
.public GF_AssertFail
.public sub_0205F09C
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_GetPositionVec
.public sub_0205F9A0
.public sub_0206121C
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 @@ -12,7 +12,7 @@
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetGfxID
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_CheckFlag26
.public MapObject_GetPositionVec
.public MapObject_GetFacingVec
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 @@ -7,7 +7,7 @@
.public sub_0205F09C
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_GetCurrentX
.public MapObject_GetCurrentY
.public MapObject_GetPositionVec
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 @@ -7,7 +7,7 @@
.public sub_0205F09C
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_GetCurrentX
.public MapObject_GetCurrentY
.public MapObject_GetPositionVec
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 @@ -6,7 +6,7 @@
.public sub_0205F0A8
.public MapObject_GetID
.public sub_0205F254
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_GetPositionVec
.public MapObject_GetFacingVec
.public sub_02068D98
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 @@ -44,7 +44,7 @@
.public MapObject_GetParam
.public MapObject_GetManager
.public sub_0205F484
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_CheckVisible
.public MapObject_PauseMovement
.public MapObject_UnpauseMovement
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_02.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
.public sub_0205F328
.public MapObject_GetManager
.public sub_0205F484
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_IsInUse
.public MapObject_SetVisible
.public MapObject_PauseMovement
Expand Down
2 changes: 1 addition & 1 deletion asm/include/unk_0205CB48.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
.public sub_0205F328
.public MapObject_GetMovementCommand
.public sub_0205F504
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_GetPrevX
.public MapObject_GetPrevY
.public MapObject_GetCurrentX
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 @@ -35,7 +35,7 @@
.public MapObject_GetFlagsWord
.public MapObject_SetFlagsBits
.public MapObject_ClearFlagsBits
.public MapObject_GetFlagsMask
.public MapObject_GetFlagsBits
.public MapObject_TestFlagsBits
.public MapObject_GetID
.public MapObject_GetGfxID
Expand All @@ -52,7 +52,7 @@
.public sub_0205F514
.public sub_0205F51C
.public sub_0205F524
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public sub_0205F5E8
.public sub_0205F610
.public MapObject_IsSingleMovementActive
Expand Down
4 changes: 2 additions & 2 deletions 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_GetFlagsMask
.public MapObject_GetFlagsBits
.public MapObject_GetMovement
.public MapObject_GetType
.public MapObject_GetInitialFacing
Expand All @@ -24,7 +24,7 @@
.public sub_0205F328
.public sub_0205F370
.public sub_0205F394
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_SingleMovementSetActive
.public MapObject_SingleMovementSetInactive
.public MapObject_ClearFlag3
Expand Down
2 changes: 1 addition & 1 deletion asm/include/unk_020632B0.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
.public sub_0205F40C
.public sub_0205F484
.public MapObject_IncMovementStep
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_IsSingleMovementActive
.public MapObject_CheckVisible
.public MapObject_UnpauseMovement
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,7 +17,7 @@
.public sub_0205EEF4
.public MapObject_SetFlagsBits
.public MapObject_ClearFlagsBits
.public MapObject_GetFlagsMask
.public MapObject_GetFlagsBits
.public MapObject_TestFlagsBits
.public sub_0205F254
.public MapObject_GetType
Expand All @@ -29,7 +29,7 @@
.public MapObject_SetMovementCommand
.public MapObject_GetMovementCommand
.public MapObject_SetMovementStep
.public MapObject_GetFieldSysPtr
.public MapObject_GetFieldSystemPtr
.public MapObject_SingleMovementSetActive
.public MapObject_SingleMovementSetInactive
.public MapObject_IsSingleMovementActive
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021F1348.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ ov01_021F1468: ; 0x021F1468
thumb_func_start ov01_021F146C
ov01_021F146C: ; 0x021F146C
push {r3, lr}
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
ldr r0, [r0, #0x44]
pop {r3, pc}
.balign 4, 0
Expand Down
6 changes: 3 additions & 3 deletions asm/overlay_01_021F1AFC.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ _021F1BF6:
add r0, r5, #0
bl PlayerAvatar_GetMapObject
add r6, r0, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
mov r0, #1
mov r1, #0
str r0, [sp]
Expand Down Expand Up @@ -636,14 +636,14 @@ _021F1F96:
cmp r1, r0
bne _021F1FF4
add r0, r5, #0
bl MapObject_GetFlagID
bl MapObject_GetFlagId
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r7, #0
lsr r1, r1, #0x10
bl FieldSystem_FlagSet
add r0, r5, #0
bl DeleteMapObject
bl MapObject_Delete
mov r1, #0xa
add r2, r6, #0
mul r2, r1
Expand Down
4 changes: 2 additions & 2 deletions asm/overlay_01_021F8D80.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ ov01_021F92A0: ; 0x021F92A0
mov r1, #1
add r0, r4, #0
lsl r1, r1, #0xe
bl MapObject_GetFlagsMask
bl MapObject_GetFlagsBits
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_GetFlagsMask
bl MapObject_GetFlagsBits
cmp r0, #0
beq _021F9370
mov r0, #1
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021F944C.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2095,7 +2095,7 @@ ov01_021FA2D4: ; 0x021FA2D4
push {r3, lr}
mov r1, #1
lsl r1, r1, #0x16
bl MapObject_GetFlagsMask
bl MapObject_GetFlagsBits
cmp r0, #0
beq _021FA2E6
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 @@ -76,7 +76,7 @@ ov01_021FDA74: ; 0x021FDA74
sub sp, #0x24
add r5, r0, #0
add r4, r1, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
str r0, [sp, #8]
add r0, r5, #0
bl ov01_021F146C
Expand Down Expand Up @@ -726,7 +726,7 @@ ov01_021FDF88: ; 0x021FDF88
sub sp, #0x24
add r5, r0, #0
add r4, r1, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
str r0, [sp, #8]
add r0, r5, #0
bl ov01_021F146C
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 @@ -92,7 +92,7 @@ ov01_021FE7DC: ; 0x021FE7DC
cmp r0, #0
bne _021FE826
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
mov r1, #2
lsl r2, r4, #0x10
lsl r1, r1, #0xe
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021FEA0C.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ ov01_021FEAB0: ; 0x021FEAB0
str r4, [sp, #0x1c]
str r0, [sp, #0x18]
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
str r0, [sp, #0x20]
add r0, r4, #0
mov r1, #5
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 @@ -103,7 +103,7 @@ ov01_021FF4FC: ; 0x021FF4FC
bl ov01_021F146C
add r4, r0, #0
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
str r0, [sp, #0x14]
add r0, r4, #0
mov r1, #0xa
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 @@ -103,7 +103,7 @@ ov01_021FF74C: ; 0x021FF74C
bl ov01_021F146C
add r4, r0, #0
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
str r0, [sp, #0x14]
add r0, r4, #0
mov r1, #0xb
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 @@ -103,7 +103,7 @@ ov01_022000DC: ; 0x022000DC
bl ov01_021F146C
add r4, r0, #0
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
str r0, [sp, #0x14]
add r0, r4, #0
mov r1, #0xf
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_022006A8.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ ov01_02200730: ; 0x02200730
bl ov01_021F146C
add r4, r0, #0
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
str r0, [sp, #0x14]
add r0, r4, #0
mov r1, #0x15
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_022053EC.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ ov01_022056C4: ; 0x022056C4
push {r3, r4, r5, r6, r7, lr}
add r6, r0, #0
add r5, r1, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
add r7, r0, #0
add r0, r6, #0
bl MapObject_GetCurrentX
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_02.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21663,7 +21663,7 @@ ov02_0224FE70: ; 0x0224FE70
bne _0224FEFC
_0224FE9E:
add r0, r4, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystemPtr
ldr r1, _0224FF00 ; =0x0000087C
add r6, r0, #0
ldrb r1, [r5, r1]
Expand Down
Loading

0 comments on commit 4c92516

Please sign in to comment.