mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 11:49:24 +00:00
Code Issues Projects Releases Wiki Activity
oot/data/overlays/actors/z_obj_bean.data.s

29 lines
869 B
ArmAsm
Raw Normal View History

First proper commit.
2020-03-17 04:31:30 +00:00
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
Properly align asm & data (+ minor fixes) (#165) * Add .align 4 directives to all data/ files (+ minor alignment fixes) * Use .balign for everything and fix typo
2020-05-26 22:09:00 +00:00
.set gp=64 # allow use of 64-bit general purpose registers
First proper commit.
2020-03-17 04:31:30 +00:00
.section .data
Properly align asm & data (+ minor fixes) (#165) * Add .align 4 directives to all data/ files (+ minor alignment fixes) * Use .balign for everything and fix typo
2020-05-26 22:09:00 +00:00
.balign 16
First proper commit.
2020-03-17 04:31:30 +00:00
glabel D_80B90E30
.word 0x00000000
glabel Obj_Bean_InitVars
.word 0x01260100, 0x00400000, 0x011E0000, 0x000001F8
.word ObjBean_Init
.word ObjBean_Destroy
.word ObjBean_Update
.word ObjBean_Draw
glabel D_80B90E54
.word 0x0A000009, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0040001E, 0xFFE10000, 0x00000000
glabel D_80B90E80
.word 0x40400000, 0x3E99999A, 0x41200000, 0x3F000000, 0x41F00000, 0x3F000000, 0x40400000, 0x3E99999A
glabel D_80B90EA0
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-25 00:36:40 +00:00
.word gCuttableShrubStalkDL, gCuttableShrubTipDL
First proper commit.
2020-03-17 04:31:30 +00:00
glabel D_80B90EA8
.word 0xC8500064, 0xB0F407D0, 0xB0F800C8, 0x30FC0640, 0x00000000, 0x00000000
Reference in a new issue Copy permalink