diff options
| author | Zelllll <56516451+Zelllll@users.noreply.github.com> | 2021-01-24 18:36:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-24 19:36:40 -0500 |
| commit | 20c1f4e6480b2e85a8149b04507b6b212bda8afc (patch) | |
| tree | 04e1838792ab9ce30a0b6520790c17ed3d3a5572 /src/code/z_en_a_keep.c | |
| parent | 84195fcef613a9f9e9b2518294c6084097f279d7 (diff) | |
Decompile Gameplay_Keep and fix all existing decompiled objects (#595)
* First batch of files
* Add missing folders back
* Fix missing folders again
* Finish fixing existing texture files
* Gameplay_Keep XML finished
* Most actor gameplay_keep undefined syms removed
* Only ~200 gkeep symbols remain
* All gkeep symbols that ZAP supports are fixed
* Cleanup, and make gkeep names more accurate
* Starting to figure out what some unknown blobs are, merge zeldaret in
* fix a few more things
* refactor gkeep
* Change how gitkeep is handled
* gkeep xml cleanup
* Gkeep finished, now just waiting up ZAP updates
* 100 link animations finished
* 150 link animations finished
* 200 link animations finished
* 250 link animations finished
* 350 link animations finished
* 400 link animations finished
* 450 link animations finished
* 500 link animations finished
* 550 link animations finished
* All Link animations finished
cannot build yet because ZAP doesn't have LinkAnimationHeader yet
* xml changes for new zap stuff
* finish gameplay_keep
* fixing existing objects
* ready for pr besides zap padding issue
* mostly ready for pr
* format all c files
* all conflicts fixed
* make changes that roman requested
* fix thing i didn't mean to change
* some animation symbols renamed
* fixed roman's stuff
* lifemeter hardcoded pointers removed
* fix issue with incorrect data in gameplay_keep
* removed unused asm
* fixed most of fig's comments
* fix all of fig's comments
* reformat files
* Update assets/xml/textures/icon_item_static.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update assets/xml/textures/icon_item_static.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* fixed stuff
* fixed most of roman's comments
* remove leading zeroes
* should build now
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "f84d8337b"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "f84d8337b"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* all of gkeep symbols fixed
* compiler error fixed
* format files
* final changes
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'src/code/z_en_a_keep.c')
| -rw-r--r-- | src/code/z_en_a_keep.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 7f65ff5eb..69d696ad3 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -1,5 +1,6 @@ #include "global.h" #include "vt.h" +#include "objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000010 @@ -53,19 +54,25 @@ static ColliderCylinderInit sCylinderInit = { { 25, 60, 0, { 0, 0, 0 } }, }; -extern CollisionHeader D_040394B0; -extern CollisionHeader D_0403A120; -extern CollisionHeader D_0403A480; -extern CollisionHeader D_0403A7F0; extern CollisionHeader D_06000730; static CollisionHeader* D_8011546C[] = { - &D_040394B0, &D_040394B0, &D_0403A120, &D_0403A480, &D_0403A7F0, &D_06000730, + &gUnknown1Col, &gUnknown1Col, &gUnknown4Col, &gUnknown5Col, &gUnknown6Col, &D_06000730, }; static Gfx* D_80115484[] = { - 0x04039C00, 0x04039C00, 0x04039C00, 0x0403A2D0, 0x0403A2D0, 0x0403A630, - 0x06000210, 0x0403AB80, 0x0403A9B0, 0x0403C050, 0x0403C5B0, 0x0400D340, + gUnusedRockRectangularPrism2DL, + gUnusedRockRectangularPrism2DL, + gUnusedRockRectangularPrism2DL, + gUnusedRockRectangularPrism4DL, + gUnusedRockRectangularPrism4DL, + gUnusedRockRectangularPrism5DL, + 0x06000210, + gUnusedGrassBladesDL, + gUnusedTreeStumpDL, + gSignRectangularDL, + gSignDirectionalDL, + gBoulderFragmentsDL, }; void EnAObj_SetupAction(EnAObj* this, EnAObjActionFunc actionFunc) { |