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_debug_display.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_debug_display.c')
| -rw-r--r-- | src/code/z_debug_display.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index e802e9b8e..2f560f2b5 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -1,4 +1,5 @@ #include "global.h" +#include "objects/gameplay_keep/gameplay_keep.h" typedef struct { /* 0x00 */ s16 drawType; // indicates which draw function to use when displaying the object @@ -16,12 +17,8 @@ static DebugDispObject_DrawFunc sDebugObjectDrawFuncTable[] = { }; static DebugDispObjectInfo sDebugObjectInfoTable[] = { - { 0, 0x040035F0 }, // Circle - { 0, 0x040038F0 }, // Cross - { 0, 0x040036F0 }, // Ball - { 0, 0x040037F0 }, // Cursor - { 1, 0x040039F0 }, // Arrow - { 1, 0x04003C90 }, // Camera + { 0, gDebugCircleTex }, { 0, gDebugCrossTex }, { 0, gDebugBallTex }, + { 0, gDebugCursorTex }, { 1, gDebugArrowDL }, { 1, gDebugCameraDL }, }; static Lights1 sDebugObjectLights = gdSPDefLights1(0x80, 0x80, 0x80, 0xFF, 0xFF, 0xFF, 0x49, 0x49, 0x49); @@ -86,7 +83,7 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalCont gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 189), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(POLY_XLU_DISP++, &D_04004298); + gSPDisplayList(POLY_XLU_DISP++, &gDebugSpriteDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 192); } |