mirror of
https://github.com/zeldaret/oot
synced 2026-07-08 14:26:45 -04:00
readd merge conflicts
This commit is contained in:
@@ -442,3 +442,6 @@ D_06001BD0 = 0x06001BD0;
|
||||
// z_bg_zg
|
||||
D_060011D4 = 0x060011D4;
|
||||
D_06001080 = 0x06001080;
|
||||
|
||||
// z_skelanime
|
||||
link_animetion_segment = 0x07000000;
|
||||
Reference in New Issue
Block a user