1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +00:00

Gorons: En_Go & En_Go2 OK (#556)

* moved en_go rodata

* EnGo 20/45 functions decompiled

* EnGo 25/45 functions decompiled

* EnGo 28/45 functions decompiled

* EnGo 32/45 functions decompiled

* minor attempts

* init Goron 2 6/98 decompiled (baby functions)

* Goron2 14/98 func decompiled

* Goron2 30/98 func decompiled

* EnGo 34/45 functions decompiled

* EnGo 38/45 functions decompiled

* Goron2 44/98 functions decompiled

* Goron2 58/98 functions decompiled

* Merged EnGo and EnGo2: 38/45, 58/98 functions decompiled

* EnGo EnGo2: 38/45, 65/98 functions decompiled

* EnGo EnGo2: 38/45, 70/98 functions decompiled

* EnGo EnGo2: 39/45, 72/98 functions decompiled

* EnGo EnGo2: 39/45, 80/98 functions decompiled

* EnGo EnGo2: 39/45, 88/98 functions decompiled

* EnGo EnGo2: 39/45, 92/98 functions decompiled

* typo in GoronType

* EnGo EnGo2: 40/45, 93/98 functions decompiled

* EnGo EnGo2: 45/45, 93/98 functions decompiled

* EnGo EnGo2 fully decomped

* begin cleanup

* the cleanup continues

* continue cleaning

* Documentation and renaming attempt

* more cleanup

* more cleanup

* Apply suggestions from code review

Committing suggestions

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>

* more pr suggestions

* more pr and gns feedback

* fixed comment

* cleanup

* update math & skelAnime names

* goron1

* goron2

* relocs

* review

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
engineer124 2021-02-01 05:02:28 +11:00 committed by GitHub
parent 9f3e8cbf97
commit 8e8421fdec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
158 changed files with 3365 additions and 10877 deletions

View file

@ -1,42 +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_Go_InitVars
.word 0x01520400, 0x00000039, 0x00C90000, 0x000006C8
.word EnGo_Init
.word EnGo_Destroy
.word EnGo_Update
.word EnGo_Draw
glabel D_80A41B00
.word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0014002E, 0x00000000, 0x00000000
glabel D_80A41B2C
.word 0x00000000, 0x00000000, 0xFF000000
glabel D_80A41B38
.word 0x06004930, 0x00000000, 0x01000000, 0x00000000, 0x06004930, 0x00000000, 0x01000000, 0xC1200000, 0x060029A8, 0x3F800000, 0x01000000, 0xC1200000, 0x06010590, 0x3F800000, 0x01000000, 0xC1200000
glabel D_80A41B78
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A41B84
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A41B90
.word 0x00000000, 0x3E99999A, 0x00000000
glabel D_80A41B9C
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A41BA8
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A41BB4
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A41BC0
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A41BCC
.word 0x44160000, 0x00000000, 0x00000000
glabel D_80A41BD8
.word gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex, 0x00000000, 0x00000000

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_80A422E0
.incbin "baserom/ovl_En_Go", 0x3D70, 0x00000A50

View file

@ -1,502 +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_80A41C00
.asciz "../z_en_go.c"
.balign 4
glabel D_80A41C10
.asciz "../z_en_go.c"
.balign 4
glabel D_80A41C20
.asciz "../z_en_go.c"
.balign 4
glabel D_80A41C30
.asciz "../z_en_go.c"
.balign 4
glabel D_80A41C40
.asciz "../z_en_go.c"
.balign 4
glabel D_80A41C50
.asciz "../z_en_go.c"
.balign 4
glabel D_80A41C60
.asciz "../z_en_go.c"
.balign 4
glabel D_80A41C70
.asciz "../z_en_go.c"
.balign 4
glabel D_80A41C80
.asciz "../z_en_go.c"
.balign 4
glabel D_80A41C90
.asciz "../z_en_go.c"
.balign 4
glabel D_80A41CA0
.asciz "../z_en_go.c"
.balign 4
glabel jtbl_80A41CB0
.word L80A3E658
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E70C
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E72C
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E78C
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E7D4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E81C
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E864
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8F4
.word L80A3E8AC
glabel jtbl_80A41E74
.word L80A3ED10
.word L80A3ED10
.word L80A3E970
.word L80A3ED10
.word L80A3EAE0
.word L80A3EC88
.word L80A3ECF8
.word L80A3ED10
.word L80A3ED10
.word L80A3ED10
glabel jtbl_80A41E9C
.word L80A3EA54
.word L80A3EA88
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAA4
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAC8
.word L80A3EAD8
.word L80A3EAC8
.word L80A3EAC8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAC0
.word L80A3EAC8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD0
glabel jtbl_80A41F40
.word L80A3E9C8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3E9E4
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EAD8
.word L80A3EA00
.word L80A3EAD8
.word L80A3EA1C
.word L80A3EAD8
.word L80A3EA38
glabel jtbl_80A41F84
.word L80A3F02C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F02C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F03C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F02C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F02C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F04C
.word L80A3F02C
glabel D_80A420C8
.float 10920.0
glabel D_80A420CC
.float 0.01
glabel D_80A420D0
.float 10000.0
glabel D_80A420D4
.float 4.8
glabel D_80A420D8
.float 10430.3779
glabel D_80A420DC
.float 0.01
glabel D_80A420E0
.float 4.8
glabel jtbl_80A420E4
.word L80A3FCC8
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FD50
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE38
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FDD8
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FD90
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE38
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE38
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE60
.word L80A3FE38
glabel D_80A422A8
.float 1440000.0
glabel D_80A422AC
.float 0.1
glabel D_80A422B0
.float 0.1
glabel D_80A422B4
.float 0.1
glabel D_80A422B8
.float 0.1
glabel D_80A422BC
.float -0.1
glabel D_80A422C0
.float 0.1
glabel D_80A422C4
.float 3.14159274101
glabel D_80A422C8
.float 3.14159274101
glabel D_80A422CC
.float 3.14159274101
glabel D_80A422D0
.float 3.14159274101
glabel D_80A422D4
.float 0.2
glabel D_80A422D8
.float 0.4

View file

@ -1,58 +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_80A480D0
.word gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex
glabel D_80A480F0
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A480FC
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A48108
.word 0x00000000, 0x3E99999A, 0x00000000
glabel D_80A48114
.word 0x0A000939, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00000100, 0x00280041, 0x00000000, 0x00000000
glabel D_80A48140
.word 0x00000000, 0x00000000, 0xFF000000
glabel En_Go2_InitVars
.word 0x01AE0400, 0x00000039, 0x00C90000, 0x000005A0
.word EnGo2_Init
.word EnGo2_Destroy
.word EnGo2_Update
.word EnGo2_Draw
glabel D_80A4816C
.byte 0x00, 0x00
glabel D_80A4816E
.byte 0x00, 0x00
glabel D_80A48170
.word 0x00000044
glabel D_80A48174
.word 0x00940000, 0x00000000, 0x00180034, 0x00000140, 0x017C0190, 0x00780000, 0x00000000, 0x001E0044, 0x00000000, 0x0000002E, 0x005A0000, 0x00000000, 0x001E0044, 0x00000000, 0x0000001E, 0x00440000, 0x00000000, 0x001E0044, 0x00000000, 0x0000001E, 0x00440000, 0x00000000, 0x001E0044, 0x00000000, 0x0000001E, 0x00440000, 0x00000000, 0x001E0044, 0x00000000, 0x0000001E, 0x00440000, 0x00000000, 0x001E0044
glabel D_80A481F8
.word 0x41F00000, 0x3CD4FDF4, 0x06000000, 0x42700000, 0x41C00000, 0x3C03126F, 0x06000000, 0x41F00000, 0x41E00000, 0x3E23D70A, 0x05000000, 0x43BE0000, 0x41E00000, 0x3C23D70A, 0x07000000, 0x42200000, 0x41F00000, 0x3C75C28F, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000
glabel D_80A482D8
.word 0x42A00000, 0x42A00000, 0xC1200000, 0xC1200000, 0x44480000, 0x44480000, 0x00000000, 0x00000000, 0x41A00000, 0x42200000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000
glabel D_80A48348
.word 0x06004930, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x06004930, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x060029A8, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06010590, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06003768, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x060038E4, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xC1000000, 0x06002D80, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xC1000000, 0x0600161C, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06001A00, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x060021D0, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06004930, 0x00000000, 0x00000000, 0xBF800000, 0x01000000, 0xC1000000, 0x06000750, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06000D5C, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000
glabel D_80A48480
.word 0x0C000000, 0x3E4CCCCD, 0x3E4CCCCD, 0x00000001, 0x41900000, 0x00000000, 0x0C000000, 0x3DCCCCCD, 0x3E4CCCCD, 0x0000000C, 0x41D00000, 0x00000000, 0x0C000000, 0x3DCCCCCD, 0x3E99999A, 0x00000004, 0x41200000, 0x00000000, 0x0C000000, 0x3E4CCCCD, 0x3E4CCCCD, 0x00000001, 0x41900000, 0x00000000, 0x0C000000, 0x3F000000, 0x3ECCCCCD, 0x00000003, 0x42280000, 0x00000000, 0x0C000000, 0x3F000000, 0x3ECCCCCD, 0x00000003, 0x42280000, 0x00000000, 0x0C000000, 0x3F000000, 0x3ECCCCCD, 0x00000003, 0x42280000, 0x00000000, 0x0C000000, 0x3F000000, 0x3ECCCCCD, 0x00000003, 0x42280000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
glabel D_80A4854C
.word 0x00000000, 0x00000000
glabel D_80A48554
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A48560
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A4856C
.word 0x44160000, 0x00000000, 0x00000000
glabel D_80A48578
.word 0x0600DA80, 0x0600CE80, 0x0600D280, 0x0600D680
glabel D_80A48588
.word 0x0600DE80, 0x0600E680

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_80A487E0
.incbin "baserom/ovl_En_Go2", 0x5AB0, 0x000006E0