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

En_Heishi1 and Eff_Ss_Solder_Srch_Ball OK (#234)

Browse source 
* progress

* init ok and merge master

* enheishi1 and srchball OK

* cleanup

* cleanup

* cleanup

* more cleanup

* done

* more comments

* add file headers

* some review comments

* move vectors

* more review comments

* angle in decimal

* add prototype

* semicolon would be good

* fix

* make unset actor ids 0

* reword comment

* no &
This commit is contained in:
fig02 2020-07-09 15:12:03 -04:00 • committed by GitHub
parent b4a7ac9d71
commit 8b6e86649d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 636 additions and 1880 deletions
Download patch file Download diff file Expand all files Collapse all files

36
data/overlays/actors/z_en_heishi1.data.s
View file

@ -1,36 +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_80A527A0
.word 0x00000000
glabel En_Heishi1_InitVars
.word 0x00000400, 0x00000010, 0x00970000, 0x000002AC
.word EnHeishi1_Init
.word EnHeishi1_Destroy
.word EnHeishi1_Update
.word EnHeishi1_Draw
glabel D_80A527C4
.word 0x3F800000, 0xC1200000, 0x40400000, 0x3F000000, 0x447A0000, 0x43480000, 0x3E99999A, 0x447A0000, 0x40400000, 0xC0400000, 0x40C00000, 0x3F4CCCCD, 0x44FA0000, 0x43C80000, 0x3F000000, 0x44FA0000, 0x3F800000, 0xC1200000, 0x40400000, 0x3F000000, 0x447A0000, 0x43480000, 0x3E99999A, 0x447A0000, 0x40400000, 0xC0400000, 0x40C00000, 0x3F4CCCCD, 0x44FA0000, 0x43C80000, 0x3F000000, 0x44FA0000
glabel D_80A52844
.word 0x0014000A, 0x0014000A, 0x000D0000
glabel D_80A52850
.word 0x00000000, 0x00000000, 0x42B40000, 0xC25C0000, 0x00000000, 0x42B40000, 0xC25C0000, 0x00000000, 0x41F00000, 0xC25C0000, 0x00000000, 0xC1F00000, 0x00000000, 0x00000000, 0xC1F00000, 0x425C0000, 0x00000000, 0xC1F00000, 0x425C0000, 0x00000000, 0x41F00000, 0x425C0000, 0x00000000, 0x42B40000
glabel D_80A528B0
.word 0x00000007, 0x00000007, 0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000003, 0x00000003, 0x00000004, 0x00000004, 0x00000005, 0x00000006, 0x00000004, 0x00000004, 0x00000005, 0x00000006
glabel D_80A528F0
.word 0x00000004, 0x00010005, 0x00020006, 0x00030007
glabel D_80A52900
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A5290C
.word 0x00000000, 0x00000000, 0x41A00000
glabel D_80A52918
.word 0x3E99999A, 0x3E99999A, 0x3E99999A, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_heishi1.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_80A52C50
.incbin "baserom/ovl_En_Heishi1", 0x1980, 0x00000250