summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTharo <17233964+Thar0@users.noreply.github.com>2021-09-12 16:10:10 +0100
committerGitHub <noreply@github.com>2021-09-12 11:10:10 -0400
commiteccfd2efbf5d76f496dd0e110a2691c687e7d92d (patch)
treeb9bfe0db620add721e8f11f5d38aabd3dc21f483 /data
parente31e35658dd08e9f983eef8aef0e239ecd603333 (diff)
Decompile ovl_Door_Warp1 (#949)
* Initial progress on Door_Warp1 * Fix merge * More work on Door_Warp1 * Decompile most of Door_Warp1 * 2 more functions OK * All decompiled, 3 nonmatching * Tiny improvements, fix several warnings * Remove commented GLOBAL_ASM lines * Fix * Fix merge * Two more matches * Some docs * More docs * Use generated reloc under NON_MATCHING * Fix accesses in ru1 * Add break and add limbs and dlists for the skeleton to the object xml * Comment values for enums Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * boolean returns for flag checking functions Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * Named more loop variables i and named DoorWarp1_FloatPlayer * Last function matched thanks to Roman * Some further suggestions * Fix Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Diffstat (limited to 'data')
-rw-r--r--data/overlays/actors/z_door_warp1.bss.s16
-rw-r--r--data/overlays/actors/z_door_warp1.data.s20
2 files changed, 0 insertions, 36 deletions
diff --git a/data/overlays/actors/z_door_warp1.bss.s b/data/overlays/actors/z_door_warp1.bss.s
deleted file mode 100644
index 572aa3cfd..000000000
--- a/data/overlays/actors/z_door_warp1.bss.s
+++ /dev/null
@@ -1,16 +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_8099CCA0
- .space 0x02
-glabel D_8099CCA2
- .space 0x0E
-
diff --git a/data/overlays/actors/z_door_warp1.data.s b/data/overlays/actors/z_door_warp1.data.s
deleted file mode 100644
index 178d80ab6..000000000
--- a/data/overlays/actors/z_door_warp1.data.s
+++ /dev/null
@@ -1,20 +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 Door_Warp1_InitVars
- .word 0x005D0700, 0x00000000, 0x00480000, 0x000001F0
-.word DoorWarp1_Init
-.word DoorWarp1_Destroy
-.word DoorWarp1_Update
-.word DoorWarp1_Draw
-glabel D_8099C5A0
- .word 0xC85003E8, 0xB0F40FA0, 0xB0F80320, 0x30FC0FA0
-