mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-02 18:02:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Undefined Symbols in the ASM (#527)

Browse Source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* now with more symbols
This commit is contained in:
petrie911
2020-12-12 13:22:33 -06:00
committed by GitHub
parent 3062045acd
commit 92e9f2d370
767 changed files with 3082 additions and 3077 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_debug.c
+13 -10
View File
@@ -151,16 +151,19 @@ void func_8006390C(Input* input) {
gGameInfo->dpadLast = dpad;
}
increment = (CHECK_BTN_ANY(dpad, BTN_DRIGHT)) ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) ? 1000
: CHECK_BTN_ALL(input->cur.button, BTN_A) ? 100
: CHECK_BTN_ALL(input->cur.button, BTN_B) ? 10
: 1)
: (CHECK_BTN_ANY(dpad, BTN_DLEFT))
? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) ? -1000
: CHECK_BTN_ALL(input->cur.button, BTN_A) ? -100
: CHECK_BTN_ALL(input->cur.button, BTN_B) ? -10
: -1)
: 0;
increment = (CHECK_BTN_ANY(dpad, BTN_DRIGHT))
? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B)
? 1000
: CHECK_BTN_ALL(input->cur.button, BTN_A)
? 100
: CHECK_BTN_ALL(input->cur.button, BTN_B) ? 10 : 1)
: (CHECK_BTN_ANY(dpad, BTN_DLEFT))
? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B)
? -1000
: CHECK_BTN_ALL(input->cur.button, BTN_A)
? -100
: CHECK_BTN_ALL(input->cur.button, BTN_B) ? -10 : -1)
: 0;
gGameInfo->data[gGameInfo->regCur + regGroup] += increment;
if (CHECK_BTN_ANY(dpad, BTN_DUP)) {
src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
+1 -1
View File
@@ -12,7 +12,7 @@ void BgSpot08Iceblock_Draw(Actor* thisx, GlobalContext* globalCtx);
extern UNK_TYPE D_06000DE0;
extern UNK_TYPE D_06002BD0;
extern UNK_TYPE D_06002FD8;
extern UNK_TYPE D_060048DC;
extern UNK_TYPE D_06001904;
/*
const ActorInit Bg_Spot08_Iceblock_InitVars = {
src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
+3 -3
View File
@@ -22,12 +22,12 @@ extern UNK_TYPE D_06016CD8;
extern UNK_TYPE D_06016F88;
extern UNK_TYPE D_06017028;
extern UNK_TYPE D_06017170;
extern UNK_TYPE D_0601D9A0;
extern UNK_TYPE D_0601E8D0;
extern UNK_TYPE D_0601EE60;
extern UNK_TYPE D_06000F30;
extern UNK_TYPE D_0601EB14;
extern UNK_TYPE D_0601EB40;
extern UNK_TYPE D_0601EE34;
extern UNK_TYPE D_0601F1D0;
extern UNK_TYPE D_06000900;
/*
const ActorInit Demo_Ik_InitVars = {
src/overlays/actors/ovl_En_Ta/z_en_ta.c
+3 -1
View File
@@ -57,7 +57,9 @@ Vec3f D_80B16E7C = {
};
UNK_TYPE D_80B16E88[] = {
0x06007F80, 0x06006EC0, 0x060072C0,
0x06007F80,
0x06006EC0,
0x060072C0,
};
extern AnimationHeader D_060017E8;
src/overlays/actors/ovl_Fishing/z_fishing.c
+1 -1
View File
@@ -46,7 +46,7 @@ extern UNK_TYPE D_060113D0;
extern UNK_TYPE D_06011410;
extern UNK_TYPE D_06012160;
extern UNK_TYPE D_060121F0;
extern UNK_TYPE D_060122E0;
extern UNK_TYPE D_06011070;
extern UNK_TYPE D_06013330;
extern UNK_TYPE D_060133B0;
extern UNK_TYPE D_06013590;