mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-08 15:30:14 +00:00
ovl_Demo_Kankyo OK (#608)
* Decompiled, not yet matched * Another match * Fix merge * OK * Move cutscene data to separate source files, name some functions and variables * Small cleanup * Some docs * Small improvements * Struct_Unk_150 -> DemoKankyo_Unk_150 * Review Suggestions Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review changes * rm reloc asm Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Tharo
GitHub
parent
5da5263176
commit
badb1d9d5e
40 changed files with 1226 additions and 3300 deletions
|
|
@ -1,38 +0,0 @@
|
|||
.include "macro.inc"
|
||||
|
||||
# assembler directives
|
||||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
.set gp=64 # allow use of 64-bit general purpose registers
|
||||
|
||||
.section .bss
|
||||
|
||||
.balign 16
|
||||
|
||||
glabel D_8098CF80
|
||||
.space 0x02
|
||||
glabel D_8098CF82
|
||||
.space 0x02
|
||||
glabel D_8098CF84
|
||||
.space 0x04
|
||||
glabel D_8098CF88
|
||||
.space 0x04
|
||||
glabel D_8098CF8C
|
||||
.space 0x0C
|
||||
glabel D_8098CF98
|
||||
.space 0x04
|
||||
glabel D_8098CF9C
|
||||
.space 0x04
|
||||
glabel D_8098CFA0
|
||||
.space 0x04
|
||||
glabel D_8098CFA4
|
||||
.space 0x04
|
||||
glabel D_8098CFA8
|
||||
.space 0x10
|
||||
glabel D_8098CFB8
|
||||
.space 0x04
|
||||
glabel D_8098CFBC
|
||||
.space 0x04
|
||||
glabel D_8098CFC0
|
||||
.space 0x10
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
.include "macro.inc"
|
||||
|
||||
# assembler directives
|
||||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
.set gp=64 # allow use of 64-bit general purpose registers
|
||||
|
||||
.section .data
|
||||
|
||||
.balign 16
|
||||
|
||||
glabel D_8098B910
|
||||
.word 0x00000002, 0x000000A4, 0x00000005, 0x00010000, 0x00870000, 0x00000000, 0x42714CA7, 0x001F004F, 0x003B010F, 0x00000000, 0x42714CA7, 0x001F004E, 0x003C0120, 0x00000000, 0x42714CA7, 0x0020004E, 0x003C0131, 0x00000000, 0x42714CA7, 0x001E004F, 0x003B01F4, 0x00000000, 0x42714CA7, 0x001E004E, 0x003C01F6, 0x00000000, 0x42714CA7, 0x001E004E, 0x003C0207, 0xFF000000, 0x42714CA7, 0x001E004E, 0x003C0000, 0x00000006, 0x00010000, 0x00A40000, 0x0000001E, 0x42714CA7, 0x000B0032, 0x0017010F, 0x0000001E, 0x42714CA7, 0x000B0030, 0x00160120, 0x00000007, 0x42714CA7, 0x000B0030, 0x00160131, 0x00000007, 0x42714CA7, 0x00390065, 0x001501F4, 0x0000001E, 0x42714CA7, 0x00390065, 0x001501F6, 0x0000001E, 0x42714CA7, 0x00390065, 0x00150207, 0xFF00001E, 0x42714CA7, 0x00390065, 0x00150000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
|
||||
glabel D_8098BA20
|
||||
.word 0x00000005, 0x0000048F, 0x00000005, 0x00010000, 0x04720000, 0x00000000, 0x42714CA8, 0x001F0052, 0x003D20BA, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA1BC, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA5E1, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA5CB, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA5EB, 0x00000000, 0x42714CA8, 0x001F0052, 0x003D20BA, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA1BC, 0xFF000000, 0x42714CA8, 0x001F0052, 0x003DA5E1, 0x00000006, 0x00010000, 0x048F0000, 0x0000001E, 0x42714CA8, 0x00370063, 0x001F20BA, 0x0000001E, 0x42714CA8, 0x00370063, 0x001FA1BC, 0x0000000A, 0x42714CA8, 0x00370063, 0x001FA5E1, 0x00000007, 0x42714CA8, 0x0011003B, 0x001FA5CB, 0x0000001E, 0x42714CA8, 0x0011003B, 0x001FA5EB, 0x000003E8, 0x42714CA8, 0x0011003B, 0x001F20BA, 0x0000001E, 0x42714CA8, 0x0011003B, 0x001FA1BC, 0xFF00001E, 0x42714CA8, 0x0011003B, 0x001FA5E1, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000003, 0x00000001, 0x000C005F, 0x00610000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000
|
||||
glabel D_8098BBA0
|
||||
.word 0x00000002, 0x00000076, 0x00000005, 0x00010000, 0x00590000, 0x00000000, 0x428EA647, 0x00350035, 0x0028010F, 0x00000000, 0x42700000, 0x00350035, 0x00280120, 0x00000000, 0x42700000, 0x00350035, 0x00280131, 0x00000000, 0x428D3328, 0x003A0066, 0x003001F4, 0x00000000, 0x428D3328, 0x003A0066, 0x003001F6, 0x00000000, 0x428D3328, 0x003A0066, 0x00300207, 0xFF000000, 0x428D3328, 0x003A0066, 0x00300047, 0x00000006, 0x00010000, 0x00760000, 0x00000007, 0x428D0CAF, 0x000B001D, 0x000A010F, 0x00000007, 0x428CCCC2, 0x000B001D, 0x000A0120, 0x00000007, 0x428D3328, 0x000B001D, 0x000A0131, 0x00000007, 0x428D3328, 0x001D0047, 0x001901F4, 0x0000001E, 0x428D3328, 0x001D0047, 0x001901F6, 0x0000001E, 0x428D3328, 0x001D0047, 0x00190207, 0xFF00001E, 0x428D3328, 0x001D0047, 0x00190047, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
|
||||
glabel D_8098BCB0
|
||||
.word 0x00000005, 0x00000460, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000005, 0x00010000, 0x04430000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0xFF000000, 0x42714CA8, 0x002A0059, 0x003229D0, 0x00000006, 0x00010000, 0x04600000, 0x0000001E, 0x42714CA8, 0x00180042, 0x001D0000, 0x0000001E, 0x42714CA8, 0x00180042, 0x001D0000, 0x000003E8, 0x42714CA8, 0x00180042, 0x001D0000, 0x0000001E, 0x42714CA8, 0x00180042, 0x001D0000, 0xFF00001E, 0x42714CA8, 0x00180042, 0x001D29D0, 0x00000003, 0x00000001, 0x000C005F, 0x00600000, 0x00000000, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000
|
||||
glabel D_8098BDD0
|
||||
.word 0x00000002, 0x0000048C, 0x00000005, 0x00010000, 0x046F0000, 0x00000000, 0x42714CA7, 0x001F0044, 0x003B010F, 0x00000000, 0x42714CA7, 0x00200044, 0x003C0120, 0x00000000, 0x42714CA7, 0x001F0045, 0x003B0131, 0x00000000, 0x42714CA7, 0x001F0040, 0x003B01F4, 0x00000000, 0x42714CA7, 0x001F0040, 0x003B01F6, 0x00000000, 0x42714CA7, 0x001F0040, 0x003B0207, 0x00000000, 0x42714CA7, 0x001F0040, 0x003BB46C, 0xFF000000, 0x42714CA7, 0x001F0040, 0x003B05BC, 0x00000006, 0x00010000, 0x048C0000, 0x0000001E, 0x42714CA7, 0x000C0028, 0x0016010F, 0x0000001E, 0x42714CA7, 0x000B0026, 0x00160120, 0x00000007, 0x42714CA7, 0x000B0027, 0x00160131, 0x00000007, 0x42714CA7, 0x00390056, 0x001501F4, 0x0000001E, 0x42714CA7, 0x00390056, 0x001501F6, 0x000003E8, 0x42714CA7, 0x00390056, 0x00150207, 0x0000001E, 0x42714CA7, 0x00390056, 0x0015B46C, 0xFF00001E, 0x42714CA7, 0x00390056, 0x001505BC, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
|
||||
glabel D_8098BF00
|
||||
.word 0x00000005, 0x0000048F, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000005, 0x00010000, 0x04720000, 0x00000000, 0x42714CA8, 0x001E003F, 0x003DA8A5, 0x00000000, 0x42714CA8, 0x001E003F, 0x003DA3D9, 0x00000000, 0x42714CA8, 0x001E003F, 0x003DF3A5, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BA5D5, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BA5E7, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BA5EC, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BBCA5, 0xFF000000, 0x42714CA9, 0x001D003D, 0x003BEEC0, 0x00000006, 0x00010000, 0x048F0000, 0x0000001E, 0x42714CA8, 0x0036004F, 0x001FA8A5, 0x0000001E, 0x42714CA8, 0x00360050, 0x001FA3D9, 0x0000000A, 0x42714CA8, 0x0036004F, 0x001FF3A5, 0x00000007, 0x42714CA9, 0x000F002A, 0x001EA5D5, 0x0000001E, 0x42714CA9, 0x000F002A, 0x001EA5E7, 0x000003E8, 0x42714CA9, 0x000F002A, 0x001EA5EC, 0x0000001E, 0x42714CA9, 0x000F002A, 0x001EBCA5, 0xFF00001E, 0x42714CA9, 0x000F002A, 0x001EEEC0, 0x00000003, 0x00000001, 0x000C005F, 0x00600000, 0x00000000, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000
|
||||
glabel D_8098C080
|
||||
.word 0x00000002, 0x0000045E, 0x00000005, 0x00010000, 0x04410000, 0x00000000, 0x428EA647, 0x00350035, 0x0028010F, 0x00000000, 0x42700000, 0x00350035, 0x00280120, 0x00000000, 0x42700000, 0x00350035, 0x00280131, 0x00000000, 0x428D3328, 0x003A0059, 0x002F01F4, 0x00000000, 0x428D3328, 0x003A0059, 0x002F01F6, 0x00000000, 0x428D3328, 0x003A0059, 0x002F0207, 0x00000000, 0x428D3328, 0x003A0059, 0x002F0000, 0xFF000000, 0x428D3328, 0x003A0059, 0x002F0000, 0x00000006, 0x00010000, 0x045E0000, 0x00000007, 0x428D0CAF, 0x000B001D, 0x000A010F, 0x00000007, 0x428CCCC2, 0x000B001D, 0x000A0120, 0x00000007, 0x428D3328, 0x000B001D, 0x000A0131, 0x00000007, 0x428D3328, 0x001D003A, 0x001901F4, 0x0000001E, 0x428D3328, 0x001D003A, 0x001901F6, 0x000003E8, 0x428D3328, 0x001D003A, 0x00190207, 0x0000001E, 0x428D3328, 0x001D003A, 0x00190000, 0xFF00001E, 0x428D3328, 0x001D003A, 0x00190000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
|
||||
glabel D_8098C1B0
|
||||
.word 0x00000005, 0x00000460, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000005, 0x00010000, 0x04430000, 0x00000000, 0x42714CAA, 0x0029004B, 0x00311F1C, 0x00000000, 0x42714CAA, 0x0029004B, 0x00311F8C, 0x00000000, 0x42714CAA, 0x0029004B, 0x00311FFC, 0x00000000, 0x42714CAA, 0x0029004B, 0x0031206C, 0xFF000000, 0x42714CAA, 0x0029004B, 0x003120DC, 0x00000006, 0x00010000, 0x04600000, 0x0000001E, 0x42714CAA, 0x00180034, 0x001D1F1C, 0x0000001E, 0x42714CAA, 0x00180034, 0x001D1F8C, 0x000003E8, 0x42714CAA, 0x00180034, 0x001D1FFC, 0x0000001E, 0x42714CAA, 0x00180034, 0x001D206C, 0xFF00001E, 0x42714CAA, 0x00180034, 0x001D20DC, 0x00000003, 0x00000001, 0x000C005F, 0x00600000, 0x00000000, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000
|
||||
glabel Demo_Kankyo_InitVars
|
||||
.word 0x008C0100, 0x00000030, 0x00010000, 0x00000604
|
||||
.word DemoKankyo_Init
|
||||
.word DemoKankyo_Destroy
|
||||
.word DemoKankyo_Update
|
||||
.word DemoKankyo_Draw
|
||||
glabel D_8098C2F0
|
||||
.word 0x00920092, 0x00920092, 0x00920092, 0x00920001, 0x00B600B6, 0x00B600B6, 0x00B6005E, 0x005E0001, 0x00010001, 0x00000000, 0x43160000
|
||||
glabel D_8098C31C
|
||||
.word 0x00C800FF, 0x32000096, 0xFFFF9600, 0xC832FFC8, 0xFF000000
|
||||
glabel D_8098C330
|
||||
.word 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0x00000008, 0x42340000, 0xFFE60000, 0x00000000, 0x00000008, 0x42340000, 0x00000017, 0x00240000, 0x00000008, 0x42340000, 0x001C0032, 0xFFFF0000, 0x00000008, 0x42340000, 0x00010018, 0xFFD90000, 0x00000008, 0x42340000, 0xFFE6FFFA, 0x00030000, 0x00000008, 0x42340000, 0x00000025, 0x00370000, 0x00000008, 0x42340000, 0x004F0066, 0x00290000, 0x00000008, 0x42340000, 0x00A600AD, 0x00060000, 0x00000005, 0x42340000, 0x010D015A, 0xFF4C0000, 0x00000005, 0x42340000, 0x019F0245, 0xFE350000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000
|
||||
glabel D_8098C410
|
||||
.word 0x00000005, 0x42340000, 0x019F0245, 0xFE350000, 0x00000005, 0x42340000, 0x010D015A, 0xFF4C0000, 0x00000008, 0x42340000, 0x00A600AD, 0x00060000, 0x00000008, 0x42340000, 0x004F0066, 0x00290000, 0x00000008, 0x42340000, 0x00000025, 0x00370000, 0x00000008, 0x42340000, 0xFFE6FFFA, 0x00030000, 0x00000008, 0x42340000, 0x00010018, 0xFFD90000, 0x00000008, 0x42340000, 0x001C0032, 0xFFFF0000, 0x00000008, 0x42340000, 0x00000017, 0x00240000, 0x00000008, 0x42340000, 0xFFE60000, 0x00000000, 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000
|
||||
glabel D_8098C4F0
|
||||
.word 0x00C800FF, 0x32000096, 0xFFFF9600, 0x00FFFFC8, 0xFF000000
|
||||
glabel D_8098C504
|
||||
.word 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFD70000, 0xFFE90000, 0x00000002, 0x42340000, 0xFFD30000, 0x000A0000, 0x00000002, 0x42340000, 0xFFE80001, 0x00270000, 0x00000002, 0x42340000, 0x00150000, 0x002B0000, 0x00000002, 0x42340000, 0x002F0005, 0x000E0000, 0x00000002, 0x42340000, 0x00310005, 0xFFF50000, 0x00000002, 0x42340000, 0x00200005, 0xFFDA0000, 0x00000002, 0x42340000, 0xFFF50005, 0xFFD10000, 0x00000002, 0x42340000, 0xFFD70006, 0xFFEA0000, 0x00000002, 0x42340000, 0xFFD50009, 0x000D0000, 0x00000002, 0x42340000, 0xFFE90009, 0x00270000, 0x00000002, 0x42340000, 0x0014000B, 0x00290000, 0x00000002, 0x42340000, 0x002D000B, 0x000F0000, 0x00000002, 0x42340000, 0x002E000B, 0xFFF00000, 0x00000002, 0x42340000, 0x001E000B, 0xFFDA0000, 0x00000002, 0x42340000, 0xFFFA000E, 0xFFD30000, 0x00000002, 0x42340000, 0xFFDA000E, 0xFFEB0000, 0x00000002, 0x42340000, 0xFFD70010, 0x00080000, 0x00000002, 0x42340000, 0xFFE90010, 0x00240000, 0x00000002, 0x42340000, 0x00110010, 0x00280000, 0x00000002, 0x42340000, 0x002C0010, 0x000D0000, 0x00000002, 0x42340000, 0x002C0012, 0xFFF50000, 0x00000002, 0x42340000, 0x001F0011, 0xFFDE0000, 0x00000002, 0x42340000, 0xFFFB0014, 0xFFD50000, 0x00000002, 0x42340000, 0xFFDD0014, 0xFFEC0000, 0x00000002, 0x42340000, 0xFFDA0017, 0x00080000, 0x00000002, 0x42340000, 0xFFE80014, 0x001F0000, 0x00000002, 0x42340000, 0x000C0018, 0x00260000, 0x00000002, 0x42340000, 0x00270018, 0x000D0000, 0x00000002, 0x42340000, 0x0027001B, 0xFFF60000, 0x00000002, 0x42340000, 0x001C001A, 0xFFE20000, 0x00000002, 0x42340000, 0xFFFA000E, 0xFFD40000, 0x00000002, 0x42340000, 0xFFD9001B, 0xFFEF0000, 0x00000002, 0x42340000, 0xFFD7001B, 0x000A0000, 0x00000002, 0x42340000, 0xFFE6001B, 0x00220000, 0x00000002, 0x42340000, 0x000F001F, 0x002C0000, 0x00000002, 0x42340000, 0x00320020, 0x00090000, 0x00000002, 0x42340000, 0x00300021, 0xFFF00000, 0x00000002, 0x42340000, 0x001C0025, 0xFFD90000, 0x00000002, 0x42340000, 0xFFFA0028, 0xFFD40000, 0x00000002, 0x42340000, 0xFFD8002B, 0xFFF50000, 0x00000002, 0x42340000, 0xFFD7002B, 0x00060000, 0x00000002, 0x42340000, 0xFFDF002B, 0x00190000, 0x00000002, 0x42340000, 0x000E002E, 0x002C0000, 0x00000002, 0x42340000, 0x0032002E, 0x00030000, 0x00000002, 0x42340000, 0x002A0030, 0xFFE70000, 0x00000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0x00000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0xFF000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0xFF000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
.include "macro.inc"
|
||||
|
||||
# assembler directives
|
||||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
.set gp=64 # allow use of 64-bit general purpose registers
|
||||
|
||||
.section .rodata
|
||||
|
||||
.balign 16
|
||||
|
||||
glabel D_8098CB60
|
||||
.incbin "baserom/ovl_Demo_Kankyo", 0x3CE0, 0x00000420
|
||||
Loading…
Add table
Add a link
Reference in a new issue