mirror of
https://github.com/zeldaret/oot.git
synced 2024-09-21 12:54:51 +00:00
readd merge conflicts
This commit is contained in:
parent
8bbac143cd
commit
2b0b6a6c12
@ -442,3 +442,6 @@ D_06001BD0 = 0x06001BD0;
|
|||||||
// z_bg_zg
|
// z_bg_zg
|
||||||
D_060011D4 = 0x060011D4;
|
D_060011D4 = 0x060011D4;
|
||||||
D_06001080 = 0x06001080;
|
D_06001080 = 0x06001080;
|
||||||
|
|
||||||
|
// z_skelanime
|
||||||
|
link_animetion_segment = 0x07000000;
|
Loading…
Reference in New Issue
Block a user