diff --git a/asm/objectB5.s b/asm/objectB5.s deleted file mode 100644 index 89ef3f00..00000000 --- a/asm/objectB5.s +++ /dev/null @@ -1,29 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start ObjectB5 -ObjectB5: @ 0x080A0E28 - push {lr} - adds r1, r0, #0 - ldrb r0, [r1, #0xc] - cmp r0, #0 - bne _080A0E36 - movs r0, #1 - strb r0, [r1, #0xc] -_080A0E36: - ldr r0, _080A0E48 @ =gRoomControls - str r1, [r0, #0x30] - ldr r0, _080A0E4C @ =gPlayerEntity - ldr r3, _080A0E50 @ =0xFFD80000 - movs r2, #0 - bl PositionRelative - pop {pc} - .align 2, 0 -_080A0E48: .4byte gRoomControls -_080A0E4C: .4byte gPlayerEntity -_080A0E50: .4byte 0xFFD80000 diff --git a/linker.ld b/linker.ld index 67e3a23a..8210a334 100644 --- a/linker.ld +++ b/linker.ld @@ -884,7 +884,7 @@ SECTIONS { src/object/objectB2.o(.text); asm/objectB3.o(.text); asm/objectB4.o(.text); - asm/objectB5.o(.text); + src/object/objectB5.o(.text); asm/objectB6.o(.text); src/object/well.o(.text); asm/windTribeTeleporter.o(.text); diff --git a/src/object/objectB5.c b/src/object/objectB5.c new file mode 100644 index 00000000..c149cec5 --- /dev/null +++ b/src/object/objectB5.c @@ -0,0 +1,12 @@ +#include "entity.h" +#include "room.h" +#include "player.h" +#include "coord.h" + +void ObjectB5(Entity* this) { + if (this->action == 0) { + this->action = 1; + } + gRoomControls.cameraTarget = this; + PositionRelative(&gPlayerEntity, this, 0, -0x280000); +}