mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

ovl_Demo_Gj Ok (#670)

Browse source 
* a bunch of functions

Signed-off-by: angie <angheloalf95@gmail.com>

* another bunch of functions

Signed-off-by: angie <angheloalf95@gmail.com>

* add dummies to func_8097911C to match it

Signed-off-by: angie <angheloalf95@gmail.com>

* fix some functions declarations

Signed-off-by: angie <angheloalf95@gmail.com>

* Add functions of the array used by the update function

Signed-off-by: angie <angheloalf95@gmail.com>

* add functions used by draw

Signed-off-by: angie <angheloalf95@gmail.com>

* draw and update functions

Signed-off-by: angie <angheloalf95@gmail.com>

* DemoGj_Init

Signed-off-by: angie <angheloalf95@gmail.com>

* fix some functions declarations

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* 9 small functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Some unmatched functions and 12 small matched functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* another 7 small functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* add data

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* small types fixes

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* six more functions

Signed-off-by: angie <angheloalf95@gmail.com>

* func_80978C20

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8097BA48

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* five repeated functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Array of cylinders and two other functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* seven equals and problematic functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* func_80978F60 and func_80979860

Signed-off-by: angie <angheloalf95@gmail.com>

* func_8097923C doesn't want to match :c

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* three not matching functions

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* func_80978AFC

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* three more

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* DemoGj_FindGanon

Signed-off-by: angie <angheloalf95@gmail.com>

* func_809797E4

Signed-off-by: angie <angheloalf95@gmail.com>

* func_80978B90

Signed-off-by: angie <angheloalf95@gmail.com>

* last non matching function

Signed-off-by: angie <angheloalf95@gmail.com>

* erase reloc

Signed-off-by: angie <angheloalf95@gmail.com>

* a bit of renaming

Signed-off-by: angie <angheloalf95@gmail.com>

* another chunk of renaming

Signed-off-by: angie <angheloalf95@gmail.com>

* fix reg macros and a few comments

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* vt, arrayfuncs renaming and another bit of renaming

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* More renaming

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* i'm hating this actor

Signed-off-by: angie <angheloalf95@gmail.com>

* format

Signed-off-by: angie <angheloalf95@gmail.com>

* Changes asked by @shawlucas

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* swap globalCtx and globalCtx2

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* Move static variables nearer to where they are used and general cleanup

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* A bunch of changes

Signed-off-by: angie <angheloalf95@gmail.com>

* run format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* Forgot to change updateMode

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename the references to object_gj

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename some functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* document the actor params, a few members and rename some draw functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename DemoGj_DrawRubbleDisplayList into DemoGj_DrawRotated

Signed-off-by: angie <angheloalf95@gmail.com>

* The first type is the the rubble that is around the fight's arena

Signed-off-by: angie <angheloalf95@gmail.com>

* rename the enums

Signed-off-by: angie <angheloalf95@gmail.com>

* Document the value read from the Ganon instance and rename a few functions from that

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename init and draw functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename smoke spawner functions

Signed-off-by: angie <angheloalf95@gmail.com>

* run format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* fix merge issues

Signed-off-by: Angie <angheloalf95@gmail.com>
This commit is contained in:
Anghelo Carvajal 2021-02-28 11:53:46 -03:00 • committed by GitHub
parent c47372d397
commit 62606737f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
126 changed files with 1464 additions and 4249 deletions
Download patch file Download diff file Expand all files Collapse all files

88
data/overlays/actors/z_demo_gj.data.s
View file

@ -1,88 +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_8097BDE0
.word 0x00000900, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x001E0064, 0x00000000, 0x00000000
glabel D_8097BE0C
.word 0x00000900, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x0019006E, 0x00000000, 0x00000000
glabel D_8097BE38
.word 0x00000900, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x001900C8, 0x00000000, 0x00000000
glabel D_8097BE64
.word 0x00000000, 0x40C00000, 0x00000000
glabel D_8097BE70
.word 0x00000000, 0x00000000, 0x00000000
glabel D_8097BE7C
.word 0x00000000
glabel D_8097BE80
.word 0x00000000
glabel D_8097BE84
.word 0x48500064
glabel D_8097BE88
.word 0xC3B98000, 0x44948000, 0xC3978000
glabel D_8097BE94
.word 0xC2EE0000, 0x44840000, 0xC3130000
glabel D_8097BEA0
.word 0xC0C00000, 0x4483A000, 0xC3EC8000
glabel D_8097BEAC
.word 0x00000000, 0x00000000, 0x00000000
glabel D_8097BEB8
.word 0x00000000, 0x00000000, 0x00000000
glabel D_8097BEC4
.word 0x00000000, 0x00000000, 0x00000000
glabel D_8097BED0
.word func_8097ADF0
.word func_8097A160
.word func_8097A39C
.word func_8097A56C
.word func_8097A73C
.word func_8097A90C
.word func_8097AADC
.word func_8097AD18
.word func_8097A190
.word func_8097A3CC
.word func_8097A59C
.word func_8097A76C
.word func_8097A93C
.word func_8097AB0C
.word func_8097AD48
.word func_8097B340
.word func_8097B864
.word func_8097BB78
.word func_8097B370
.word func_8097B894
.word func_8097BBA8
glabel D_8097BF24
.word func_8097BD70
.word func_8097AE38
.word func_8097A1C0
.word func_8097A3FC
.word func_8097A5CC
.word func_8097A79C
.word func_8097A96C
.word func_8097AB3C
.word func_8097AD78
.word func_8097A1E4
.word func_8097A420
.word func_8097A5F0
.word func_8097A7C0
.word func_8097A990
.word func_8097AB60
.word func_8097AD9C
.word func_8097B3A0
.word func_8097B8C4
.word func_8097BBD8
glabel Demo_Gj_InitVars
.word 0x01B10600, 0x00000030, 0x01850000, 0x00000278
.word DemoGj_Init
.word DemoGj_Destroy
.word DemoGj_Update
.word DemoGj_Draw

13
data/overlays/actors/z_demo_gj.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_8097C280
.incbin "baserom/ovl_Demo_Gj", 0x3950, 0x000005F0