diff options
| author | Aly Cerruti <aprime2003@gmail.com> | 2021-07-28 09:51:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 12:51:12 -0400 |
| commit | 6f7312a3480f722425f31fcacbd031c1155bc4d6 (patch) | |
| tree | 5d457a50935afbeec2a9b6dc99360ea7b60db1f2 /data | |
| parent | 5c147e5e03e9d693213537101f56d3a6eb53f16a (diff) | |
Dancing Couple (ovl_En_Tg) (#866)
* Match EnTg_Destroy
* Match EnTg_Init
* Matching EnTg_Update
* Match func_80B18360
Moving both 'return phi;'s into a single return at the end of the function causes the assembly to not match.
* Probably equivalent, non-matching func_80B183F8
* Matching EnTg_Draw
* Matching update function
* Matching func_80B18778
* All functions decompiled
* Move data to C code
* All functions matched excepted weird switch/case
* Last matching function
* Remove unused ASM
* Name obvious symbols
* Clang format
* Name text-related functions and variables
* Describe actor as Dancing Couple
See https://github.com/zeldaret/oot/pull/866#discussion_r664726581
* Use named constants
* Name drawing constants
* Use THIS macro for void*
* Name the function that sets environment color
* Add comments to parts of code that aren't clear
* Rename timesSpokenTo to nextDialogue, treat isTalking as boolean
Diffstat (limited to 'data')
| -rw-r--r-- | data/overlays/actors/z_en_tg.data.s | 24 | ||||
| -rw-r--r-- | data/overlays/actors/z_en_tg.reloc.s | 13 |
2 files changed, 0 insertions, 37 deletions
diff --git a/data/overlays/actors/z_en_tg.data.s b/data/overlays/actors/z_en_tg.data.s deleted file mode 100644 index cfcbfb034..000000000 --- a/data/overlays/actors/z_en_tg.data.s +++ /dev/null @@ -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 D_80B18910 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00140040, 0x00000000, 0x00000000 -glabel D_80B1893C - .word 0x00000000, 0x00000000, 0xFF000000 -glabel En_Tg_InitVars - .word 0x01AC0400, 0x00000009, 0x01820000, 0x0000020C -.word EnTg_Init -.word EnTg_Destroy -.word EnTg_Update -.word EnTg_Draw -glabel D_80B18968 - .word 0x00000000, 0x44480000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_tg.reloc.s b/data/overlays/actors/z_en_tg.reloc.s deleted file mode 100644 index 4c03e48d2..000000000 --- a/data/overlays/actors/z_en_tg.reloc.s +++ /dev/null @@ -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_80B189D0 - .incbin "baserom/ovl_En_Tg", 0x670, 0x000000B0 |