mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 22:44:30 +00:00
Code Issues Projects Releases Wiki Activity

Poe Actor Decomps (#463)

Browse source 
* Poe actors progress

* Some more progress, En_Poh almost matching

* Further progress

* Fix merge

* Decompile data

* Actor struct cleanups

* More functions OK

* Progress

* Last function decompiled, some nonmatchings left

* Few more OK, skelanime_init definition changes

* Progress

* Style improvements, OPEN/CLOSE_DISPS, few more OK

* Few more style improvements, function prototype additions/changes, another function OK

* Remove unused asm, begin documentation

* Use generated reloc

* Cleanup, format

* Remove a few no longer needed comments

* PR suggestions

* DISP macros

* Missed some FrameUpdateMatrix != 0 replacements

* EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx

* Fix merge, reformat

* Review Suggestions

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Further review suggestions

* Ran formatter

* Less DECR usage

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Tharo 2020-12-05 00:34:27 +00:00 • committed by GitHub
parent e983d2b72b
commit f85a2d10ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
212 changed files with 4102 additions and 15655 deletions
Download patch file Download diff file Expand all files Collapse all files

24
data/overlays/actors/z_en_po_desert.data.s
View file

@ -1,24 +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 En_Po_Desert_InitVars
.word 0x01BF0100, 0x00001090, 0x006D0000, 0x00000284
.word EnPoDesert_Init
.word EnPoDesert_Destroy
.word EnPoDesert_Update
.word EnPoDesert_Draw
glabel D_80AD39A0
.word 0x03000039, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00190032, 0x00140000, 0x00000000
glabel D_80AD39CC
.word 0x8917005C, 0xB0F407D0, 0x304C0C80
glabel D_80AD39D8
.word 0x00000000, 0x44AF0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_po_desert.reloc.s
View file

@ -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_80AD3A40
.incbin "baserom/ovl_En_Po_Desert", 0xD90, 0x000000C0

18
data/overlays/actors/z_en_po_field.bss.s
View file

@ -1,18 +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_80AD76B0
.space 0x40
glabel D_80AD76F0
.space 0x10
glabel D_80AD7700
.space 0x40

40
data/overlays/actors/z_en_po_field.data.s
View file

@ -1,40 +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 En_Po_Field_InitVars
.word 0x01750500, 0x00001035, 0x006D0000, 0x000002DC
.word EnPoField_Init
.word EnPoField_Destroy
.word EnPoField_Update
.word EnPoField_Draw
glabel D_80AD7080
.word 0x03000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00190032, 0x00140000, 0x00000000
glabel D_80AD70AC
.word 0x0A110000, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00000000, 0x00000000, 0x19000000, 0x000A001E, 0x00000000, 0x00000000
glabel D_80AD70D8
.word 0x04000019, 0x00322800
glabel D_80AD70E0
.word 0x00020102, 0x11020212, 0x01020402, 0x02020202, 0x02000000, 0x00000104, 0x02020804, 0x00000400
glabel D_80AD7100
.word 0x00000000
glabel D_80AD7104
.word 0xC47A0000, 0x00000000, 0x45CB2000
glabel D_80AD7110
.word 0x304C0C80
glabel D_80AD7114
.word 0x00000000, 0x40400000, 0x00000000
glabel D_80AD7120
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80AD712C
.word 0xFFAAFF64, 0x0096FF55, 0x00F80000, 0x06001B70, 0xFFFFAAFF, 0xC800A000, 0xFFF10000, 0x06001370
glabel D_80AD714C
.word 0x00000000, 0x44AF0000, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_po_field.reloc.s
View file

@ -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_80AD72B0
.incbin "baserom/ovl_En_Po_Field", 0x37B0, 0x00000400

36
data/overlays/actors/z_en_po_relay.data.s
View file

@ -1,36 +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_80AD8C30
.byte 0xFF, 0xC4
glabel D_80AD8C32
.byte 0xFD, 0xEE, 0xF4, 0x7A, 0x01, 0x86, 0xFE, 0x0C, 0xF4, 0x7A, 0x01, 0x86, 0xFE, 0x0C, 0xF0, 0xF6, 0x00, 0xD2, 0xFD, 0xEE, 0xF0, 0xF6, 0x00, 0xD2, 0xFD, 0x9E, 0xEE, 0xDA, 0x02, 0x3A, 0xFD, 0xC6, 0xEE, 0xDA, 0x02, 0x3A, 0xFD, 0xC6, 0xED, 0x18, 0x00, 0xD2, 0xFD, 0xC6, 0xED, 0x18, 0x00, 0xD2, 0xFD, 0xC6, 0xEB, 0xCE, 0x00, 0xD2, 0xFD, 0xC6, 0xEA, 0xA2, 0x02, 0x3A, 0xFD, 0xC6, 0xEA, 0xA2, 0x02, 0x3A, 0xFD, 0xC6, 0xEB, 0xB0, 0x04, 0xEC, 0xFD, 0x9E, 0xEB, 0xB0, 0x06, 0x72, 0xFD, 0x62, 0xED, 0x18, 0x06, 0x72, 0xFD, 0x30, 0xEE, 0x80, 0x07, 0xDA, 0xFD, 0x26, 0xEE, 0x80, 0x07, 0xDA, 0xFD, 0x26, 0xEF, 0x70, 0x07, 0xDA, 0xFD, 0x26, 0xF2, 0x04, 0x06, 0x72, 0xFD, 0x44, 0xF2, 0x04, 0x06, 0x72, 0xFD, 0x6C, 0xF3, 0xC6, 0x08, 0x8E, 0xFD, 0x6C, 0xF3, 0xC6, 0x08, 0x8E, 0xFD, 0xB2, 0xF5, 0xE2, 0x09, 0x9C, 0xFD, 0xD0, 0xF5, 0xE2, 0x0B, 0x54, 0xFE, 0x66, 0xF7, 0x72, 0x0B, 0x4E, 0xFE, 0x66, 0xF8, 0x7E, 0x0B, 0x4A, 0xFE, 0x66, 0xF9, 0x7A, 0x0B, 0x4A, 0xFE, 0x98, 0xF9, 0xFC, 0x0B, 0xAE, 0xFE, 0x98, 0xF9, 0xFC
glabel En_Po_Relay_InitVars
.word 0x01220400, 0x00011019, 0x00890000, 0x000002DC
.word EnPoRelay_Init
.word EnPoRelay_Destroy
.word EnPoRelay_Update
.word EnPoRelay_Draw
glabel D_80AD8CF8
.word 0x0A000039, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x001E0034, 0x00000000, 0x00000000
glabel D_80AD8D24
.word 0x00000000
glabel D_80AD8D28
.word 0x8917004F, 0x304C05DC
glabel D_80AD8D30
.word 0x00000000, 0x3FC00000, 0x00000000
glabel D_80AD8D3C
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80AD8D48
.word 0x00000000, 0x44960000, 0x00000000
glabel D_80AD8D54
.word 0x06003B40, 0x06004340, 0x06004B40

48
data/overlays/actors/z_en_po_sisters.data.s
View file

@ -1,48 +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_80ADD6F0
.word 0xFFAAFFFF, 0xFFC800FF, 0x00AAFFFF, 0xAAFF00FF
glabel D_80ADD700
.word 0x6400FFFF, 0xFF0000FF, 0x0000FFFF, 0x009600FF
glabel En_Po_Sisters_InitVars
.word 0x00910500, 0x00005215, 0x00990000, 0x00000338
.word EnPoSisters_Init
.word EnPoSisters_Destroy
.word EnPoSisters_Update
.word EnPoSisters_Draw
glabel D_80ADD730
.word 0x03110939, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x00080000, 0x4FC7FFEA, 0x00000000, 0x01050100, 0x0012003C, 0x000F0000, 0x00000000
glabel D_80ADD75C
.word 0x0A000019, 0x003C2800
glabel D_80ADD764
.word 0xF0020102, 0x00020202, 0xE1E2E402, 0x02020202, 0x02000000, 0x0000E1E4, 0xE2E2E8E4, 0x00000400
glabel D_80ADD784
.word 0x00000000
glabel D_80ADD788
.word 0xC8500007, 0x304C1770
glabel D_80ADD790
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80ADD79C
.word 0xB000D000, 0x50003000
glabel D_80ADD7A4
.word 0xFFEA0151, 0xF958FE51, 0x036FF2AE, 0x0225036F, 0xF2AE06B5, 0x0203FAC4
glabel D_80ADD7BC
.word 0x42F00000, 0x437A0000, 0xC4B18000
glabel D_80ADD7C8
.word 0x06001DE0, 0x06002F88, 0x06003628, 0x06003DC8
glabel D_80ADD7D8
.word 0x06001CB0, 0x06002EB8, 0x06003880, 0x06004020
glabel D_80ADD7E8
.word 0x50006400, 0x500F0000, 0x00463200, 0x46460000
glabel D_80ADD7F8
.word 0x447A0000, 0xC4D48000, 0x00000000, 0x00000000, 0x00000000, 0x00000000

47
data/overlays/actors/z_en_poh.data.s
View file

@ -1,47 +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_80AE1A50
.word 0x00000000
glabel En_Poh_InitVars
.word 0x000D0500, 0x00001015, 0x00010000, 0x000003A8
.word EnPoh_Init
.word EnPoh_Destroy
.word EnPoh_Update
.word 0x00000000
glabel D_80AE1A74
.word 0x03000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00140028, 0x00140000, 0x00000000
glabel D_80AE1AA0
.word 0x00000000, 0xFFCFFFFF, 0x00080000, 0x00000000, 0x00000000, 0x01000100, 0x12000000, 0x05780000, 0x000A0064
glabel D_80AE1AC4
.word 0x03110939, 0x10000000, 0x00000001
.word D_80AE1AA0
glabel D_80AE1AD4
.word 0x04000019, 0x00322800
glabel D_80AE1ADC
.word 0x00020102, 0x11020212, 0x01020402, 0x02020202, 0x02000000, 0x00000104, 0x02020804, 0x00000400
glabel D_80AE1AFC
.word 0xFFAAFF64, 0x00961205, 0xF8000000, 0x060015B0, 0x06000A60, 0x060004EC, 0x060006E0, 0x06002D28, 0x06002608, 0x06003850, 0xFFFFAA00, 0x96000901, 0xF4000000, 0x06001440, 0x060009DC, 0x06000570, 0x06000708, 0x060045A0, 0x06005220, 0x06001C90
glabel D_80AE1B4C
.word 0x4B1419FF
glabel D_80AE1B50
.word 0x506E5AFF
glabel D_80AE1B54
.word 0x5A5532FF
glabel D_80AE1B58
.word 0x645A64FF
glabel D_80AE1B5C
.word 0x304C0C80
glabel D_80AE1B60
.word 0x00000000, 0x40400000, 0x00000000
glabel D_80AE1B6C
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_poh.reloc.s
View file

@ -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_80AE1C80
.incbin "baserom/ovl_En_Poh", 0x3F30, 0x00000440