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_Goroiwa OK (#376)

Browse source 
* merge upstream

* Merge upstream

* Add block comment to c

* EnGoroiwa_Init

* Remove casts in EnGoroiwa_Init

* Matched named functions

* Add one prototype

* func_80A4BD04

* func_80A4BCA0

* func_80A4BD70 and fix incompatible pointer

* func_80A4BD8C and func_80A4BE54

* Remove forward declaration

* Order variable by address

* Cleanup warnings

* func_80A4C188

* Remove func_80A4C188 forward declaration

* Progress

* Rename unk_1CE to waypoint

* func_80A4C264

* func_80A4D5E0

* func_80A4C27C

* Separate necessary forward declarations from temporary

* func_80A4BE10

* func_80A4C080

* func_80A4C134 and func_80A4C164

* func_80A4D074

* Work on some (nonmatching)

* func_80A4D944

* func_80A4D9DC

* Progress

* func_80A4DB90 and func_80A4DC00

* func_80A4D8CC

* func_80A4CA50

* func_80A4C6C8

* work on func_80A4CED8

* Work on func_80A4CED8

* func_80A4CED8

* Use temp to avoid unused error

* Clarify comment

* Work on func_80A4C3A4

* func_80A4C3A4

* Clarify comment better

* func_80A4C594

* Angles

* Improve regalloc

* func_80A4BF28

* Cleanup point access

* Work on func_80A4C814

* func_80A4C814

* Use *=

* Work on func_80A4CB78

* Work on func_80A4D0FC

* Work on func_80A4CB78

* More on func_80A4CB78

* Implement dubious permuter suggestion

* Make janky hack less janky

* Update issue comment

* Move ptr func_80A4CB78

* func_80A4CB78

* Cleanup func_80A4CB78

* Various cleanup

* Add undefined sym

* Work on func_80A4D0FC

* Work more on func_80A4D0FC

* Work on func_80A4D624

* func_80A4D0FC

* Work on func_80A4D624

* Fix stack

* Wrap in NON_MATCHING ifdef to remember which function is not done

* Collapse goto

* Use -- for unk_1C4

* Collapse else if

* Add translation for 'Player ぶっ飛ばし'

* func_80A4D624

* Migrate data section

* Clang format

* Actually add unused note

* Name timers accordingly

* Remove & from sInitChain

* Give timer descriptive names

* Rename idleTimer to waitTimer

* Rename to sWaitDurations

* Name effect data

* Add s prefix (oops)

* Move some data into functions

* Rename params for func_80029E8C

* Unify whitespace for bool returns

* Name colliderHeightOffset

* Name duplicate of colliderHeightOffset and clang format everything

* Reorder vector assignments

* Rename params to pathIdx

* Rename temp to yawDiff

* Add 'f's because floating point

* Name a lot of stuff

* Name posDiff

* Nuke the bool

* Remove unnecessary return

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Remove useless forward declarations and use list[0]

* Clang format again

* Use switch statement

* Use hex for normalizing angle

* Use hex because angle

* Small fixes

* Small fixes

* Move function arrays out of function

* Correct colliderItems

* Don't separate static vars from others

* Clang format

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
Sirius902 2020-09-28 03:03:39 -07:00 • committed by GitHub
parent 83fc21fea6
commit 00fb26a441
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 695 additions and 2546 deletions
Download patch file Download diff file Expand all files Collapse all files

47
data/overlays/actors/z_en_goroiwa.data.s
View file

@ -1,47 +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 En_Goroiwa_InitVars
.word 0x01300600, 0x00000010, 0x011F0000, 0x000001D4
.word EnGoroiwa_Init
.word EnGoroiwa_Destroy
.word EnGoroiwa_Update
.word EnGoroiwa_Draw
glabel D_80A4DE80
.word 0x00000000, 0x20000000, 0x00040000, 0x00000000, 0x00000000, 0x01000100, 0x00000000, 0x00000000, 0x003A0064
glabel D_80A4DEA4
.word 0x0A110039, 0x20000000, 0x00000001
.word D_80A4DE80
glabel D_80A4DEB4
.word 0x0000000C, 0x003CFE00, 0x41200000, 0x41133333
glabel D_80A4DEC4
.word 0x00000000, 0x426E0000
glabel D_80A4DECC
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A4DED8
.word 0x00000000, 0x3E99999A, 0x00000000
glabel D_80A4DEE4
.word 0x00000000, 0x3F800000, 0x00000000
glabel D_80A4DEF0
.word 0x00000000, 0x426E0000
glabel D_80A4DEF8
.word 0xB86CFCA4, 0xB870C568, 0xC8500064, 0xB0F405DC, 0xB0F80096, 0x30FC05DC
glabel D_80A4DF10
.word 0x00000000, 0x4414C000
glabel D_80A4DF18
.word func_80A4C814
.word func_80A4C6C8
glabel D_80A4DF20
.word func_80A4D9DC
.word func_80A4D8CC
glabel D_80A4DF28
.word 0x00140006, 0x00000000

13
data/overlays/actors/z_en_goroiwa.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_80A4E0B0
.incbin "baserom/ovl_En_Goroiwa", 0x2410, 0x00000270