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

ovl_En_Ishi (#425)

Browse source 
* merge upstream

* Merge upstream

* Use Petrie's data section

* Move assignment to declaration

* EnIshi_Init without messing with formatting

* EnIshi_Draw

* Update asm

* Remove war of the zeros

* Type function pointers

* Match a few

* Remove extra * in comment

* Progress

* func_80A7E5A8 and add translation

* Cleanup func_80A7E5A8 and work on func_80A7E824

* Work on func_80A7E824

* Cursed asf match for func_80A7E824

* Re-use variable in cursed function to avoid warning

* func_80A7F0A8

* func_80A7F514

* Use C data

* Various fixes

* Move data around

* Clang format and stuff

* Stuff

* Pretty suspicious just saying

* Add janky hack warnings

* Use enum for type

* Cleanup enum a bit

* Use small and large instead of rock and boulder

* Name EnIshi_SetupCollider

* Remove static var space

* Update translation

* Name some stuff

* Name sRockScales

* Use object id defines for func_80029E8C

* Properly type var to s16

* Make match slightly less fake

* Yay no more fake match for func_80A7E824!

* Use thisx all throughout func_80A7E824 for consistency

* Rename to EnIshi_InitCollider

* Remove asm

* Only use thisx where required in func_80A7E824

* Cleanup and naming

* More naming

* Naming

* Finish naming

* Rename sCylinderInit to sCylinderInits

* Actually finish naming

* Minor cleanup

* Header comment

* Format effect function usage properly

* More formatting

* Various changes

* Minor cleanup

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
Sirius902 2020-10-04 09:00:15 -07:00 • committed by GitHub
parent 728a789a2f
commit 213bac4657
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 448 additions and 1673 deletions
Download patch file Download diff file Expand all files Collapse all files

57
data/overlays/actors/z_en_ishi.data.s
View file

File diff suppressed because one or more lines are too long

13
data/overlays/actors/z_en_ishi.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_80A87480
.incbin "baserom/ovl_En_Ishi", 0x9020, 0x00000200