diff options
| author | petrie911 <69443847+petrie911@users.noreply.github.com> | 2020-12-28 19:56:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 20:56:24 -0500 |
| commit | 42f2d38b8fb8e97330bc12e06d71bd35ea2c33e2 (patch) | |
| tree | 2c904f252f415b9ef2336190620b60d773c63a0e /data | |
| parent | 1e6bd7f623dead2c5bcbdb5c89a0c9e65c7a86e4 (diff) | |
En_Torch2 (#486)
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* Oh boy more giant functions
* now functional, but not equivalent
* Now only non-matching
* cleaned up illusion room
* much closer. static variables still suck though
* much closer. static variables still suck though
* some docs and cleanup. matching is horrible.
* static varaibles are a troublesome lot
* ifdef
* merge ZAP
* merge again
* small cleanup
* small fixes
* swordstate
* resolve conflict
* comments and such
Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_en_torch2.bss.s | 60 | ||||
| -rw-r--r-- | data/overlays/actors/z_en_torch2.data.s | 32 |
2 files changed, 0 insertions, 92 deletions
diff --git a/data/overlays/actors/z_en_torch2.bss.s b/data/overlays/actors/z_en_torch2.bss.s deleted file mode 100644 index f3ac2eebf..000000000 --- a/data/overlays/actors/z_en_torch2.bss.s +++ /dev/null @@ -1,60 +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_80B20130 - .space 0x02 -glabel D_80B20132 - .space 0x01 -glabel D_80B20133 - .space 0x03 -glabel D_80B20136 - .space 0x02 -glabel D_80B20138 - .space 0x01 -glabel D_80B20139 - .space 0x03 -glabel D_80B2013C - .space 0x02 -glabel D_80B2013E - .space 0x01 -glabel D_80B2013F - .space 0x03 -glabel D_80B20142 - .space 0x06 -glabel D_80B20148 - .space 0x08 -glabel D_80B20150 - .space 0x04 -glabel D_80B20154 - .space 0x04 -glabel D_80B20158 - .space 0x04 -glabel D_80B2015C - .space 0x01 -glabel D_80B2015D - .space 0x01 -glabel D_80B2015E - .space 0x01 -glabel D_80B2015F - .space 0x01 -glabel D_80B20160 - .space 0x01 -glabel D_80B20161 - .space 0x01 -glabel D_80B20162 - .space 0x01 -glabel D_80B20163 - .space 0x01 -glabel D_80B20164 - .space 0x01 -glabel D_80B20165 - .space 0x0B - diff --git a/data/overlays/actors/z_en_torch2.data.s b/data/overlays/actors/z_en_torch2.data.s deleted file mode 100644 index c5c79120f..000000000 --- a/data/overlays/actors/z_en_torch2.data.s +++ /dev/null @@ -1,32 +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_Torch2_InitVars - .word 0x00330900, 0x00000035, 0x00200000, 0x00000A94 -.word EnTorch2_Init -.word EnTorch2_Destroy -.word EnTorch2_Update -.word EnTorch2_Draw -glabel D_80B1F9F0 - .word 0x00000000 -glabel D_80B1F9F4 - .word 0x00000000 -glabel D_80B1F9F8 - .word 0x00000000 -glabel D_80B1F9FC - .word 0x00000000 -glabel D_80B1FA00 - .word 0x00000000 -glabel D_80B1FA04 - .word 0x00000000 -glabel D_80B1FA08 - .word 0x10020102, 0x10020210, 0x01020402, 0x02020202, 0x02E260D3, 0x00000104, 0x02020804, 0x00000400, 0x00000000, 0x00000000 - |