mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +00:00
Code Issues Projects Releases Wiki Activity

Demo_Kekkai, its object, and its cutscenes (#627)

Browse source 
* first pass

* scene

* object

* name

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "44f5d7cb9"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "44f5d7cb9"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* now with cutscenes

* one last name

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0305ec2c2"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0305ec2c2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* ZAPD works

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "2e1174063"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "2e1174063"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* now with vtx arrays

* revert zap changes

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
petrie911 2021-02-01 13:52:23 -06:00 • committed by GitHub
parent 1fbc0f1943
commit 6615d212eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 455 additions and 1410 deletions
Download patch file Download diff file Expand all files Collapse all files

42
data/overlays/actors/z_demo_kekkai.data.s
View file

@ -1,42 +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 Demo_Kekkai_InitVars
.word 0x01A70700, 0x00000030, 0x01790000, 0x000001FC
.word DemoKekkai_Init
.word DemoKekkai_Destroy
.word DemoKekkai_Update
.word DemoKekkai_Draw
glabel D_8098E0B0
.word 0x0A110939, 0x10010000, 0x00000000, 0x20000000, 0x07040000, 0x00002000, 0x00000000, 0x01010100, 0x02A800DC, 0x00780000, 0x00000000
glabel D_8098E0DC
.word 0xAAFFFF00, 0x32FFFFFF, 0xAAC8FF00, 0xFFFFAAC8, 0x0000FFAA, 0xFF6400C8, 0xFFFFAAFF, 0x7800FFFF, 0xAA00C800
glabel D_8098E100
.word 0x000000C3, 0x000000BC, 0x000000BF, 0x000000BE, 0x000000BD, 0x000000AD, 0x000000BB
glabel D_8098E11C
.word 0x00000000
glabel D_8098E120
.word 0x00000000
glabel D_8098E124
.word 0x00000000
glabel D_8098E128
.word 0x00000000, 0x00000000, 0x00000000
glabel D_8098E134
.word 0xFFFFAA00
glabel D_8098E138
.word 0xC8000000
glabel D_8098E13C
.word 0x00000118, 0x01180118, 0x01180118, 0x01180000
glabel D_8098E14C
.word 0x00000000, 0x0201A8E0, 0x0201C6B0, 0x0201BC80, 0x0201B2B0, 0x0201D080, 0x02019EE0
glabel D_8098E168
.word 0x01010000, 0x02020202, 0x02020202, 0x02020202, 0x01010000, 0x00010202, 0x02020202, 0x01000001, 0x02020101, 0x02020202, 0x02020202, 0x02020101, 0x00000001, 0x01000202, 0x02020202, 0x02020202, 0x02020202, 0x01010000, 0x00010100, 0x02020202, 0x02020202, 0x02020100, 0x01000202, 0x02020202, 0x02010102, 0x00000000

13
data/overlays/actors/z_demo_kekkai.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_8098E2D0
.incbin "baserom/ovl_Demo_Kekkai", 0x1300, 0x00000190