mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00
Code Issues Projects Releases Wiki Activity

G_Switch, Syateki_Itm, and Syateki_Man (Shooting gallery and related actors) (#523)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* rupees and, for some reason, pots

* and now an even larger man

* now for the gallery

* more progress

* naming continues

* even more docs

* another match

* match, fix, a new enum

* Update src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c

* fixes except globalctx

* well one more

* and now globalCtx
This commit is contained in:
petrie911 2020-12-11 16:38:23 -06:00 • committed by GitHub
parent bc8e3745c7
commit f05a584dea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
67 changed files with 1464 additions and 4117 deletions
Download patch file Download diff file Expand all files Collapse all files

30
data/overlays/actors/z_en_g_switch.data.s
View file

@ -1,30 +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_80A236E0
.word 0x00000000
glabel D_80A236E4
.word 0x0A000900, 0x20010000, 0x02000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010000, 0x000D0028, 0x00000000, 0x00000000, 0x00000001, 0x00020013, 0x00140000
glabel En_G_Switch_InitVars
.word 0x01170600, 0x00000030, 0x00010000, 0x000012F8
.word EnGSwitch_Init
.word EnGSwitch_Destroy
.word EnGSwitch_Update
.word 0x00000000
glabel D_80A2373C
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A23748
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A23754
.word 0x00020405, 0x07000000
glabel D_80A2375C
.word 0x04042140, 0x04042160, 0x04042180, 0x040421C0, 0x040421A0, 0x040421E0, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_g_switch.reloc.s
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_80A23B30
.incbin "baserom/ovl_En_G_Switch", 0x1C70, 0x00000230

66
data/overlays/actors/z_en_syateki_itm.data.s
View file

@ -1,66 +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_Syateki_Itm_InitVars
.word 0x00C00600, 0x00000010, 0x00010000, 0x000001D8
.word EnSyatekiItm_Init
.word EnSyatekiItm_Destroy
.word EnSyatekiItm_Update
.word 0x00000000
glabel D_80B10240
.word 0x00000000, 0xC1200000, 0xC3870000
glabel D_80B1024C
.word 0xC35C0000, 0x42840000, 0xC3A00000
glabel D_80B10258
.word 0x43820000, 0x42840000, 0xC3A00000
glabel D_80B10264
.word 0x00000000, 0xC1200000, 0xC3870000
glabel D_80B10270
.word 0xC35C0000, 0x42840000, 0xC3A00000
glabel D_80B1027C
.word 0x43820000, 0x42840000, 0xC3A00000
glabel D_80B10288
.word 0x43820000, 0x42C80000, 0xC3A00000
glabel D_80B10294
.word 0x43B40000, 0x42C80000, 0xC3A00000
glabel D_80B102A0
.word 0xC3660000, 0x42BC0000, 0xC3B40000
glabel D_80B102AC
.word 0xC3C80000, 0x42BC0000, 0xC3B40000
glabel D_80B102B8
.word 0x00000000, 0x42540000, 0xC3870000
glabel D_80B102C4
.word 0xC2700000, 0x427C0000, 0xC3A00000
glabel D_80B102D0
.word 0x42700000, 0x427C0000, 0xC3A00000
glabel D_80B102DC
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80B102E8
.word 0xC2700000, 0x427C0000, 0xC3A00000
glabel D_80B102F4
.word 0x42700000, 0x427C0000, 0xC3A00000
glabel D_80B10300
.word 0xC3660000, 0x00000000, 0x00000000
glabel D_80B1030C
.word 0xC3660000, 0x00000000, 0x00000000
glabel D_80B10318
.word 0x43820000, 0x00000000, 0x00000000
glabel D_80B10324
.word 0x43820000, 0x00000000, 0x00000000
glabel D_80B10330
.word 0x00000001, 0x00000001, 0x00020002
glabel D_80B1033C
.word 0x00000001, 0x00010000, 0x00010001, 0x00040004, 0x00040004
glabel D_80B10350
.word 0xC2200000, 0x00000000, 0xC2B40000, 0xC1A00000, 0x00000000, 0xC2B40000, 0x00000000, 0x00000000, 0xC2B40000, 0x41A00000, 0x00000000, 0xC2B40000, 0x42200000, 0x00000000, 0xC2B40000, 0xC2200000, 0x00000000, 0xC2700000, 0xC1A00000, 0x00000000, 0xC2700000, 0x00000000, 0x00000000, 0xC2700000, 0x41A00000, 0x00000000, 0xC2700000, 0x42200000, 0x00000000, 0xC2700000
glabel D_80B103C8
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_syateki_itm.reloc.s
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_80B10690
.incbin "baserom/ovl_En_Syateki_Itm", 0xFE0, 0x000001E0

28
data/overlays/actors/z_en_syateki_man.data.s
View file

@ -1,28 +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_Syateki_Man_InitVars
.word 0x00C10400, 0x08000019, 0x005B0000, 0x0000022C
.word EnSyatekiMan_Init
.word EnSyatekiMan_Destroy
.word EnSyatekiMan_Update
.word EnSyatekiMan_Draw
glabel D_80B115E0
.word 0x00000001, 0x00020018, 0x00190002, 0x0019001A, 0x001A081A, 0x001B001C, 0x001D001E, 0x001F0020, 0x00210922, 0x00230924, 0x00250026, 0x00270028, 0x0029002A, 0x092B002C, 0x002D002E, 0x002F0030, 0x00320033, 0x00340035, 0x00360037, 0x00380039, 0x003A003B, 0x003C003D, 0x003E003F, 0x00400041, 0x00420043, 0x00440045, 0x00460047, 0x00480049, 0x004A004B, 0x004C004D, 0x004E004F, 0x00500051, 0x00520053, 0x00540055, 0x00560057, 0x00580059, 0x005A005B, 0x005C005D, 0x006D005E, 0x005E005F, 0x00600061, 0x006D0062, 0x00630064, 0x00650066
glabel D_80B11690
.byte 0x00, 0x2B, 0x00, 0x2E, 0x00, 0xC8
glabel D_80B11696
.byte 0x00, 0x2D
glabel D_80B11698
.byte 0x00, 0x04, 0x00, 0x05, 0x00, 0x05
glabel D_80B1169E
.byte 0x00, 0x05

13
data/overlays/actors/z_en_syateki_man.reloc.s
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_80B117A0
.incbin "baserom/ovl_En_Syateki_Man", 0xF30, 0x00000150