mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-17 21:33:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match Object12_Action2

Browse Source
This commit is contained in:
Tal Hayon
2022-05-24 16:55:30 +03:00
parent 68fa893dc0
commit 5dd8bb6078
2 changed files with 10 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/object12.c
+10 -6
View File
@@ -51,8 +51,9 @@ void Object12_Init(Object12Entity* this) {
void Object12_Action1(Object12Entity* this) {
}
NONMATCH("asm/non_matching/object12/Object12_Action2.inc", void Object12_Action2(Object12Entity* this)) {
void Object12_Action2(Object12Entity* this) {
u32 tmp;
u32 tmp2;
if (--super->timer == 0) {
super->action = 3;
super->timer = 0x1e;
@@ -60,13 +61,16 @@ NONMATCH("asm/non_matching/object12/Object12_Action2.inc", void Object12_Action2
gScreen.lcd.displayControl |= 0x2000;
gScreen.controls.windowInsideControl = 0x1f;
gScreen.controls.windowOutsideControl = 0xf;
tmp = super->x.HALF.HI - gRoomControls.scroll_x;
gScreen.controls.window0HorizontalDimensions = (((tmp - 0x18) & 0xff) << 8) | ((tmp + 0x18) & 0xff);
tmp = super->y.HALF.HI - gRoomControls.scroll_y;
gScreen.controls.window0VerticalDimensions = (((tmp - 0x18) & 0xff) << 8) | ((tmp + 0x18) & 0xff);
tmp2 = super->x.HALF.HI;
tmp = gRoomControls.scroll_x;
tmp2 = tmp2 - tmp;
gScreen.controls.window0HorizontalDimensions = (((tmp2 - 0x18) & 0xff) << 8) | ((tmp2 + 0x18) & 0xff);
tmp2 = super->y.HALF.HI;
tmp = gRoomControls.scroll_y;
tmp2 = tmp2 - tmp;
gScreen.controls.window0VerticalDimensions = (((tmp2 - 0x18) & 0xff) << 8) | ((tmp2 + 0x18) & 0xff);
}
}
END_NONMATCH
void Object12_Action3(Object12Entity* this) {
if (--super->timer == 0) {