decompiled ObjectB5

This commit is contained in:
Henny022p 2021-10-22 18:45:06 +02:00
parent 10f17e914a
commit 7469f65209
3 changed files with 13 additions and 30 deletions

View File

@ -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

View File

@ -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);

12
src/object/objectB5.c Normal file
View File

@ -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);
}