1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
oot/data/overlays/actors/z_object_kankyo.data.s
Zelllll 20c1f4e648
Decompile Gameplay_Keep and fix all existing decompiled objects (#595)
* First batch of files

* Add missing folders back

* Fix missing folders again

* Finish fixing existing texture files

* Gameplay_Keep XML finished

* Most actor gameplay_keep undefined syms removed

* Only ~200 gkeep symbols remain

* All gkeep symbols that ZAP supports are fixed

* Cleanup, and make gkeep names more accurate

* Starting to figure out what some unknown blobs are, merge zeldaret in

* fix a few more things

* refactor gkeep

* Change how gitkeep is handled

* gkeep xml cleanup

* Gkeep finished, now just waiting up ZAP updates

* 100 link animations finished

* 150 link animations finished

* 200 link animations finished

* 250 link animations finished

* 350 link animations finished

* 400 link animations finished

* 450 link animations finished

* 500 link animations finished

* 550 link animations finished

* All Link animations finished

cannot build yet because ZAP doesn't have LinkAnimationHeader yet

* xml changes for new zap stuff

* finish gameplay_keep

* fixing existing objects

* ready for pr besides zap padding issue

* mostly ready for pr

* format all c files

* all conflicts fixed

* make changes that roman requested

* fix thing i didn't mean to change

* some animation symbols renamed

* fixed roman's stuff

* lifemeter hardcoded pointers removed

* fix issue with incorrect data in gameplay_keep

* removed unused asm

* fixed most of fig's comments

* fix all of fig's comments

* reformat files

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* fixed stuff

* fixed most of roman's comments

* remove leading zeroes

* should build now

* git subrepo pull --force tools/ZAPD

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

* all of gkeep symbols fixed

* compiler error fixed

* format files

* final changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-24 19:36:40 -05:00

54 lines
1.8 KiB
ArmAsm

.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_80BA58E0
.word gEffLightning1Tex, gEffLightning2Tex, gEffLightning3Tex, gEffLightning4Tex, gEffLightning5Tex, gEffLightning6Tex, gEffLightning7Tex, gEffLightning8Tex
glabel D_80BA5900
.word 0x060015E0, 0x060025E0, 0x060035E0, 0x060045E0, 0x060055E0, 0x060065E0, 0x060075E0, 0x060085E0
glabel Object_Kankyo_InitVars
.word 0x00970700, 0x02000030, 0x00010000, 0x00001660
.word ObjectKankyo_Init
.word ObjectKankyo_Destroy
.word ObjectKankyo_Update
.word ObjectKankyo_Draw
glabel D_80BA5940
.word 0x00000000
glabel D_80BA5944
.word 0x00000000
glabel D_80BA5948
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80BA5954
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80BA5960
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80BA596C
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80BA5978
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80BA5984
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80BA5990
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80BA599C
.word 0x43D70000, 0x44570000, 0x43D70000, 0xC3D50000, 0xC4578000, 0xC3DC0000
glabel D_80BA59B4
.word 0x4409C000, 0x4409C000, 0x4409C000, 0x440A8000, 0x4409C000, 0x4408C000
glabel D_80BA59CC
.word 0xC2C00000, 0xC4520000, 0xC4C62000, 0xC4C54000, 0xC4520000, 0xC29C0000
glabel D_80BA59E4
.word 0x41EF3333, 0x42B40000, 0x43160000, 0x41F00000, 0x42B40000, 0xC1F0CCCD
glabel D_80BA59FC
.word 0x42CECCCD, 0x42CF999A, 0x42CF3333, 0xC2CECCCD, 0xC2CF0000, 0x42CF0000
glabel D_80BA5A14
.word 0xFFFFAAAA, 0xFFFFFFAA, 0xFFFFFFAA, 0xFFFFAAFF, 0xFFAA0000
glabel D_80BA5A28
.word 0x00C80000, 0x32FF6400, 0xC8C80000, 0xC8FF00FF, 0x78000000, 0x00000000