Skip to content

Commit

Permalink
En_Arrow OK (zeldaret#648)
Browse files Browse the repository at this point in the history
* fix colliderinit typo

* fix initchain

* start init

* match init

* progress

* progress

* more funcs

* match func_809B3DD8

* progress

* last func almost done

* enum

* name some more types

* progress

* all but one

* fix warning

* remove undefined syms

* match arrows

* review

* spec

* remove asm
  • Loading branch information
fig02 committed Feb 3, 2021
1 parent 6221723 commit dff2dfe
Show file tree
Hide file tree
Showing 29 changed files with 513 additions and 1,609 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ glabel func_8099E4F4
/* 00D2C 8099E5FC C6220550 */ lwc1 $f2, 0x0550($s1) ## 00000550
/* 00D30 8099E600 C6300554 */ lwc1 $f16, 0x0554($s1) ## 00000554
/* 00D34 8099E604 C6320558 */ lwc1 $f18, 0x0558($s1) ## 00000558
/* 00D38 8099E608 3C020403 */ lui $v0, %hi(gEffFairySparklesDL) ## $v0 = 04030000
/* 00D38 8099E608 3C020403 */ lui $v0, %hi(gEffSparklesDL) ## $v0 = 04030000
/* 00D3C 8099E60C 4602B201 */ sub.s $f8, $f22, $f2
/* 00D40 8099E610 24427880 */ addiu $v0, $v0, %lo(gEffFairySparklesDL) ## $v0 = 04037880
/* 00D40 8099E610 24427880 */ addiu $v0, $v0, %lo(gEffSparklesDL) ## $v0 = 04037880
/* 00D44 8099E614 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000
/* 00D48 8099E618 4604B001 */ sub.s $f0, $f22, $f4
/* 00D4C 8099E61C C6440000 */ lwc1 $f4, 0x0000($s2) ## 0000024C
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ glabel func_8099E784
/* 01028 8099E8F8 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000
/* 0102C 8099E8FC C62A0000 */ lwc1 $f10, 0x0000($s1) ## 0000014C
/* 01030 8099E900 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001
/* 01034 8099E904 3C020403 */ lui $v0, %hi(gEffFairySparklesDL) ## $v0 = 04030000
/* 01034 8099E904 3C020403 */ lui $v0, %hi(gEffSparklesDL) ## $v0 = 04030000
/* 01038 8099E908 46185402 */ mul.s $f16, $f10, $f24
/* 0103C 8099E90C 24427880 */ addiu $v0, $v0, %lo(gEffFairySparklesDL) ## $v0 = 04037880
/* 0103C 8099E90C 24427880 */ addiu $v0, $v0, %lo(gEffSparklesDL) ## $v0 = 04037880
/* 01040 8099E910 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000
/* 01044 8099E914 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF
/* 01048 8099E918 0041B024 */ and $s6, $v0, $at
Expand Down
37 changes: 0 additions & 37 deletions asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s

This file was deleted.

275 changes: 0 additions & 275 deletions asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s

This file was deleted.

168 changes: 0 additions & 168 deletions asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s

This file was deleted.

Loading

0 comments on commit dff2dfe

Please sign in to comment.