diff options
| -rw-r--r-- | asm/intro.s | 369 | ||||
| -rw-r--r-- | src/intro.c | 148 |
2 files changed, 147 insertions, 370 deletions
diff --git a/asm/intro.s b/asm/intro.s index dd561950f..ba8795a42 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -5,375 +5,6 @@ .text - thumb_func_start sub_80ED188 -sub_80ED188: @ 80ED188 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r7, r0, 0 - ldrb r0, [r7, 0x4] - cmp r0, 0x6 - bls _080ED19A - b _080ED3F6 -_080ED19A: - lsls r0, 2 - ldr r1, _080ED1A4 @ =_080ED1A8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080ED1A4: .4byte _080ED1A8 - .align 2, 0 -_080ED1A8: - .4byte _080ED1C4 - .4byte _080ED214 - .4byte _080ED32C - .4byte _080ED350 - .4byte _080ED360 - .4byte _080ED3BC - .4byte _080ED3D2 -_080ED1C4: - movs r0, 0x2 - negs r0, r0 - ldr r2, _080ED204 @ =0x00007fff - movs r1, 0x10 - bl BlendPalettes - ldr r1, _080ED208 @ =gUnknown_840BB90 - movs r0, 0 - movs r2, 0x4 - bl InitBgsFromTemplates - ldr r1, _080ED20C @ =gUnknown_8405414 - movs r0, 0 - str r0, [sp] - movs r0, 0x3 - movs r2, 0 - movs r3, 0 - bl DecompressAndCopyTileDataToVram - ldr r1, _080ED210 @ =gUnknown_8405890 - movs r0, 0x1 - str r0, [sp] - movs r0, 0x3 - movs r2, 0 - movs r3, 0 - bl DecompressAndCopyTileDataToVram - movs r0, 0x3 - bl ShowBg - b _080ED3CA - .align 2, 0 -_080ED204: .4byte 0x00007fff -_080ED208: .4byte gUnknown_840BB90 -_080ED20C: .4byte gUnknown_8405414 -_080ED210: .4byte gUnknown_8405890 -_080ED214: - bl FreeTempTileDataBuffersIfPossible - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0 - beq _080ED222 - b _080ED3F6 -_080ED222: - movs r0, 0 - bl SetVBlankCallback - ldr r0, _080ED2FC @ =gUnknown_84053B4 - movs r1, 0x10 - movs r2, 0x60 - bl LoadPalette - ldr r0, _080ED300 @ =gUnknown_8405DA4 - movs r1, 0x50 - movs r2, 0x20 - bl LoadPalette - ldr r0, _080ED304 @ =gUnknown_8406634 - movs r1, 0x60 - movs r2, 0x20 - bl LoadPalette - movs r5, 0x2 - negs r5, r5 - ldr r0, _080ED308 @ =0x00007fff - mov r8, r0 - adds r0, r5, 0 - movs r1, 0x10 - mov r2, r8 - bl BlendPalettes - ldr r1, _080ED30C @ =gUnknown_8405B28 - str r6, [sp] - movs r0, 0 - movs r2, 0 - movs r3, 0 - bl DecompressAndCopyTileDataToVram - ldr r1, _080ED310 @ =gUnknown_8405CDC - movs r4, 0x1 - str r4, [sp] - movs r0, 0 - movs r2, 0 - movs r3, 0 - bl DecompressAndCopyTileDataToVram - ldr r1, _080ED314 @ =gUnknown_8406654 - str r6, [sp] - movs r0, 0x1 - movs r2, 0 - movs r3, 0 - bl DecompressAndCopyTileDataToVram - ldr r1, _080ED318 @ =gUnknown_84071D0 - str r4, [sp] - movs r0, 0x1 - movs r2, 0 - movs r3, 0 - bl DecompressAndCopyTileDataToVram - ldr r1, _080ED31C @ =gUnknown_8405DC4 - str r6, [sp] - movs r0, 0x2 - movs r2, 0 - movs r3, 0 - bl DecompressAndCopyTileDataToVram - ldr r1, _080ED320 @ =gUnknown_840644C - str r4, [sp] - movs r0, 0x2 - movs r2, 0 - movs r3, 0 - bl DecompressAndCopyTileDataToVram - bl ResetBgPositions - movs r0, 0 - bl ShowBg - movs r0, 0x1 - bl HideBg - movs r0, 0x2 - bl HideBg - movs r1, 0xE7 - lsls r1, 9 - movs r0, 0x2 - movs r2, 0 - bl ChangeBgY - movs r1, 0xA0 - lsls r1, 6 - movs r0, 0x1 - movs r2, 0 - bl ChangeBgY - ldr r0, _080ED324 @ =sub_80ED40C - movs r1, 0 - bl CreateTask - adds r0, r7, 0 - bl sub_80ED444 - adds r0, r5, 0 - movs r1, 0x10 - mov r2, r8 - bl BlendPalettes - ldr r0, _080ED328 @ =sub_80EC9EC - bl SetVBlankCallback - b _080ED3CA - .align 2, 0 -_080ED2FC: .4byte gUnknown_84053B4 -_080ED300: .4byte gUnknown_8405DA4 -_080ED304: .4byte gUnknown_8406634 -_080ED308: .4byte 0x00007fff -_080ED30C: .4byte gUnknown_8405B28 -_080ED310: .4byte gUnknown_8405CDC -_080ED314: .4byte gUnknown_8406654 -_080ED318: .4byte gUnknown_84071D0 -_080ED31C: .4byte gUnknown_8405DC4 -_080ED320: .4byte gUnknown_840644C -_080ED324: .4byte sub_80ED40C -_080ED328: .4byte sub_80EC9EC -_080ED32C: - bl FreeTempTileDataBuffersIfPossible - lsls r0, 24 - cmp r0, 0 - bne _080ED3F6 - movs r1, 0x2 - negs r1, r1 - ldr r0, _080ED34C @ =0x00007fff - str r0, [sp] - adds r0, r1, 0 - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _080ED3CA - .align 2, 0 -_080ED34C: .4byte 0x00007fff -_080ED350: - ldr r0, _080ED35C @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - b _080ED3C0 - .align 2, 0 -_080ED35C: .4byte gPaletteFade -_080ED360: - ldrh r0, [r7, 0x12] - adds r0, 0x1 - strh r0, [r7, 0x12] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3B - bls _080ED3F6 - movs r0, 0 - strh r0, [r7, 0x12] - ldr r0, _080ED3B4 @ =sub_80ED40C - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - adds r0, r7, 0 - bl sub_80ED4A0 - ldr r0, _080ED3B8 @ =sub_80ED428 - movs r1, 0 - bl CreateTask - movs r1, 0x80 - lsls r1, 9 - movs r0, 0x3 - movs r2, 0 - bl ChangeBgY - movs r0, 0 - bl HideBg - movs r0, 0x3 - bl ShowBg - movs r0, 0x1 - bl ShowBg - movs r0, 0x2 - bl ShowBg - b _080ED3CA - .align 2, 0 -_080ED3B4: .4byte sub_80ED40C -_080ED3B8: .4byte sub_80ED428 -_080ED3BC: - bl IsDma3ManagerBusyWithBgCopy -_080ED3C0: - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - bne _080ED3F6 - strh r0, [r7, 0x12] -_080ED3CA: - ldrb r0, [r7, 0x4] - adds r0, 0x1 - strb r0, [r7, 0x4] - b _080ED3F6 -_080ED3D2: - ldrh r0, [r7, 0x12] - adds r0, 0x1 - strh r0, [r7, 0x12] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3B - bls _080ED3F6 - ldr r0, _080ED404 @ =sub_80ED428 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - ldr r1, _080ED408 @ =sub_80ED4C0 - adds r0, r7, 0 - bl sub_80ECAA8 -_080ED3F6: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080ED404: .4byte sub_80ED428 -_080ED408: .4byte sub_80ED4C0 - thumb_func_end sub_80ED188 - - thumb_func_start sub_80ED40C -sub_80ED40C: @ 80ED40C - push {lr} - movs r0, 0x3 - movs r1, 0xE0 - movs r2, 0x2 - bl ChangeBgX - movs r1, 0x88 - lsls r1, 1 - movs r0, 0 - movs r2, 0x1 - bl ChangeBgX - pop {r0} - bx r0 - thumb_func_end sub_80ED40C - - thumb_func_start sub_80ED428 -sub_80ED428: @ 80ED428 - push {lr} - movs r0, 0x2 - movs r1, 0x20 - movs r2, 0x1 - bl ChangeBgY - movs r0, 0x1 - movs r1, 0x24 - movs r2, 0x2 - bl ChangeBgY - pop {r0} - bx r0 - thumb_func_end sub_80ED428 - - thumb_func_start sub_80ED444 -sub_80ED444: @ 80ED444 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0 - str r0, [r4, 0x1C] - str r0, [r4, 0x20] - ldr r0, _080ED494 @ =gUnknown_840BDA8 - movs r1, 0xA8 - movs r2, 0x50 - movs r3, 0xB - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080ED46E - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080ED498 @ =gSprites - adds r0, r1 - str r0, [r4, 0x20] -_080ED46E: - ldr r0, _080ED49C @ =gUnknown_840BDC0 - movs r1, 0x48 - movs r2, 0x50 - movs r3, 0xC - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080ED48E - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080ED498 @ =gSprites - adds r0, r1 - str r0, [r4, 0x1C] -_080ED48E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080ED494: .4byte gUnknown_840BDA8 -_080ED498: .4byte gSprites -_080ED49C: .4byte gUnknown_840BDC0 - thumb_func_end sub_80ED444 - - thumb_func_start sub_80ED4A0 -sub_80ED4A0: @ 80ED4A0 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x1C] - cmp r0, 0 - beq _080ED4AE - bl DestroySprite -_080ED4AE: - ldr r0, [r4, 0x20] - cmp r0, 0 - beq _080ED4B8 - bl DestroySprite -_080ED4B8: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80ED4A0 - thumb_func_start sub_80ED4C0 sub_80ED4C0: @ 80ED4C0 push {r4,r5,lr} diff --git a/src/intro.c b/src/intro.c index 51fbbac74..25c2f59eb 100644 --- a/src/intro.c +++ b/src/intro.c @@ -27,7 +27,10 @@ struct IntroSequenceData u8 field_000C[6]; u16 field_0012; struct Sprite * field_0014; - u8 filler_0018[0x24]; + u8 filler_0018[4]; + struct Sprite * field_001C; + struct Sprite * field_0020; + u8 filler_0024[0x18]; u8 field_003C[0x400]; u8 field_043C[0x400]; u8 filler_083C[0x2080]; @@ -52,7 +55,13 @@ void sub_80ED0AC(u8 taskId); void sub_80ED118(void); void sub_80ED140(u8 taskId); void sub_80ED188(struct IntroSequenceData * ptr); +void sub_80ED40C(u8 taskId); +void sub_80ED428(u8 taskId); +void sub_80ED444(struct IntroSequenceData * ptr); +void sub_80ED4A0(struct IntroSequenceData * ptr); +void sub_80ED4C0(struct IntroSequenceData * ptr); void sub_80EDBE8(struct IntroSequenceData * ptr); +void sub_80ED40C(u8 taskId); void sub_80EDC40(void); void sub_80EDDF0(void); void sub_80EDED8(void); @@ -76,11 +85,25 @@ extern const u8 gUnknown_8403FE8[]; extern const u16 gUnknown_84048CC[]; extern const u8 gUnknown_84048EC[]; extern const u8 gUnknown_8404F7C[]; +extern const u16 gUnknown_84053B4[]; +extern const u8 gUnknown_8405414[]; +extern const u8 gUnknown_8405890[]; +extern const u8 gUnknown_8405B28[]; +extern const u8 gUnknown_8405CDC[]; +extern const u16 gUnknown_8405DA4[]; +extern const u8 gUnknown_8405DC4[]; +extern const u8 gUnknown_840644C[]; +extern const u16 gUnknown_8406634[]; +extern const u8 gUnknown_8406654[]; +extern const u8 gUnknown_84071D0[]; extern const struct BgTemplate gUnknown_840BB80[2]; extern const struct BgTemplate gUnknown_840BB88[2]; +extern const struct BgTemplate gUnknown_840BB90[4]; extern const struct WindowTemplate gUnknown_840BBA8[]; +extern const struct SpriteTemplate gUnknown_840BDA8; +extern const struct SpriteTemplate gUnknown_840BDC0; void sub_80EC5A4(void) { @@ -590,3 +613,126 @@ void sub_80ED140(u8 taskId) ChangeBgY(1, data[1] << 15, 0); } } + +void sub_80ED188(struct IntroSequenceData * this) +{ + switch (this->field_0004) + { + case 0: + BlendPalettes(0xFFFFFFFE, 16, RGB_WHITE); + InitBgsFromTemplates(0, gUnknown_840BB90, NELEMS(gUnknown_840BB90)); + DecompressAndCopyTileDataToVram(3, gUnknown_8405414, 0, 0, 0); + DecompressAndCopyTileDataToVram(3, gUnknown_8405890, 0, 0, 1); + ShowBg(3); + this->field_0004++; + break; + case 1: + if (!FreeTempTileDataBuffersIfPossible()) + { + SetVBlankCallback(NULL); + LoadPalette(gUnknown_84053B4, 0x10, 0x60); + LoadPalette(gUnknown_8405DA4, 0x50, 0x20); + LoadPalette(gUnknown_8406634, 0x60, 0x20); + BlendPalettes(0xFFFFFFFE, 16, RGB_WHITE); + DecompressAndCopyTileDataToVram(0, gUnknown_8405B28, 0, 0, 0); + DecompressAndCopyTileDataToVram(0, gUnknown_8405CDC, 0, 0, 1); + DecompressAndCopyTileDataToVram(1, gUnknown_8406654, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gUnknown_84071D0, 0, 0, 1); + DecompressAndCopyTileDataToVram(2, gUnknown_8405DC4, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, gUnknown_840644C, 0, 0, 1); + ResetBgPositions(); + ShowBg(0); + HideBg(1); + HideBg(2); + ChangeBgY(2, 0x0001CE00, 0); + ChangeBgY(1, 0x00002800, 0); + CreateTask(sub_80ED40C, 0); + sub_80ED444(this); + BlendPalettes(0xFFFFFFFE, 16, RGB_WHITE); + SetVBlankCallback(sub_80EC9EC); + this->field_0004++; + } + break; + case 2: + if (!FreeTempTileDataBuffersIfPossible()) + { + BeginNormalPaletteFade(0xFFFFFFFE, -2, 16, 0, RGB_WHITE); + this->field_0004++; + } + break; + case 3: + if (!gPaletteFade.active) + { + this->field_0012 = 0; + this->field_0004++; + } + break; + case 4: + this->field_0012++; + if (this->field_0012 >= 60) + { + this->field_0012 = 0; + DestroyTask(FindTaskIdByFunc(sub_80ED40C)); + sub_80ED4A0(this); + CreateTask(sub_80ED428, 0); + ChangeBgY(3, 0x00010000, 0); + HideBg(0); + ShowBg(3); + ShowBg(1); + ShowBg(2); + this->field_0004++; + } + break; + case 5: + if (!IsDma3ManagerBusyWithBgCopy()) + { + this->field_0012 = 0; + this->field_0004++; + } + break; + case 6: + this->field_0012++; + if (this->field_0012 >= 60) + { + DestroyTask(FindTaskIdByFunc(sub_80ED428)); + sub_80ECAA8(this, sub_80ED4C0); + } + break; + } +} + +void sub_80ED40C(u8 taskId) +{ + ChangeBgX(3, 0x0E0, 2); + ChangeBgX(0, 0x110, 1); +} + +void sub_80ED428(u8 taskId) +{ + ChangeBgY(2, 0x020, 1); + ChangeBgY(1, 0x024, 2); +} + +void sub_80ED444(struct IntroSequenceData * this) +{ + u8 spriteId; + + this->field_001C = NULL; + this->field_0020 = NULL; + + spriteId = CreateSprite(&gUnknown_840BDA8, 168, 80, 11); + if (spriteId != MAX_SPRITES) + this->field_0020 = &gSprites[spriteId]; + + spriteId = CreateSprite(&gUnknown_840BDC0, 72, 80, 12); + if (spriteId != MAX_SPRITES) + this->field_001C = &gSprites[spriteId]; +} + +void sub_80ED4A0(struct IntroSequenceData * this) +{ + if (this->field_001C != NULL) + DestroySprite(this->field_001C); + if (this->field_0020 != NULL) + DestroySprite(this->field_0020); +} |