summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorEllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>2021-09-16 00:03:47 +0100
committerGitHub <noreply@github.com>2021-09-15 19:03:47 -0400
commitfbc4071cc83b431a558c2b0b3b4dfecd1a92e679 (patch)
tree5a91264db4b046a5e79d0df7a1bd690c04d02406 /data
parentb9ad6aac524242a633927f8e0bfc426c6d4f87cb (diff)
Match last function in EnTp (#968)
* Data imported, 8 easy functions matched * Init only remaining nonmatching, data in * some renaming & fiddling with Init, still nonmatching * fix colours * Init still not matching * Decompile object_tp * renames * Rename func_80B20DE0 * Horrible new idea * Known equivalent, docs next * Another attempt * Finished naming in object_tp * Named functions, more enums * DrawBridge -> Drawbridge * skulltulla -> Skulltula * Name almost all struct variables * Named most of the temps * delete asm * spec * Missed data file, whoops * Review * More review changes * Match EnTp_Init * spec * Delete asm
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_door_warp1.reloc.s13
-rw-r--r--data/overlays/actors/z_en_ganon_mant.reloc.s13
-rw-r--r--data/overlays/actors/z_en_tp.reloc.s13
3 files changed, 0 insertions, 39 deletions
diff --git a/data/overlays/actors/z_door_warp1.reloc.s b/data/overlays/actors/z_door_warp1.reloc.s
deleted file mode 100644
index 0b39239d2..000000000
--- a/data/overlays/actors/z_door_warp1.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_8099C830
- .incbin "baserom/ovl_Door_Warp1", 0x40B0, 0x00000470
diff --git a/data/overlays/actors/z_en_ganon_mant.reloc.s b/data/overlays/actors/z_en_ganon_mant.reloc.s
deleted file mode 100644
index feaf8da7a..000000000
--- a/data/overlays/actors/z_en_ganon_mant.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_80A27EF0
- .incbin "baserom/ovl_En_Ganon_Mant", 0x4190, 0x00000110
diff --git a/data/overlays/actors/z_en_tp.reloc.s b/data/overlays/actors/z_en_tp.reloc.s
deleted file mode 100644
index 90fae686f..000000000
--- a/data/overlays/actors/z_en_tp.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_80B22BA0
- .incbin "baserom/ovl_En_Tp", 0x1DC0, 0x00000150