2ship2harkinian/mm/include/variables.h

1776 lines
45 KiB
C
Raw Normal View History

`z_player_lib`: Part 2 (#938) * preparations * import data * PLAYER_STATE1 * PLAYER_STATE2 * PLAYER_STATE3 * import bss * format stuff * bss cleanup * more cleaning and some naming * face * cleaning up link human object a bit * Remove PHYSICAL_TO_VIRTUAL2 * Update src/code/z_player_lib.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * /* CAT */ Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * naming some stuff on objects * format * invert flags endian * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * format * drawmask Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * naming * another round of human object naming * enum renames * sActionModelGroups and use enum as types * PlayerAnimType * PLAYER_MODELTYPE_ * determined ranges of PlayerModelType * name PLAYER_MODELGROUP_DEFAULT * format * sheath * dlist groups placeholder namse * PLAYER_MODELGROUP_BOTTLE * Some fierce deity naming * Right hands * zora skel dlists * deku limb dlists * left hands * name most modelgroups * more hand naming * regs as dec * fix in horse * Use BUTTON_ITEM_EQUIP macro * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * reformat D_801AED58 * Sword sheaths * swords and shields * Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * playerForm on Player_DrawImpl * fomat * Update src/code/z_player_lib.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update assets/xml/objects/gameplay_keep.xml Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex)) Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * singular limb enum names * fix bss * Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * name goron shielding limbs * name limb * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * bss * bss * format * namefixer * bss * bss * bss * bss * format * bss * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * fix bss Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-10-15 22:12:01 +00:00
#ifndef VARIABLES_H
#define VARIABLES_H
2018-10-26 02:29:41 +00:00
Overhaul the build system (#234) * wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-08-04 03:21:31 +00:00
#include "z64.h"
#include "segment_symbols.h"
#include "macros.h"
#ifdef __cplusplus
extern "C"
{
#endif
// pre-boot variables
extern u16 gFramebuffer1[SCREEN_HEIGHT][SCREEN_WIDTH]; // at 0x80000500
extern u8 D_80025D00[];
2018-10-26 02:29:41 +00:00
// data
extern size_t gDmaMgrDmaBuffSize;
extern vs32 gIrqMgrResetStatus;
extern volatile OSTime sIrqMgrResetTime;
extern volatile OSTime gIrqMgrRetraceTime;
extern s32 sIrqMgrRetraceCount;
// extern UNK_TYPE1 sGfxPrintFontTLUT;
// extern UNK_TYPE1 sGfxPrintRainbowTLUT;
// extern UNK_TYPE1 sGfxPrintRainbowData;
// extern UNK_TYPE1 sGfxPrintFontData;
// extern UNK_TYPE4 D_80097524;
// extern u32 sRandInt;
2021-03-17 01:49:27 +00:00
extern u8 sYaz0DataBuffer[0x400];
extern u8* sYaz0CurDataEnd;
2024-01-06 05:47:40 +00:00
extern uintptr_t sYaz0CurRomStart;
2021-03-17 01:49:27 +00:00
extern u32 sYaz0CurSize;
extern u8* sYaz0MaxPtr;
extern void* gYaz0DecompressDstEnd;
// extern UNK_TYPE4 D_8009CD10;
// extern UNK_TYPE4 sArenaLockMsg;
extern DmaEntry dmadata[1568];
// extern UNK_TYPE1 D_80186028;
extern u8 sDropTable[DROP_TABLE_SIZE * DROP_TABLE_NUMBER];
extern u8 sDropTableAmounts[DROP_TABLE_SIZE * DROP_TABLE_NUMBER];
extern s32 D_801AE194[32];
extern u8 D_801AE214[32];
// extern UNK_TYPE4 D_801AE240;
// extern UNK_TYPE4 D_801AE250;
extern UNK_PTR D_801AE260[3];
// extern UNK_TYPE4 D_801AE27C;
// extern UNK_TYPE4 D_801AE28C;
// extern UNK_TYPE4 D_801AE29C;
// extern UNK_TYPE4 D_801AE2AC;
// extern UNK_TYPE4 D_801AE2BC;
// extern UNK_TYPE4 D_801AE2CC;
// extern UNK_TYPE4 D_801AE2DC;
// extern EffectSsInfo sEffectSsInfo;
// extern UNK_TYPE1 D_801AE3B0;
// extern UNK_TYPE1 D_801AE3B4;
// extern UNK_TYPE4 D_801AE3B8;
// extern UNK_TYPE4 D_801AE3BC;
// extern UNK_TYPE1 D_801AE3C0;
// extern UNK_TYPE1 D_801AE3C4;
// extern UNK_TYPE1 D_801AE3C8;
// extern UNK_TYPE1 D_801AE3CC;
// extern UNK_TYPE4 D_801AE3D0;
// extern UNK_TYPE4 D_801AE3D4;
// extern UNK_TYPE4 D_801AE3D8;
// extern UNK_TYPE4 D_801AE3DC;
// extern UNK_TYPE4 D_801AE3E0;
// extern UNK_TYPE4 D_801AE3EC;
// extern UNK_TYPE1 D_801AE3F8;
// extern UNK_TYPE4 D_801AE3FC;
// extern UNK_TYPE4 D_801AE404;
// extern UNK_TYPE1 D_801AE47C;
// extern UNK_TYPE1 D_801AE480;
// extern UNK_TYPE1 D_801AE484;
// extern UNK_TYPE1 D_801AE485;
// extern UNK_TYPE1 D_801AE486;
// extern UNK_TYPE1 D_801AE488;
// extern UNK_TYPE1 D_801AE489;
// extern UNK_TYPE1 D_801AE48A;
// extern UNK_TYPE1 D_801AE48C;
// extern UNK_TYPE1 D_801AE490;
extern EffectSsOverlay gParticleOverlayTable[39];
// extern s32 sEntryIndex;
// extern u32 sCurrentBit;
// extern s32 sTimer;
extern ActorOverlay gActorOverlayTable[ACTOR_ID_MAX];
extern ActorId gMaxActorId;
extern BgCheckSceneSubdivisionEntry sSceneSubdivisionList[];
extern BgSpecialSceneMaxObjects sCustomDynapolyMem[];
// extern UNK_TYPE4 D_801BDAC0;
// extern UNK_TYPE4 D_801BDAC4;
// extern UNK_TYPE4 D_801BDAC8;
// extern UNK_TYPE4 D_801BDACC;
// extern UNK_TYPE4 D_801BDAF0;
// extern UNK_TYPE4 D_801BDAF8;
extern u8 kanfontOrdering[92];
// extern actor_init_var_func sInitChainHandlers[11];
extern UNK_PTR D_801BF5C0;
// extern UNK_TYPE4 D_801BEAD4;
// extern UNK_TYPE4 D_801BEAD8;
// extern UNK_TYPE1 D_801BEAE0;
// extern UNK_TYPE4 D_801BEAF4;
// extern UNK_TYPE4 D_801BEAF8;
// extern UNK_TYPE4 D_801BEB04;
// extern UNK_TYPE4 D_801BEB08;
// extern UNK_TYPE4 D_801BEB14;
// extern UNK_TYPE4 D_801BEB18;
// extern UNK_TYPE4 D_801BEB24;
// extern UNK_TYPE4 D_801BEB28;
// extern UNK_TYPE1 D_801BEB38;
// extern UNK_TYPE4 D_801BEBB8;
// extern UNK_TYPE4 D_801BEBD8;
// extern UNK_TYPE2 D_801BEBF8;
// extern UNK_TYPE2 D_801BEBFA;
// extern UNK_TYPE2 D_801BEBFC;
// extern UNK_TYPE2 D_801BEC10;
extern UNK_PTR D_801BEC14;
// extern UNK_TYPE4 D_801BEC1C;
// extern UNK_TYPE4 D_801BEC20;
// extern UNK_TYPE1 D_801BEC24;
// extern UNK_TYPE1 D_801BEC2C;
// extern UNK_TYPE2 D_801BEC5C;
// extern UNK_TYPE2 D_801BEC5E;
// extern UNK_TYPE4 D_801BEC70;
// extern UNK_TYPE1 D_801BEC84;
// extern UNK_TYPE1 D_801BECA4;
// extern UNK_TYPE1 D_801BECC4;
// extern UNK_TYPE1 D_801BECE4;
// extern UNK_TYPE1 D_801BED00;
// extern UNK_TYPE2 D_801BED24;
// extern UNK_TYPE1 D_801BED3C;
// extern UNK_TYPE1 D_801BED40;
// extern UNK_TYPE1 D_801BED4C;
// extern UNK_TYPE1 D_801BED54;
// extern UNK_TYPE1 D_801BED55;
// extern UNK_TYPE1 D_801BED56;
// extern UNK_TYPE1 D_801BED88;
// extern UNK_TYPE1 D_801BEFC8;
// extern UNK_TYPE1 D_801BF15C;
// extern UNK_TYPE1 D_801BF170;
// extern UNK_TYPE1 D_801BF176;
// extern UNK_TYPE1 D_801BF177;
// extern UNK_TYPE1 D_801BF178;
// extern UNK_TYPE1 D_801BF3B4;
// extern UNK_TYPE2 D_801BF550;
// extern UNK_TYPE2 D_801BF554;
// extern UNK_TYPE2 D_801BF558;
// extern UNK_TYPE4 D_801BF55C;
// extern UNK_TYPE4 D_801BF580;
// extern UNK_TYPE4 D_801BF594;
// extern UNK_TYPE4 D_801BF5A4;
// extern UNK_TYPE2 D_801BF5B0;
// extern UNK_TYPE1 D_801BF68C;
`z_player_lib`: Part 1 (#688) * fix some symbols and file splits * PLAYER_STATE macros * Move over a few functions * AP functions and update struct * another small bunch * Add player_lib prototypes * A few more functions * Some fixes and add stuff to actorfixer * format * bss * Elliptic's review * Engineer's review * Some renames and cleanups * bss * A bit of cleaning up * Player_DrawZoraShield * format * actorfixer, bss and format * Forgot to merge master again * Rename some LinkGoron dlists * PlayerMeleeWeaponAnimation enum * format * actorfixer, bss and format * more bss * actorfixer * format * actorfixer and format * bss * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * sEnvironmentTextTriggers * Update include/z64save.h Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * breman mask march comment * fix * fixes * bss * RESPAWN_MODE_RETURN * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * format * Engineer's review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update include/z64player.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * unused mwas * fixes Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-07-12 03:43:46 +00:00
`z_player_lib`: Part 2 (#938) * preparations * import data * PLAYER_STATE1 * PLAYER_STATE2 * PLAYER_STATE3 * import bss * format stuff * bss cleanup * more cleaning and some naming * face * cleaning up link human object a bit * Remove PHYSICAL_TO_VIRTUAL2 * Update src/code/z_player_lib.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * /* CAT */ Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * naming some stuff on objects * format * invert flags endian * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * format * drawmask Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * naming * another round of human object naming * enum renames * sActionModelGroups and use enum as types * PlayerAnimType * PLAYER_MODELTYPE_ * determined ranges of PlayerModelType * name PLAYER_MODELGROUP_DEFAULT * format * sheath * dlist groups placeholder namse * PLAYER_MODELGROUP_BOTTLE * Some fierce deity naming * Right hands * zora skel dlists * deku limb dlists * left hands * name most modelgroups * more hand naming * regs as dec * fix in horse * Use BUTTON_ITEM_EQUIP macro * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * reformat D_801AED58 * Sword sheaths * swords and shields * Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * playerForm on Player_DrawImpl * fomat * Update src/code/z_player_lib.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update assets/xml/objects/gameplay_keep.xml Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex)) Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * singular limb enum names * fix bss * Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * name goron shielding limbs * name limb * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * bss * bss * format * namefixer * bss * bss * bss * bss * format * bss * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * fix bss Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-10-15 22:12:01 +00:00
extern FlexSkeletonHeader* gPlayerSkeletons[PLAYER_FORM_MAX];
extern PlayerModelIndices gPlayerModelTypes[];
extern struct_80124618 D_801C03A0[];
extern struct_80124618 D_801C0490[];
extern Gfx gCullBackDList[];
extern Gfx gCullFrontDList[];
`z_player_lib`: Part 1 (#688) * fix some symbols and file splits * PLAYER_STATE macros * Move over a few functions * AP functions and update struct * another small bunch * Add player_lib prototypes * A few more functions * Some fixes and add stuff to actorfixer * format * bss * Elliptic's review * Engineer's review * Some renames and cleanups * bss * A bit of cleaning up * Player_DrawZoraShield * format * actorfixer, bss and format * Forgot to merge master again * Rename some LinkGoron dlists * PlayerMeleeWeaponAnimation enum * format * actorfixer, bss and format * more bss * actorfixer * format * actorfixer and format * bss * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * sEnvironmentTextTriggers * Update include/z64save.h Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * breman mask march comment * fix * fixes * bss * RESPAWN_MODE_RETURN * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * format * Engineer's review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update include/z64player.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * unused mwas * fixes Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-07-12 03:43:46 +00:00
extern u32 gBitFlags[32];
extern u16 gEquipMasks[];
extern u16 gEquipNegMasks[];
extern u32 gUpgradeMasks[8];
extern u32 gUpgradeNegMasks[];
extern u8 gEquipShifts[];
extern u8 gUpgradeShifts[8];
extern u16 gUpgradeCapacities[][4];
extern u32 gGsFlagsMask[];
extern u32 gGsFlagsShift[];
2024-01-10 02:32:45 +00:00
extern TexturePtr gItemIcons[131];
extern u8 gItemSlots[77];
extern s16 gItemPrices[];
extern u16 gSceneIdsPerRegion[11][27];
extern u8 gPlayerFormItemRestrictions[PLAYER_FORM_MAX][114];
extern s16 gPlayerFormObjectIds[PLAYER_FORM_MAX];
extern ObjectId gObjectTableSize;
extern RomFile gObjectTable[OBJECT_ID_MAX];
extern SceneTableEntry gSceneTable[SCENE_MAX];
extern UNK_PTR D_801C5C50;
// extern UNK_TYPE1 D_801C5C9C;
extern UNK_PTR D_801C5CB0;
`z_sram_NES` with 2 NON_MATCHINGs and 1 NON_EQUIVALENTs (#531) * Rename Sram_InitDebugSave * Sram_InitDebugSave * err * Sram_IncrementDay * non_matchings * func_80146F5C and protos * func_80146EE8 * func_80145698 * func_80143A54 * Split SaveContext * problems with bss * Fix bss * more * a small bunch * Fix warnings * almost everything * two attempts * at least compiles * import data * bss * format * stuff? * Progress? * More progress * clean up data a little * More progress * disaster * re split data * A bit less of a disaster * Fix renamed stuff * data stuff * fix conflicts * format * CycleSceneFlags * some enums * cleanup * Fix merge issues * format * some changes * format * Lots of progress on z_sram_NES, but no matches yet * SaveContent Documentation * Oops * Oops2 * Document more SaveContext * Oops, don't need that anymore * add small comment * Another comment * dekuPlaygroundPlayerName * Fix merge issues * format * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * remove magic number * format * fix merge issues * bss * format * macro cleanup * review * merge issues * review * cleanup * UNK_TYPE1 * Fix * Remove comment * small change * conflicts * review * fix * fixes * format * Update actorCtx renames part * Match func_80143B0C thanks to Petrie and Anon * minor cleaning pass * format * cleanup * more minor cleanups * Macros for accessing gSaveContext.save.stolenItems * Introduce STOLEN_ITEM_NONE and remove CLEAR_STOLEN_ITEM_ * format * Update include/macros.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_sram_NES.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_sram_NES.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_sram_NES.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_sram_NES.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_sram_NES.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_sram_NES.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_sram_NES.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * @hensldm review * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Rename QUEST_SONG_NEW_WAVE * Add scene name comments to D_801C5FC0 * rename horseData.yaw * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sram_NES.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * // = CUR_UPG_VALUE(UPG_WALLET); * run actorfixer and format * fix bss * Fix merge problems and run format * Some improvements to func_801457CC by anon * bss * format * run actorfixer * actorfixer, bss and format * Use original names for the RESPAWN_MODE enum because the current ones are bad * QUEST_SONG_BOSSA_NOVA * some minor fixes on the SaveContext struct according to the debug rom * Merge Inventory.items and Inventory.masks * a * simplify saveBuf accesses * A few func renames * actorfixer * bss * fixes * bss * actorfixer * actorfixer and format * actorfixer * whoops * whops * bss Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-03-27 15:37:02 +00:00
extern KaleidoMgrOverlay gKaleidoMgrOverlayTable[2];
// extern UNK_TYPE1 D_801D0B8C;
extern KaleidoMgrOverlay* gKaleidoMgrCurOvl;
// extern UNK_TYPE1 D_801D0C80;
// extern UNK_TYPE1 D_801D0CB0;
extern s32 gDbgCamEnabled;
// extern UNK_TYPE1 D_801D0D54;
Play (2 NON_MATCHINGS) (#1109) * Bring over progress from another branch Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com> * cleanup, fake match Play_Init * small fixes * Some small cleanup * Match func_80165460 (from debug) * Match func_80165658 * Match func_80165DB8, func_80165DCC, func_80165DF0, func_80165E04 * Match func_80167DE4 (from debug) * Match func_80167F0C * Match func_80168DAC * Matched func_80169100 * Matched func_801691F0 * import D_801DFA18 * match Play_Main thanks to debug * cleanup * synray does it again * add docs from debug * fix func_801656A4 * more docs and cleanup * Match func_80166B30 and diff fake match in Init * import transition docs from OoT * Play Update, sort of * cleanup Play_Update * more cleanup * slightly more docs * small docs * Play_Draw WIP Thanks @petrie911 * progress? * two more matches * format * misc play docs * transitions cleanup * Motion Blur * Transitions * Fog * Bombers notebook + small cleanup * bss * Camera Functions * Picto functions * Init * MotionBlur Clean up * Floor Surface * Pictographs some more * regs * fix circular dependency problem * Cleanup PR commits outside play * namefixer * PR picto * PR audio * PR small clean ups * debug strings * Picto defines * bss * enums * remove void * typedefs * Hireso -> BombersNotebook * bss comments * bss and I8/I5 functions * Smaller PR comments * Transitions * Combine enums * Revert "Combine enums" This reverts commit 0da1ebcaed69a3ce0fbd5942460b67f80f0e15e7. * Fix Transition defines * RGBA16 macros * Unname * worldCoverAlpha * Rename Update and Draw * PR review, plus annotate bug * Clean up nonmatchings with a closer DrawGame * Format * New macros * UpdateMain and DrawMain * Fix merge * Small cleanups from PR * zFar * Intensity macros * Format * Remove bss comments * Compression/decompression * Small cleanup * Format * More PR cleanup * Cleanup picto stuff * format * Fix compression comments * Play processes state enums DONE -> READY * cutscene comment * fix bss Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: angie <angheloalf95@gmail.com>
2023-01-14 15:18:13 +00:00
// extern UNK_TYPE2 sQuakeIndex;
// extern UNK_TYPE2 sIsCameraUnderwater;
extern Input* D_801D0D60;
2023-04-19 17:52:00 +00:00
// extern UNK_TYPE2 sPlayerCsIdToCsCamId;
// extern UNK_TYPE1 D_801D0D7A;
extern u32 retryCount;
extern u32 cfbIdx[3];
Bigslime OK and Documented (#361) * git subrepo pull tools/asm-differ --force subrepo: subdir: "tools/asm-differ" merged: "d218cdf0" upstream: origin: "https://github.com/simonlindholm/asm-differ.git" branch: "main" commit: "d218cdf0" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/graphovl --force subrepo: subdir: "tools/graphovl" merged: "f5fe93d7" upstream: origin: "https://github.com/AngheloAlf/graphovl.git" branch: "master" commit: "f5fe93d7" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/ZAPD --force subrepo: subdir: "tools/ZAPD" merged: "e7a8a48c" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "e7a8a48c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * Bring Bigslime over from old branch * Format * Improve docs * format * More cleanup * Fix Zero Vectors Name * Improve docs * Spelling/Grammar * Small typo * Extra space * Fix zapd merge conflict * tab * Fix remaining names * format * Better documentation * format * fix * Add names to identity matrices * Minor Cleanup * easier to read comments * Another touch-up * Missed a spot * one more... * typo * Another typo * Fix merge master, fix EnBigslime_ApplyDamageEffectBigslime * PR Feedback * Fix variable * Add in gZeroVec3f in new prs * Fix gZeroVec3f * gZeroVec3f * PR Feedback, move lots of static data inside functions * Use z_actor decomp of `func_800BE680` for better macro name * Naming gone wrong, but fixed now * Fix dList * Add an extra line of docs about shadows for a function * dList -> shadowDList * Next round of PR feedback * Document object file, still need to double check some * Small cleanup * Improve and fix many docs, unname unknown material texture * format * Oops * Clean up blobs from object file * Aha! I finally get what's going on * Remove Bigslime undefined_syms * Remove more undefined symbols Co-authored-by: Angie <angheloalf95@gmail.com>
2021-12-27 04:24:45 +00:00
extern Vec3f gZeroVec3f;
extern Vec3s gZeroVec3s;
`code_8013EC10` and `code_80182CE0` (`z_rumble` and `sys_rumble`) (#763) * First pass * import bss * cleanup warnings * PadMgr_ControllerHasRumblePak * z64rumble.h * rename file to z_rumble.c * format * Update src/code/z_rumble.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_rumble.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * name a temp * minor cleaning * bss * match code_80182CE0 * import data and cleanups * Rename RumbleManager struct and sys_rumble file * Rename functions from sys_rumble * Rename parameter to distSq Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * more notes and a bit of cleaning * Name Rumble_Add and Rumble_AddForced * some extra notes * Rename Rumble_Override and Rumble_Request * document states * minor renames * actorfixer * format * very minor docs * whoops * remove redundant prevent_bss_reordering * Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * namefixer * Update src/code/sys_rumble.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix * Elliptic review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * minor cleanups * Update include/z64rumble.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/code/sys_rumble.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_rumble.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-29 21:08:03 +00:00
extern s16 gLowPassFilterData[];
extern s16 gHighPassFilterData[];
extern s16 gBandStopFilterData[];
extern s16 gBandPassFilterData[];
extern s16* gWaveSamples[9];
extern f32 gBendPitchOneOctaveFrequencies[];
extern f32 gBendPitchTwoSemitonesFrequencies[];
extern f32 gPitchFrequencies[];
extern u8 gDefaultShortNoteVelocityTable[];
extern u8 gDefaultShortNoteGateTimeTable[];
extern EnvelopePoint gDefaultEnvelope[];
extern NoteSampleState gZeroedSampleState;
extern NoteSampleState gDefaultSampleState;
extern u16 gHaasEffectDelaySize[];
extern u16 gHaasEffectDelaySize[];
extern s16 gInvalidAdpcmCodeBook[];
extern f32 gHeadsetPanVolume[];
extern f32 gStereoPanVolume[];
extern f32 gDefaultPanVolume[];
// extern UNK_TYPE1 D_801D5F24;
// extern UNK_TYPE4 D_801D5FB4;
// extern UNK_TYPE4 D_801D5FB8;
// extern UNK_TYPE4 D_801D5FBC;
// extern UNK_TYPE4 D_801D5FC0;
// extern UNK_TYPE1 D_801D5FD4;
extern UNK_PTR D_801D5FE0;
// extern UNK_TYPE1 D_801D5FE4;
2022-10-13 20:17:27 +00:00
extern s32 gAudioCtxInitalized;
// extern UNK_TYPE4 D_801D5FEC;
// extern UNK_TYPE4 D_801D6190;
// extern UNK_TYPE4 D_801D6194;
extern u8 D_801D6200[0x400];
extern u8 gIsLargeSfxBank[7];
extern u8 D_801D6608[7];
extern u8 gChannelsPerBank[4][7];
extern u8 gUsedChannelsPerBank[4][7];
// extern UNK_TYPE1 D_801D6648;
// extern UNK_TYPE1 D_801D664C;
// extern UNK_TYPE1 D_801D6650;
extern f32 gSfxVolume;
// extern UNK_TYPE1 D_801D6658;
// extern UNK_TYPE1 D_801D665C;
// extern UNK_TYPE1 D_801D6660;
// extern UNK_TYPE1 D_801D666C;
// extern UNK_TYPE1 D_801D6680;
// extern UNK_TYPE1 D_801D6684;
// extern UNK_TYPE4 D_801D6694;
// extern UNK_TYPE1 D_801D6698;
// extern UNK_TYPE1 D_801D669E;
// extern UNK_TYPE1 D_801D669F;
// extern UNK_TYPE1 D_801D66A0;
// extern UNK_TYPE2 D_801D66A4;
// extern UNK_TYPE1 D_801D66A8;
// extern UNK_TYPE1 D_801D66AC;
// extern UNK_TYPE1 D_801D66B0;
// extern UNK_TYPE1 D_801D66B4;
// extern UNK_TYPE1 D_801D66B8;
// extern UNK_TYPE1 D_801D66BC;
// extern UNK_TYPE1 D_801D66C0;
// extern UNK_TYPE4 D_801D66C4;
// extern UNK_TYPE1 D_801D66C8;
// extern UNK_TYPE2 D_801D66CC;
// extern UNK_TYPE1 D_801D66D0;
// extern UNK_TYPE1 D_801D66D4;
// extern UNK_TYPE4 D_801D66D8;
// extern UNK_TYPE4 D_801D66DC;
// extern UNK_TYPE1 D_801D66E0;
// extern UNK_TYPE1 D_801D66E4;
// extern UNK_TYPE1 D_801D66E8;
// extern UNK_TYPE1 D_801D66EC;
// extern UNK_TYPE1 D_801D66F0;
// extern UNK_TYPE4 D_801D66F4;
// extern UNK_TYPE4 D_801D66F8;
// extern UNK_TYPE1 D_801D66FC;
// extern UNK_TYPE1 D_801D6700;
// extern UNK_TYPE1 D_801D6780;
// extern UNK_TYPE1 D_801D6794;
// extern UNK_TYPE1 D_801D6FB4;
// extern UNK_TYPE1 D_801D6FB8;
// extern UNK_TYPE1 D_801D6FBC;
// extern UNK_TYPE1 D_801D6FC0;
// extern UNK_TYPE1 D_801D6FC4;
// extern UNK_TYPE1 D_801D6FC8;
// extern UNK_TYPE4 D_801D6FCC;
// extern UNK_TYPE1 D_801D6FD0;
// extern UNK_TYPE1 D_801D6FD4;
// extern UNK_TYPE1 D_801D6FD8;
// extern UNK_TYPE1 D_801D6FDC;
// extern UNK_TYPE1 D_801D6FE0;
// extern UNK_TYPE1 sPlaybackStaffStopPos;
// extern UNK_TYPE1 sPlaybackStaffStartPos;
// extern UNK_TYPE4 D_801D6FEC;
// extern UNK_TYPE4 D_801D6FF0;
// extern UNK_TYPE2 D_801D6FF4;
// extern UNK_TYPE2 D_801D6FF8;
// extern UNK_TYPE4 D_801D6FFC;
// extern UNK_TYPE1 D_801D7000;
// extern UNK_TYPE1 D_801D7004;
// extern UNK_TYPE1 D_801D7008;
// extern UNK_TYPE1 D_801D700C;
// extern UNK_TYPE4 D_801D7010;
// extern UNK_TYPE4 D_801D7014;
// extern UNK_TYPE4 D_801D7018;
// extern UNK_TYPE4 D_801D701C;
// extern UNK_TYPE1 D_801D701E;
// extern UNK_TYPE1 D_801D701F;
// extern UNK_TYPE1 D_801D7020;
// extern UNK_TYPE1 D_801D7028;
// extern UNK_TYPE1 D_801D702C;
// extern UNK_TYPE1 D_801D7030;
// extern UNK_TYPE1 D_801D7038;
// extern UNK_TYPE1 D_801D703C;
// extern UNK_TYPE1 D_801D7040;
// extern UNK_TYPE1 D_801D7044;
// extern UNK_TYPE4 D_801D7E04;
// extern UNK_TYPE1 D_801D7EA4;
// extern UNK_TYPE1 D_801D7F44;
// extern UNK_TYPE1 D_801D84E4;
extern UNK_PTR D_801D84F0;
// extern UNK_TYPE1 D_801D84F4;
// extern UNK_TYPE1 D_801D8508;
// extern UNK_TYPE1 D_801D850C;
// extern UNK_TYPE4 D_801D8510;
// extern UNK_TYPE1 D_801D8514;
// extern UNK_TYPE1 D_801D8518;
// extern UNK_TYPE1 D_801D851C;
// extern UNK_TYPE1 D_801D8520;
// extern UNK_TYPE1 D_801D8524;
// extern UNK_TYPE1 D_801D8528;
// extern UNK_TYPE1 D_801D852C;
// extern UNK_TYPE1 D_801D8530;
// extern UNK_TYPE4 D_801D8534;
// extern UNK_TYPE1 D_801D8538;
// extern UNK_TYPE1 D_801D853C;
// extern UNK_TYPE2 D_801D853E;
// extern UNK_TYPE1 D_801D8544;
extern UNK_PTR D_801D889C;
extern u8* gScarecrowSpawnSongPtr;
extern UNK_PTR D_801D88A4;
// extern UNK_TYPE1 D_801D88A8;
// extern UNK_TYPE1 D_801D88B8;
extern OcarinaSongButtons gOcarinaSongButtons[24];
// extern UNK_TYPE1 D_801D8B20;
extern UNK_PTR D_801D8B24;
// extern UNK_TYPE2 D_801D8B28;
// extern UNK_TYPE1 D_801D8B2C;
// extern UNK_TYPE1 D_801D8B30;
// extern UNK_TYPE1 D_801D8BB0;
// extern UNK_TYPE2 D_801D8BD0;
// extern UNK_TYPE4 D_801D8BD4;
// extern UNK_TYPE1 D_801D8BE0;
2021-11-12 11:10:26 +00:00
// extern u8 D_801D8E3C;
// extern UNK_TYPE4 D_801D8E40;
2021-11-12 11:39:59 +00:00
// extern u16 sTopScoreWordId;
// extern UNK_TYPE1 D_801D8E48;
// extern UNK_TYPE1 D_801D8E50;
// extern UNK_TYPE1 D_801D8F70;
extern SfxParams* gSfxParams[7];
extern SfxBankEntry* gSfxBanks[7];
extern u8 gSfxChannelLayout;
extern Vec3f gSfxDefaultPos;
extern f32 gSfxDefaultFreqAndVolScale;
extern s8 gSfxDefaultReverb;
extern u8 gAudioSpecId;
extern u8 gAudioHeapResetState;
extern ReverbSettings* gReverbSettingsTable[10];
extern AudioSpec gAudioSpecs[21];
// rodata
extern f32 D_801DBDF0;
extern f32 D_801DBE68;
extern f32 D_801DBE6C;
extern f32 D_801DBE70;
extern f32 D_801DBE74;
extern f32 D_801DBE78;
extern f32 D_801DBE7C;
extern f32 D_801DBE80;
extern f32 D_801DBE84;
extern f32 D_801DBE88;
extern f32 D_801DBE8C;
extern f32 D_801DBE90;
extern f32 D_801DBE94;
extern f32 D_801DBE98;
extern f32 D_801DBE9C;
extern f32 D_801DBEA0;
extern f32 D_801DBF10;
extern f32 D_801DBF14;
extern f32 D_801DBF18;
extern f32 D_801DBF1C;
extern f32 D_801DBF20;
extern f32 D_801DC068;
extern f32 D_801DC06C;
extern f32 D_801DC070;
extern f32 D_801DC074;
extern f32 D_801DC080;
extern f32 D_801DC084;
extern f32 D_801DC09C;
extern f32 D_801DC0A0;
extern f32 D_801DC0B0;
extern f32 D_801DC0B4;
extern f32 D_801DC0C0;
extern f32 D_801DC0C4;
extern f32 D_801DC0C8;
extern f32 D_801DC0CC;
extern f32 D_801DC0D0;
extern f32 D_801DC0D4;
extern f32 D_801DC100;
extern f32 D_801DC104;
extern f32 D_801DC108;
extern f32 D_801DC10C;
extern f32 D_801DC110;
extern f32 D_801DC114;
extern char D_801DC120[];
extern char D_801DC134[];
extern char D_801DC148[];
extern char D_801DC15C[];
extern char D_801DC170[];
extern char D_801DC184[];
extern char D_801DC198[];
extern char D_801DC1AC[];
extern char D_801DC1C0[];
extern char D_801DC1D4[];
extern char D_801DC1E8[];
extern char D_801DC1FC[];
extern char D_801DC210[];
extern char D_801DC224[];
extern char D_801DC238[];
extern char D_801DC24C[];
extern char D_801DC260[];
extern char D_801DC274[];
extern char D_801DC288[];
extern char D_801DC29C[];
extern char D_801DC2B0[];
extern char D_801DC2C4[];
extern char D_801DC2D8[];
extern char D_801DC2EC[];
extern char D_801DC300[];
extern char D_801DC314[];
extern char D_801DC328[];
extern char D_801DC33C[];
extern char D_801DC350[];
extern char D_801DC364[];
extern char D_801DC378[];
extern char D_801DC38C[];
extern char D_801DC3A0[];
extern char D_801DC3B4[];
extern char D_801DC3C8[];
extern char D_801DC3DC[];
extern char D_801DC3F0[];
extern char D_801DC404[];
extern char D_801DC418[];
extern char D_801DC42C[];
extern char D_801DC440[];
extern char D_801DC454[];
extern char D_801DC468[];
extern char D_801DC47C[];
extern char D_801DC490[];
extern char D_801DC4A4[];
extern char D_801DC4B8[];
extern char D_801DC4CC[];
extern char D_801DC4E0[];
extern char D_801DC4F4[];
extern char D_801DC508[];
extern char D_801DC51C[];
extern char D_801DC530[];
extern char D_801DC544[];
extern char D_801DC558[];
extern char D_801DC56C[];
extern char D_801DC580[];
extern char D_801DC594[];
extern char D_801DC5A8[];
extern char D_801DC5BC[];
extern char D_801DC5D0[];
extern char D_801DC5E4[];
extern char D_801DC5F8[];
extern char D_801DC60C[];
extern char D_801DC620[];
extern char D_801DC634[];
extern char D_801DC648[];
extern char D_801DC65C[];
extern char D_801DC670[];
extern char D_801DC684[];
extern char D_801DC698[];
extern char D_801DC6AC[];
extern char D_801DC6C0[];
extern char D_801DC6D4[];
extern char D_801DC6E8[];
extern char D_801DC6FC[];
extern char D_801DC710[];
extern char D_801DC724[];
extern char D_801DC738[];
extern char D_801DC74C[];
extern char D_801DC760[];
extern char D_801DC774[];
extern char D_801DC788[];
extern char D_801DC79C[];
extern char D_801DC7B0[];
extern char D_801DC7C4[];
extern char D_801DC7D8[];
extern char D_801DC7EC[];
extern char D_801DC800[];
extern char D_801DC814[];
extern char D_801DC828[];
extern char D_801DC83C[];
extern char D_801DC850[];
extern char D_801DC864[];
extern char D_801DC878[];
extern char D_801DC88C[];
extern char D_801DC8A0[];
extern char D_801DC8B4[];
extern char D_801DC8C8[];
extern char D_801DC8DC[];
extern char D_801DC8F0[];
extern char D_801DC900[];
extern char D_801DC910[];
extern char D_801DC920[];
extern char D_801DC930[];
extern char D_801DC940[];
extern char D_801DC950[];
extern char D_801DC960[];
extern char D_801DC970[];
extern char D_801DC984[];
extern char D_801DC998[];
// extern UNK_TYPE1 D_801DC9AC;
// extern UNK_TYPE1 D_801DC9B0;
// extern UNK_TYPE1 D_801DC9B4;
extern char D_801DC9D0[];
extern char D_801DC9D8[];
extern char D_801DC9F8[];
extern char D_801DCA10[];
extern f32 D_801DCA14;
extern f32 D_801DCA18;
extern f32 D_801DCA1C;
extern f32 D_801DCA20;
extern f32 D_801DCA24;
extern f32 D_801DCA28;
extern f32 D_801DCA2C;
extern f32 D_801DCA30;
extern f32 D_801DCA34;
extern f32 D_801DCA38;
extern f32 D_801DCA3C;
extern f32 D_801DCA40;
extern f32 D_801DCA44;
extern f32 D_801DCA48;
extern f32 D_801DCA4C;
extern f32 D_801DCA50;
extern f32 D_801DCA54;
extern f32 D_801DCA6C;
extern f32 D_801DCA70;
extern f32 D_801DCA74;
extern f32 D_801DCA78;
extern f32 D_801DCA7C;
extern f32 D_801DCA80;
extern f32 D_801DCA84;
extern f32 D_801DCA88;
extern f32 D_801DCA8C;
extern f32 D_801DCA90;
extern f32 D_801DCA94;
extern f32 D_801DCA98;
extern f32 D_801DCA9C;
extern f32 D_801DCAA0;
extern f32 D_801DCAA4;
extern f32 D_801DCAA8;
extern f32 D_801DCAAC;
extern f32 D_801DCAB0;
extern f32 D_801DCAB4;
extern f32 D_801DCAB8;
extern f32 D_801DCABC;
extern f32 D_801DCAC0;
extern f32 D_801DCAC4;
extern f32 D_801DCAC8;
extern f32 D_801DCACC;
extern f32 D_801DCAD0;
extern f32 D_801DCAD4;
extern f32 D_801DCAD8;
extern f32 D_801DCADC;
extern f32 D_801DCAE0;
extern f32 D_801DCB68;
extern f32 D_801DCB6C;
extern f32 D_801DCB70;
extern f32 D_801DCB74;
extern f32 D_801DCB78;
extern f32 D_801DCB7C;
extern f32 D_801DCB80;
extern f32 D_801DCB84;
extern f32 D_801DCB88;
extern f32 D_801DCB8C;
extern f32 D_801DCB90;
extern f32 D_801DCB94;
extern f32 D_801DCB98;
extern f32 D_801DCB9C;
extern f32 D_801DCBA0;
extern f32 D_801DCBA4;
extern f32 D_801DCBA8;
extern f32 D_801DCBAC;
extern char D_801DCBB0[];
extern char D_801DCBC4[];
extern char D_801DCBE4[];
// extern UNK_TYPE1 D_801DCBFC;
extern char D_801DCC00[];
extern char D_801DCC10[];
extern char D_801DCC20[];
extern char D_801DCC64[];
extern char D_801DCC94[];
extern char D_801DCCB8[];
extern char D_801DCCC8[];
extern char D_801DCCE8[];
extern char D_801DCCF8[];
extern char D_801DCD18[];
extern f32 D_801DCD28;
extern f32 D_801DCD2C;
extern f32 D_801DCD30;
extern f32 D_801DCD34;
extern f32 D_801DCD38;
extern f32 D_801DCD3C;
extern f32 D_801DCD40;
extern f32 D_801DCD44;
extern f32 D_801DCD48;
extern f32 D_801DCD4C;
extern f32 D_801DCD50;
extern f32 D_801DCD54;
extern f32 D_801DCD58;
extern f32 D_801DCD5C;
extern f32 D_801DCD60;
extern f32 D_801DCD64;
extern f32 D_801DCD68;
extern f32 D_801DCD6C;
extern f32 D_801DCD70;
extern f32 D_801DCD74;
extern f32 D_801DCD78;
extern f32 D_801DCD7C;
extern f32 D_801DCD80;
extern f32 D_801DCD84;
extern f32 D_801DCD88;
extern f32 D_801DCD8C;
extern f32 D_801DCD90;
extern f32 D_801DCD94;
extern f32 D_801DCD98;
extern f32 D_801DCD9C;
extern f32 D_801DCDA0;
extern f32 D_801DCDA4;
extern f32 D_801DCDB0;
extern f32 D_801DCDB4;
extern f32 D_801DCDC0;
extern f32 D_801DCDC4;
extern f32 D_801DCDC8;
extern f32 D_801DCDCC;
extern f32 D_801DCDD0;
extern f32 D_801DCDD4;
extern f32 D_801DCDD8;
extern f32 D_801DCDE4;
extern f32 D_801DCDE8;
extern f32 D_801DCDEC;
extern f32 D_801DCDF0;
extern f32 D_801DCDF4;
extern f32 D_801DCDF8;
extern f32 D_801DCDFC;
extern f32 D_801DCE00;
extern f32 D_801DCE04;
extern f32 D_801DCE08;
extern f32 D_801DCE0C;
extern f32 D_801DCE10;
extern f32 D_801DCE14;
extern f32 D_801DCE18;
extern f32 D_801DCE1C;
extern f32 D_801DCE20;
extern f32 D_801DCE24;
extern f32 D_801DCE28;
extern f32 D_801DCE2C;
extern f32 D_801DCE30;
extern f32 D_801DCE34;
extern f32 D_801DCE38;
extern f32 D_801DCE3C;
extern f32 D_801DCE40;
extern f32 D_801DCE44;
extern f32 D_801DCE48;
extern f32 D_801DCE4C;
extern f32 D_801DCE50;
extern f32 D_801DCE54;
extern f32 D_801DCE58;
extern f32 D_801DCE5C;
extern f32 D_801DCE60;
extern f32 D_801DCE64;
extern f32 D_801DCE68;
extern f32 D_801DCE6C;
extern f32 D_801DCE70;
extern f32 D_801DCE74;
extern f32 D_801DCE78;
extern f32 D_801DCE7C;
extern f32 D_801DCE80;
extern f32 D_801DCE84;
extern f32 D_801DCE88;
extern f32 D_801DCE8C;
extern f32 D_801DCE90;
extern f32 D_801DCE94;
extern f32 D_801DCE98;
extern f32 D_801DCE9C;
extern f32 D_801DCEA0;
extern f32 D_801DCEA4;
extern f32 D_801DCEA8;
extern f32 D_801DCEAC;
extern f32 D_801DCEB0;
extern f32 D_801DCEB4;
extern f32 D_801DCEB8;
extern f32 D_801DCEBC;
extern f32 D_801DCEC0;
extern f32 D_801DCEC4;
extern f32 D_801DCEC8;
extern f32 D_801DCECC;
extern f32 D_801DCED0;
extern f32 D_801DCED4;
extern f32 D_801DCED8;
extern f32 D_801DCEDC;
extern f32 D_801DCEE0;
extern f32 D_801DCEE4;
extern f32 D_801DCEE8;
extern f32 D_801DCEEC;
extern f32 D_801DCEF0;
extern f32 D_801DCEF4;
extern f32 D_801DCEF8;
extern f32 D_801DCEFC;
extern f32 D_801DCF00;
extern f32 D_801DCF04;
extern f32 D_801DCF08;
extern f32 D_801DCF0C;
extern f32 D_801DCF10;
extern f32 D_801DCF14;
extern f32 D_801DCF18;
extern f32 D_801DCF1C;
extern f32 D_801DCF34;
extern f32 D_801DCF38;
extern f32 D_801DCF3C;
extern f32 D_801DCF40;
extern f32 D_801DCF44;
extern f32 D_801DCF48;
extern f32 D_801DCF4C;
extern f32 D_801DCF50;
extern f32 D_801DCF54;
extern f32 D_801DCF58;
extern f32 D_801DCF5C;
extern f32 D_801DCF60;
extern f32 D_801DCF64;
extern f32 D_801DCF68;
extern f32 D_801DCF6C;
extern f32 D_801DCF70;
extern f32 D_801DCF74;
extern f32 D_801DCF78;
extern f32 D_801DCF7C;
extern f32 D_801DCF80;
extern f32 D_801DCF84;
extern f32 D_801DCF8C;
extern f32 D_801DCF90;
extern f32 D_801DCF98;
extern f32 D_801DCF9C;
extern f32 D_801DCFA0;
extern f32 D_801DCFA4;
extern f32 D_801DCFA8;
extern f32 D_801DCFAC;
extern f32 D_801DCFB0;
extern f32 D_801DCFB8;
extern f32 D_801DCFBC;
extern f32 D_801DCFC0;
extern f32 D_801DCFC4;
extern f32 D_801DCFC8;
extern f32 D_801DCFCC;
extern f32 D_801DCFD0;
extern f32 D_801DCFD4;
extern f32 D_801DD00C;
extern f32 D_801DD010;
extern f32 D_801DD014;
extern f32 D_801DD018;
extern f32 D_801DD01C;
extern f32 D_801DD020;
extern f32 D_801DD024;
extern f32 D_801DD028;
extern f32 D_801DD02C;
extern f32 D_801DD030;
extern f32 D_801DD034;
extern f32 D_801DD038;
extern f32 D_801DD03C;
extern f32 D_801DD040;
extern f32 D_801DD044;
extern f32 D_801DD048;
extern f32 D_801DD04C;
extern f32 D_801DD050;
extern f32 D_801DD054;
extern f32 D_801DD058;
extern f32 D_801DD060;
extern f32 D_801DD064;
extern f32 D_801DD068;
extern f32 D_801DD06C;
extern f32 D_801DD070;
extern f32 D_801DD074;
extern f32 D_801DD078;
extern f32 D_801DD07C;
extern f32 D_801DD080;
extern f32 D_801DD084;
extern f32 D_801DD088;
extern f32 D_801DD08C;
extern f32 D_801DD090;
extern f32 D_801DD094;
extern f32 D_801DD098;
extern f32 D_801DD09C;
extern f32 D_801DD0A0;
extern f32 D_801DD0A4;
extern f32 D_801DD0A8;
extern f32 D_801DD0AC;
extern f32 D_801DD0B0;
extern f32 D_801DD0B4;
extern f32 D_801DD0B8;
extern f32 D_801DD0BC;
extern f32 D_801DD0C0;
extern f32 D_801DD0C4;
extern f32 D_801DD0C8;
extern f32 D_801DD0CC;
extern f32 D_801DD0D0;
extern f32 D_801DD0D4;
extern f32 D_801DD0D8;
extern f32 D_801DD0DC;
extern f32 D_801DD0E0;
extern f32 D_801DD0E4;
extern f32 D_801DD0E8;
extern f32 D_801DD0EC;
extern f32 D_801DD0F0;
extern f32 D_801DD0F4;
extern f32 D_801DD0F8;
extern f32 D_801DD0FC;
extern f32 D_801DD100;
extern f32 D_801DD104;
extern f32 D_801DD108;
extern f32 D_801DD10C;
extern f32 D_801DD110;
extern f32 D_801DD114;
extern f32 D_801DD118;
extern f32 D_801DD11C;
extern f32 D_801DD120;
extern f32 D_801DD124;
extern f32 D_801DD128;
extern f32 D_801DD12C;
extern f32 D_801DD130;
extern f32 D_801DD134;
extern f32 D_801DD138;
extern f32 D_801DD13C;
extern f32 D_801DD140;
extern f32 D_801DD144;
extern f32 D_801DD148;
extern f32 D_801DD14C;
extern f32 D_801DD150;
extern f32 D_801DD154;
extern f32 D_801DD158;
extern f32 D_801DD15C;
extern f32 D_801DD160;
extern f32 D_801DD164;
extern f32 D_801DD168;
extern f32 D_801DD16C;
extern f32 D_801DD170;
extern f32 D_801DD174;
extern f32 D_801DD178;
extern f32 D_801DD1B0;
extern f32 D_801DD1B4;
extern f32 D_801DD1B8;
extern f32 D_801DD1BC;
extern f32 D_801DD1C0;
extern f32 D_801DD1C4;
extern f32 D_801DD1C8;
extern f32 D_801DD1CC;
extern f32 D_801DD1D0;
extern f32 D_801DD1D4;
extern f32 D_801DD1D8;
extern f32 D_801DD1DC;
extern f32 D_801DD1E0;
extern f32 D_801DD1E4;
extern f32 D_801DD1E8;
extern f32 D_801DD1EC;
extern f32 D_801DD1F0;
extern f32 D_801DD1F4;
extern f32 D_801DD1F8;
extern f32 D_801DD1FC;
extern f32 D_801DD200;
extern f32 D_801DD204;
extern f32 D_801DD208;
extern f32 D_801DD20C;
extern f32 D_801DD210;
extern f32 D_801DD214;
extern f32 D_801DD218;
extern f32 D_801DD21C;
extern f32 D_801DD220;
extern f32 D_801DD224;
extern f32 D_801DD228;
extern f32 D_801DD22C;
extern f32 D_801DD230;
extern f32 D_801DD234;
extern f32 D_801DD238;
extern f32 D_801DD23C;
extern f32 D_801DD240;
extern f32 D_801DD244;
extern f32 D_801DD248;
extern f32 D_801DD24C;
extern f32 D_801DD250;
extern f32 D_801DD254;
extern f32 D_801DD258;
extern f32 D_801DD25C;
extern f32 D_801DD260;
extern f32 D_801DD264;
extern f32 D_801DD268;
extern f32 D_801DD26C;
extern f32 D_801DD270;
extern f32 D_801DD274;
extern f32 D_801DD278;
extern f32 D_801DD27C;
extern f32 D_801DD2A0;
extern f32 D_801DD2A4;
extern f32 D_801DD2A8;
extern f32 D_801DD2AC;
extern f32 D_801DD2B0;
extern f32 D_801DD2B4;
extern f32 D_801DD2B8;
extern f32 D_801DD2BC;
extern f32 D_801DD2C0;
extern f32 D_801DD2C4;
extern f32 D_801DD344;
extern f32 D_801DD348;
extern f32 D_801DD34C;
extern f32 D_801DD350;
extern f32 D_801DD354;
extern f32 D_801DD358;
extern f32 D_801DD35C;
extern f32 D_801DD360;
extern f32 D_801DD364;
extern f32 D_801DD368;
extern f32 D_801DD36C;
extern f32 D_801DD370;
extern f32 D_801DD374;
extern f32 D_801DD38C;
extern f32 D_801DD390;
extern f32 D_801DD394;
extern f32 D_801DD398;
extern f32 D_801DD39C;
extern f32 D_801DD3A0;
extern f32 D_801DD3A4;
extern f32 D_801DD3A8;
extern f32 D_801DD3AC;
extern f32 D_801DD3B0;
extern f32 D_801DD3B4;
extern f32 D_801DD3B8;
extern f32 D_801DD3BC;
extern f32 D_801DD3C0;
extern f32 D_801DD3C4;
extern f32 D_801DD3C8;
extern f32 D_801DD3CC;
extern f32 D_801DD3D0;
extern f32 D_801DD3D4;
extern f32 D_801DD3D8;
extern f32 D_801DD3DC;
extern f32 D_801DD3E0;
extern f32 D_801DD3E4;
extern f32 D_801DD3E8;
extern f32 D_801DD3EC;
extern f32 D_801DD3F0;
extern f32 D_801DD3F4;
extern f32 D_801DD3F8;
extern f32 D_801DD3FC;
extern f32 D_801DD400;
extern f32 D_801DD404;
extern f32 D_801DD408;
extern f32 D_801DD40C;
extern f32 D_801DD410;
extern f32 D_801DD414;
extern f32 D_801DD418;
extern f32 D_801DD41C;
extern f32 D_801DD420;
extern f32 D_801DD424;
extern f32 D_801DD43C;
extern f32 D_801DD440;
extern f32 D_801DD444;
extern f32 D_801DD448;
extern f32 D_801DD44C;
extern f32 D_801DD450;
extern f32 D_801DD454;
extern f32 D_801DD458;
extern f32 D_801DD45C;
extern f32 D_801DD460;
extern f32 D_801DD5AC;
extern f32 D_801DD5B0;
extern f32 D_801DD5C0;
extern f32 D_801DD5C4;
extern f32 D_801DD5C8;
extern f32 D_801DD5CC;
extern f32 D_801DD5D0;
extern f32 D_801DD5D4;
extern f32 D_801DD5D8;
extern f32 minCylinderIntersectAmount;
extern f32 D_801DD5E0;
extern f32 D_801DD5E4;
extern f32 D_801DD5E8;
extern f32 D_801DD5EC;
extern f32 D_801DD5F0;
extern f32 D_801DD5F4;
extern f32 D_801DD5F8;
extern f32 D_801DD5FC;
extern char D_801DD600[];
extern char D_801DD604[];
extern f32 D_801DD6FC;
extern f32 D_801DD770;
extern f32 D_801DD774;
extern f32 D_801DD780;
extern f32 D_801DD7B0;
extern f32 D_801DD7C0;
// extern UNK_TYPE2 D_801DD880;
// extern UNK_TYPE1 D_801DD8E0;
// extern UNK_TYPE4 D_801DD900;
extern f32 D_801DD940;
extern f32 D_801DD944;
extern f32 D_801DD948;
extern f32 D_801DD94C;
extern f32 D_801DD950;
extern f32 D_801DD954;
extern f32 D_801DD958;
extern f32 D_801DD95C;
extern f32 D_801DD960;
extern f32 D_801DD964;
extern f32 D_801DD968;
extern f32 D_801DD96C;
extern f32 D_801DD970;
extern f32 D_801DD974;
extern f32 D_801DD978;
extern f32 D_801DD97C;
extern f32 D_801DD980;
extern f32 D_801DD984;
extern f32 D_801DD988;
extern f32 D_801DD98C;
extern f32 D_801DD990;
extern f32 D_801DD9EC;
extern f32 D_801DD9F0;
extern f32 D_801DD9F4;
extern f32 D_801DD9F8;
extern f32 D_801DD9FC;
extern f32 D_801DDA7C;
extern f32 D_801DDA80;
extern f32 D_801DDA84;
extern f32 D_801DDA90;
extern f32 D_801DDA94;
extern f32 D_801DDA98;
extern f32 D_801DDA9C;
extern f32 D_801DDAA0;
extern f32 D_801DDAB0;
extern f32 D_801DDAB4;
extern const f32 D_801DDAB8;
extern f32 D_801DDAC0;
extern f32 D_801DDAC4;
extern f32 D_801DDAC8;
extern f32 D_801DDACC;
extern f32 D_801DDAD0;
extern f32 D_801DDAD4;
extern f32 D_801DDAD8;
extern f32 D_801DDADC;
extern f32 D_801DDAE0;
extern f32 D_801DDAE4;
extern f32 D_801DDAE8;
extern f32 D_801DDAEC;
extern f32 D_801DDAF0;
extern f32 D_801DDAF4;
extern f32 D_801DDAF8;
extern f32 D_801DDAFC;
extern f32 D_801DDBA8;
extern f32 D_801DDBAC;
extern f32 D_801DDBB0;
extern f32 D_801DDBB4;
extern f32 D_801DDBB8;
extern f32 D_801DDBBC;
extern f32 D_801DDBC0;
extern f32 D_801DDBC4;
extern f32 D_801DDBC8;
extern f32 D_801DDBCC;
extern f32 D_801DDCF8;
extern f32 D_801DDCFC;
extern f32 D_801DDD00;
extern f32 D_801DDD04;
extern f32 D_801DDD08;
extern f32 D_801DDD0C;
extern f32 D_801DDD10;
extern f32 D_801DDD14;
extern f32 D_801DDD20;
extern f32 D_801DDD24;
extern f32 D_801DDD28;
extern f32 D_801DDD2C;
extern f32 D_801DDD30;
extern f32 D_801DDD34;
extern f32 D_801DDD38;
extern f32 D_801DDD3C;
extern f32 D_801DDD40;
extern f32 D_801DDD44;
extern f32 D_801DDD48;
extern f32 D_801DDD4C;
extern f32 D_801DDD50;
extern f32 D_801DDD54;
extern f32 D_801DDD58;
extern f32 D_801DDD5C;
extern f32 D_801DDD60;
extern f32 D_801DDD64;
extern f32 D_801DDD68;
extern f32 D_801DDD6C;
extern f32 D_801DDD70;
extern f32 D_801DDD74;
extern f32 D_801DDD78;
extern f32 D_801DDD7C;
extern f32 D_801DDD80;
extern f32 D_801DDD84;
extern f32 D_801DDD88;
extern f32 D_801DDD8C;
extern f32 D_801DDD90;
extern f32 D_801DDD94;
extern f32 D_801DDD98;
extern f32 D_801DDD9C;
extern f32 D_801DDDA0;
extern f32 D_801DDDA4;
extern f32 D_801DDDA8;
extern f32 D_801DDDAC;
extern f32 D_801DDDB0;
extern f32 D_801DDDB4;
extern f32 D_801DDDB8;
extern f32 D_801DDDBC;
extern f32 D_801DDDC0;
extern f32 D_801DDDC4;
extern f32 D_801DDDC8;
extern f32 D_801DDDCC;
extern f32 D_801DDDD0;
extern f32 D_801DDDD4;
extern f32 D_801DDDD8;
extern f32 D_801DDDDC;
extern f32 D_801DDDE0;
extern f32 D_801DDDE4;
extern f32 D_801DDDE8;
extern f32 D_801DDDEC;
extern f32 D_801DDDF0;
extern f32 D_801DDDF4;
extern f32 D_801DDDF8;
extern f32 D_801DDDFC;
extern f32 D_801DDE00;
extern f32 D_801DDE04;
extern f32 D_801DDE90;
extern f32 D_801DDE94;
extern f32 D_801DDE98;
extern f32 D_801DDE9C;
extern f32 D_801DDEA0;
extern f32 D_801DDEA4;
extern f32 D_801DDEA8;
extern f32 D_801DDEAC;
extern f32 D_801DDEB0;
extern f32 D_801DDEB4;
extern f32 D_801DDEB8;
extern f32 D_801DDEBC;
extern f32 D_801DDEC0;
extern f32 D_801DDEC4;
extern f32 D_801DDEC8;
extern f32 D_801DDECC;
extern f32 D_801DDED0;
extern f32 D_801DDED4;
extern f32 D_801DDED8;
extern f32 D_801DDEDC;
extern f32 D_801DDEE0;
extern f32 D_801DDEE4;
extern f32 D_801DDEE8;
extern f32 D_801DDEEC;
extern f32 D_801DDEF0;
extern f32 D_801DDEF4;
extern f32 D_801DDEF8;
extern f32 D_801DDEFC;
extern f32 D_801DDF00;
extern f32 D_801DDF04;
extern f32 D_801DDF08;
extern f32 D_801DDF0C;
extern f32 D_801DDF10;
extern f32 D_801DDF14;
extern f32 D_801DDF18;
extern f32 D_801DDF1C;
extern f32 D_801DDF20;
extern f32 D_801DDF24;
extern f32 D_801DDF28;
extern f32 D_801DDF2C;
extern f32 D_801DDF30;
extern f32 D_801DDF34;
extern f32 D_801DDF38;
extern f32 D_801DDF3C;
extern f32 D_801DDF40;
extern f32 D_801DDF44;
extern f32 D_801DDF48;
extern f32 D_801DDF4C;
extern f32 D_801DDF50;
extern f32 D_801DDF54;
extern f32 D_801DDF58;
extern f32 D_801DDF5C;
extern f32 D_801DDF60;
extern f32 D_801DDF64;
extern f32 D_801DDF68;
extern f32 D_801DDF6C;
extern f32 D_801DDF70;
extern f32 D_801DDF74;
extern f32 D_801DDF78;
extern f32 D_801DDF7C;
extern f32 D_801DDF80;
extern f32 D_801DDF84;
extern f32 D_801DDF88;
extern f32 D_801DDF8C;
extern f32 D_801DDF90;
extern f32 D_801DDF94;
extern char D_801DDFA0[];
extern char D_801DDFAC[];
extern char D_801DDFB8[];
extern f32 D_801DDFC4;
extern f32 D_801DDFC8;
extern f32 D_801DDFCC;
extern f32 D_801DDFD0;
extern f32 D_801DDFD4;
extern f32 D_801DDFD8;
extern f32 D_801DDFDC;
extern f32 D_801DDFE0;
extern f32 D_801DDFE4;
extern char D_801DE020[];
extern char D_801DE030[];
extern char D_801DE03C[];
extern char D_801DE04C[];
extern char D_801DE058[];
extern char D_801DE064[];
extern char D_801DE074[];
extern char D_801DE084[];
extern char D_801DE094[];
extern char D_801DE0A0[];
extern char D_801DE0A8[];
extern char D_801DE0B4[];
extern char D_801DE0C0[];
extern char D_801DE0CC[];
extern char D_801DE0D8[];
extern char D_801DE0E4[];
extern char D_801DE0F0[];
extern char D_801DE0FC[];
extern char D_801DE10C[];
extern char D_801DE118[];
extern char D_801DE12C[];
extern char D_801DE138[];
extern char D_801DE144[];
extern char D_801DE154[];
extern char D_801DE164[];
extern char D_801DE170[];
extern char D_801DE180[];
extern char D_801DE18C[];
extern char D_801DE19C[];
extern char D_801DE1A8[];
extern char D_801DE1B8[];
extern char D_801DE1C4[];
extern char D_801DE1D0[];
extern char D_801DE1E0[];
extern char D_801DE1F0[];
extern char D_801DE200[];
extern char D_801DE20C[];
extern char D_801DE21C[];
extern char D_801DE22C[];
extern char D_801DE234[];
extern char D_801DE244[];
extern char D_801DE258[];
extern char D_801DE268[];
extern char D_801DE278[];
extern char D_801DE280[];
extern char D_801DE290[];
extern char D_801DE29C[];
extern char D_801DE2A8[];
extern char D_801DE2B8[];
extern char D_801DE2C4[];
extern char D_801DE2D4[];
extern char D_801DE2E4[];
extern char D_801DE2F4[];
extern char D_801DE304[];
extern char D_801DE314[];
extern char D_801DE320[];
extern char D_801DE328[];
extern char D_801DE330[];
extern char D_801DE340[];
extern char D_801DE350[];
extern char D_801DE360[];
extern char D_801DE370[];
extern char D_801DE384[];
extern char D_801DE38C[];
extern char D_801DE398[];
extern char D_801DE3A4[];
extern char D_801DE3B0[];
extern char D_801DE3C4[];
extern char D_801DE3D4[];
extern char D_801DE3E0[];
extern char D_801DE3F4[];
extern char D_801DE400[];
extern char D_801DE40C[];
extern char D_801DE418[];
extern char D_801DE424[];
extern char D_801DE434[];
extern char D_801DE444[];
extern char D_801DE450[];
extern char D_801DE458[];
extern char D_801DE460[];
extern char D_801DE478[];
extern char D_801DE48C[];
extern char D_801DE49C[];
extern char D_801DE4AC[];
extern char D_801DE4BC[];
extern char D_801DE4C8[];
extern char D_801DE4D4[];
extern char D_801DE4E0[];
extern char D_801DE4F0[];
extern char D_801DE500[];
extern char D_801DE510[];
extern char D_801DE520[];
extern char D_801DE530[];
extern char D_801DE53C[];
extern char D_801DE548[];
extern char D_801DE558[];
extern char D_801DE568[];
extern char D_801DE578[];
extern char D_801DE580[];
extern char D_801DE58C[];
extern char D_801DE598[];
extern char D_801DE5A8[];
extern f32 D_801DE5C0;
extern f32 D_801DE5D0;
// extern UNK_TYPE1 D_801DE5E0;
extern f32 D_801DE820;
extern f32 D_801DE824;
extern f32 D_801DE828;
extern f32 D_801DE82C;
extern f32 D_801DE830;
extern f32 D_801DE834;
extern f32 D_801DE838;
extern f32 D_801DE83C;
extern f32 D_801DE840;
extern f32 D_801DE844;
extern f32 D_801DE848;
extern f32 D_801DE84C;
extern f32 D_801DE850;
extern f32 D_801DE854;
extern f32 D_801DE858;
extern f32 D_801DE85C;
extern f32 D_801DE860;
extern f32 D_801DE864;
extern f32 D_801DE868;
extern f32 D_801DE884;
// extern TexturePtr gCircleTex[];
extern f32 D_801DF090;
extern f32 D_801DF094;
extern f32 D_801DF0A0;
extern char D_801DF0B0[];
// extern UNK_TYPE1 D_801DF0C0;
extern f32 D_801DF120;
extern f32 D_801DF124;
extern f32 D_801DF148;
extern f32 D_801DF3AC;
extern f32 D_801DF3B0;
extern f32 D_801DF3B4;
extern f32 D_801DF3B8;
extern f32 D_801DF3BC;
extern f32 D_801DF3C0;
extern f32 D_801DF3C4;
extern f32 D_801DF3C8;
extern UNK_PTR D_801DF83C;
extern f32 D_801DF8E0;
extern f32 D_801DF970;
extern f32 D_801DF974;
extern f32 D_801DF978;
extern f32 D_801DF97C;
extern f32 D_801DF980;
extern f32 D_801DF984;
extern f32 D_801DF988;
extern f32 D_801DF98C;
extern f32 D_801DF990;
extern f32 D_801DF994;
extern f32 D_801DF998;
extern f32 D_801DF99C;
extern f32 D_801DF9A0;
extern f32 D_801DF9A4;
extern f32 D_801DF9A8;
extern f32 D_801DF9AC;
extern f32 D_801DF9B0;
extern f32 D_801DF9B4;
extern char D_801DF9C0[];
extern char D_801DF9D0[];
extern f32 D_801DF9E0;
extern f32 D_801DF9E4;
extern f32 D_801DF9E8;
extern f32 D_801DF9EC;
extern f32 D_801DF9F0;
extern f32 D_801DF9F4;
extern f32 D_801DF9F8;
extern char D_801DFA00[];
extern char D_801DFA0C[];
extern f32 D_801DFC3C;
extern f32 D_801DFC40;
extern f32 D_801DFC44;
extern f32 D_801DFC50;
extern f32 D_801DFC54;
extern f32 D_801DFC58;
extern f32 D_801DFC5C;
extern char D_801DFC60[];
extern u8 D_801DFC70[7];
// extern UNK_TYPE1 D_801DFC77;
extern char D_801DFC80[];
extern char D_801DFC9C[];
extern char D_801DFCC0[];
extern char D_801DFCCC[];
extern char D_801DFCE0[];
extern char D_801DFCFC[];
extern char D_801DFD10[];
extern char D_801DFD2C[];
extern char D_801DFD40[];
extern char D_801DFD50[];
extern char D_801DFD5C[];
extern char schedThreadName[];
extern char audioThreadName[];
extern char padmgrThreadName[];
extern char graphThreadName[];
extern char D_801DFD90[];
extern char D_801DFD9C[];
extern char D_801DFDA8[];
extern char D_801DFDE0[];
extern char D_801DFDFC[];
extern char D_801DFE18[];
extern char D_801DFE48[];
extern char D_801DFE6C[];
extern char D_801DFE8C[];
// extern UNK_TYPE1 D_801DFEC0;
extern char D_801DFEF0[];
extern char D_801DFF0C[];
extern char D_801DFF28[];
extern char D_801DFF58[];
extern char D_801DFF7C[];
// extern UNK_TYPE1 D_801DFF9C;
// extern UNK_TYPE1 D_801DFFCC;
// extern UNK_TYPE1 D_801DFFE0;
// extern UNK_TYPE1 D_801E0000;
extern char D_801E0038[];
extern char D_801E0060[];
extern char D_801E0088[];
extern char D_801E0094[];
extern char D_801E00A8[];
extern char D_801E00BC[];
extern char D_801E00E8[];
extern f32 D_801E0120;
extern f32 D_801E0124;
extern f32 D_801E0128;
extern f32 D_801E012C;
extern f32 Math3D_Normalize_min_length;
extern f32 D_801E0134;
extern f32 D_801E0138;
extern f32 D_801E013C;
extern f32 D_801E0140;
2023-10-21 16:35:44 +00:00
extern f32 Math3D_AngleBetweenVectors_min_length;
extern f32 D_801E0148;
extern f32 D_801E014C;
extern f32 Math3D_UnitNormalVector_min_length;
extern f32 Math3D_NormalizedDistanceFromPlane_min_length;
extern f32 D_801E0158;
extern f32 D_801E015C;
extern f32 D_801E0160;
extern f32 D_801E0164;
extern f32 D_801E0168;
extern f32 D_801E016C;
extern f32 D_801E0170;
extern f32 D_801E0174;
extern f32 D_801E0178;
extern f32 D_801E017C;
extern f32 D_801E0180;
extern f32 D_801E0184;
extern f32 D_801E0188;
extern f32 D_801E018C;
extern f32 D_801E0190;
extern f32 D_801E0194;
extern f32 D_801E0198;
extern f32 D_801E019C;
extern f32 D_801E01A0;
extern f32 D_801E01A4;
extern f32 D_801E01A8;
extern f32 D_801E01AC;
extern f32 D_801E01B0;
extern f32 D_801E01B4;
extern f32 D_801E01B8;
extern f32 D_801E01BC;
extern f32 D_801E01C0;
extern f32 D_801E01C4;
extern f32 Math3D_ColSphereSphereIntersectAndDistance_min_intersect;
extern f32 D_801E01CC;
extern f32 D_801E01D0;
extern f32 D_801E01D4;
extern f32 D_801E01F0;
extern f32 D_801E01F4;
extern f32 D_801E01F8;
extern f32 D_801E0200;
extern f32 D_801E0204;
extern f32 D_801E0208;
extern f32 D_801E020C;
extern f32 D_801E0210;
extern f32 D_801E0214;
extern f32 D_801E0218;
extern f32 D_801E021C;
extern f32 D_801E0220;
extern f32 D_801E0224;
extern f32 D_801E0228;
extern char D_801E0230[];
extern char D_801E0238[];
extern char D_801E023C[];
extern char D_801E0240[];
extern char D_801E0248[];
extern char D_801E0250[];
extern char D_801E0258[];
extern char D_801E026C[];
extern f32 D_801E02A0;
extern f32 D_801E02B0;
extern f32 D_801E02B4;
extern f32 D_801E02B8;
extern f32 D_801E02D0;
extern char D_801E0300[];
extern char D_801E0330[];
extern char D_801E033C[];
extern char D_801E0348[];
extern char D_801E0354[];
extern f32 D_801E0384;
extern f32 D_801E0388;
extern f32 D_801E038C;
extern f32 D_801E04E0;
extern f32 D_801E04E4;
extern f32 D_801E04E8;
extern f32 D_801E04EC;
extern f32 D_801E04F0;
extern f32 D_801E04F4;
extern f32 D_801E04F8;
extern f32 D_801E04FC;
extern f32 D_801E0500;
extern f32 D_801E0504;
extern f32 D_801E0508;
extern f32 D_801E050C;
extern f32 D_801E0534;
extern f32 D_801E0538;
extern f32 D_801E05B4;
extern f32 D_801E05B8;
extern f32 D_801E05D0;
extern f32 D_801E05D4;
extern const u16 gAudioEnvironmentalSfx[];
// extern UNK_TYPE1 D_801E0BFC;
extern f32 D_801E0CEC;
extern f32 D_801E0CF0;
extern f32 D_801E0CF4;
extern f32 D_801E0CF8;
extern f32 D_801E0CFC;
extern f32 D_801E0D20;
extern f32 D_801E0D24;
extern f32 D_801E0D28;
extern f32 D_801E0D2C;
extern f32 D_801E0D30;
extern f32 D_801E0D34;
extern f64 D_801E0D58;
extern f32 D_801E0D60;
extern f32 D_801E0D64;
extern f32 D_801E0D68;
extern f32 D_801E0D8C;
extern f32 D_801E0D90;
extern f32 D_801E0D94;
extern f32 D_801E0D98;
extern f32 D_801E0D9C;
extern f32 D_801E0DBC;
extern f32 D_801E0DC0;
extern f32 D_801E0DC4;
extern f32 D_801E0DC8;
extern f32 D_801E0DCC;
extern f32 D_801E0DD0;
extern f32 D_801E0DD4;
extern f64 D_801E0DD8;
extern f64 D_801E0DE0;
extern f32 D_801E0DE8;
extern f32 D_801E0DEC;
extern f32 D_801E0DF0;
extern f32 D_801E0DF4;
extern f32 D_801E0DF8;
extern f32 D_801E0DFC;
extern f32 D_801E0E00;
extern f32 D_801E0E04;
extern f32 D_801E0E08;
extern f32 D_801E0E0C;
extern f32 D_801E0E10;
extern f32 D_801E0E14;
extern f32 D_801E0E18;
extern f32 D_801E0E1C;
extern f32 D_801E0E20;
extern f32 D_801E0E24;
extern f64 D_801E0EB0;
// extern UNK_TYPE4 D_801E1068;
extern UNK_PTR D_801E10B0;
extern const s16 gAudioTatumInit[];
extern const AudioHeapInitSizes gAudioHeapInitSizes;
// extern UNK_TYPE4 D_801E1108;
// extern UNK_TYPE4 D_801E110C;
extern u8 gSoundFontTable[];
extern u8 gSequenceFontTable[];
extern u8 gSequenceTable[];
extern u8 gSampleBankTable[];
// bss
`z_actor` with some documentation, with 1 NON_EQUIVALENTs (#401) * Match Player_GetHeight * Another bunch * Fix merge conflict * rename Gfx_DrawDListXlu * add WEEROR * Actor_Spawn * almost Actor_SpawnTransitionActors and Actor_Delete * A bunch of small actors * More renames * format * Some Player renames * a few more * import data * run formatter * func_800B7170 * whoops * Fix merge issues * Whoops 2 * func_800B83BC and func_800B83F8 * Actor_IsActorFacingPlayerAndWithinRange * add some prototypes * match Actor_UpdateBgCheckInfo * func_800B7678 * mark Actor_SpawnAsChildAndCutscene as non_matching * Actor_Draw * Update is chaotic * 2 new matches * func_800BC8B8 * Another bunch * function renames * run formatter * cleanup * remove unnecesary casts * add missing sfx * Fix renames * fix merge * func_800BF7CC * small bunch * another bunch * func_800BE184 non_matching * two more * split z_cheap_proc * Another bunch * another bunch * a few and a non matching * yeee * a * Actor_DrawAll non_equivalent * Actor_RecordUndrawnActor * i don't know what to put in this commit message * func_800B4B50 non matching * func_800B42F8 non matching * func_800B5040 * func_800B5814 non_equiv * func_800B6584 * func_800B6608 * func_800B6680 * func_800B7E04 * func_800B8118 * func_800b9170 * , * func_800BC4EC * func_800BA6FC * func_800BA798 * func_800BA8B8 * Actor_LoadOverlay * small cleanup * func_800BB2D0 * meh * func_800BBAC0 * func_800BC270 * func_800B5208 non matching * Fix warnings * meh * rename some ActorShadow_ functions * fairy * Flags_ * fix warnings * format * Actor_PickUp and family * func_800B8E58 * match Actor_RemoveFromCategory * another bit of docs * Match func_800B86C8 * And another bit * rename Player_GetRunSpeedLimit * func_800B9E84 * func_800BE63C * func_800BB8EC * match func_800B5814 * match func_800B9334 * cleanup * fix conflicts: first pass * another fix * actorfixer fix * fix conflicts * func_800BE680 non_equivalent * Improve func_800BE680 a bit * func_800BE680 equivalent (?) * func_800BE680 equivalent * Actor_UpdateActor equivalent * format * use some ExchangeItemID enum values * Some more cleaning * more cleanup * More name stealing from OoT * match func_800B82EC * match func_800B9D1C and a bit of cleanup * Add ACTOR_FLAGS placeholders * Renames and match func_800BE184 * last pass of name stealing * format * fix conflicts * more cleanup * more cleanup * cleanup and OVERLAY_RELOCATION_OFFSET macro * Remove prototypes of obviously internal-only functions, update variable names, forward declare where necessary, remove all `param_\d`s * remove newlines * minor rename * Use ACTOR_FLAGS in z_actor * Match func_800BE3D0 * Rename movement functions * Document Actor_CalcOffsetOrientedToDrawRotation * velX -> horizontalSpeed * A bit of documentation for actor movement functions * format * Fix merge issues * format * Format * Fix renames * fix warnings * fix conflicts * review :D * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Fix * format * Actor_SpawnSetupActors * engineer review * Update src/code/z_actor.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * A bunch of Engineer's reviews * more Engineer's review * a * whoops * run actorfixer * c'mon * :face_exhaling: * whoops * warning * More engineer's review * run format * I'm dumb * a * match func_800BE680 * Match Actor_DrawZTarget * Match Actor_SpawnAsChildAndCutscene, fix non-equivalent in Actor_UpdateActor * Fix merge issue * format * update actor * Steal a bit of @Thar0 documentation from OoT's z_message * Run actorfixer * Fix renames * Match func_800B4B50 thanks to @hensldm * Improve ActorShadow_DrawFeet thanks to @hensldm * whoops * Actor_PlaySfxAtProjectedPos * Actor_UpdateActor matched by @hensldm * Match func_800BA2FC by @hensldm * Match Actor_SpawnTransitionActors by @hensldm * Match func_800BB604 by @hensldm * Match Actor_DrawAll by @hensldm * ActorShadow_DrawFeet by @hensldm * Actor_UpdateAll by @hensldm * Match func_800BCCDC by @engineer124 * Small Actor_PlaySfxAtPos by @engineer124 * ACTOR_FLAGS_ALL and a bit of cleanup * Add invisible comment * Small docs pass * Fix merge * Engineer's review * format lol * Actor_DrawDoorLock docs * Actor_SpawnShieldParticlesMetal * fix merge issues * sActorFaultClient * fix * commit message * Run actorfixer.py && format.sh * Fix warnings * fixes * format * bss * Update include/functions.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Address review * Fix merge issues, format and such * fix merge issues * Add ACTORCAT_MAX * actorList -> actorLists * Fix merge issues * format * Enable WERROR on jenkinsfile * Fix merge * Use object symbols * address review * format * review * fix merge issues * fix * VRAM_PTR_SIZE, small cleanup and format * review Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2022-01-10 17:04:28 +00:00
// extern UNK_TYPE1 D_801ED894;
Play (2 NON_MATCHINGS) (#1109) * Bring over progress from another branch Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com> * cleanup, fake match Play_Init * small fixes * Some small cleanup * Match func_80165460 (from debug) * Match func_80165658 * Match func_80165DB8, func_80165DCC, func_80165DF0, func_80165E04 * Match func_80167DE4 (from debug) * Match func_80167F0C * Match func_80168DAC * Matched func_80169100 * Matched func_801691F0 * import D_801DFA18 * match Play_Main thanks to debug * cleanup * synray does it again * add docs from debug * fix func_801656A4 * more docs and cleanup * Match func_80166B30 and diff fake match in Init * import transition docs from OoT * Play Update, sort of * cleanup Play_Update * more cleanup * slightly more docs * small docs * Play_Draw WIP Thanks @petrie911 * progress? * two more matches * format * misc play docs * transitions cleanup * Motion Blur * Transitions * Fog * Bombers notebook + small cleanup * bss * Camera Functions * Picto functions * Init * MotionBlur Clean up * Floor Surface * Pictographs some more * regs * fix circular dependency problem * Cleanup PR commits outside play * namefixer * PR picto * PR audio * PR small clean ups * debug strings * Picto defines * bss * enums * remove void * typedefs * Hireso -> BombersNotebook * bss comments * bss and I8/I5 functions * Smaller PR comments * Transitions * Combine enums * Revert "Combine enums" This reverts commit 0da1ebcaed69a3ce0fbd5942460b67f80f0e15e7. * Fix Transition defines * RGBA16 macros * Unname * worldCoverAlpha * Rename Update and Draw * PR review, plus annotate bug * Clean up nonmatchings with a closer DrawGame * Format * New macros * UpdateMain and DrawMain * Fix merge * Small cleanups from PR * zFar * Intensity macros * Format * Remove bss comments * Compression/decompression * Small cleanup * Format * More PR cleanup * Cleanup picto stuff * format * Fix compression comments * Play processes state enums DONE -> READY * cutscene comment * fix bss Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: angie <angheloalf95@gmail.com>
2023-01-14 15:18:13 +00:00
extern SaveContext gSaveContext;
// extern UNK_TYPE1 D_801F4E20;
// extern UNK_TYPE1 sBeatingHeartsDDPrim;
// extern UNK_TYPE1 sBeatingHeartsDDEnv;
// extern UNK_TYPE1 sHeartsDDPrim;
// extern UNK_TYPE1 D_801F4F56;
// extern UNK_TYPE1 D_801F4F58;
// extern UNK_TYPE1 D_801F4F5A;
// extern UNK_TYPE1 D_801F4F60;
// extern UNK_TYPE1 D_801F4F66;
// extern UNK_TYPE1 D_801F4F68;
// extern UNK_TYPE1 D_801F4F6A;
// extern LightsBuffer sLightsBuffer;
`z_player_lib`: Part 2 (#938) * preparations * import data * PLAYER_STATE1 * PLAYER_STATE2 * PLAYER_STATE3 * import bss * format stuff * bss cleanup * more cleaning and some naming * face * cleaning up link human object a bit * Remove PHYSICAL_TO_VIRTUAL2 * Update src/code/z_player_lib.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * /* CAT */ Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * naming some stuff on objects * format * invert flags endian * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * format * drawmask Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * naming * another round of human object naming * enum renames * sActionModelGroups and use enum as types * PlayerAnimType * PLAYER_MODELTYPE_ * determined ranges of PlayerModelType * name PLAYER_MODELGROUP_DEFAULT * format * sheath * dlist groups placeholder namse * PLAYER_MODELGROUP_BOTTLE * Some fierce deity naming * Right hands * zora skel dlists * deku limb dlists * left hands * name most modelgroups * more hand naming * regs as dec * fix in horse * Use BUTTON_ITEM_EQUIP macro * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * reformat D_801AED58 * Sword sheaths * swords and shields * Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * playerForm on Player_DrawImpl * fomat * Update src/code/z_player_lib.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update assets/xml/objects/gameplay_keep.xml Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex)) Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * singular limb enum names * fix bss * Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * name goron shielding limbs * name limb * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * bss * bss * format * namefixer * bss * bss * bss * bss * format * bss * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * fix bss Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-10-15 22:12:01 +00:00
// extern UNK_TYPE1 sSkyboxDrawMatrix;
// extern UNK_TYPE1 D_801F6AF0;
// extern UNK_TYPE1 D_801F6AF2;
// extern UNK_TYPE4 D_801F6B00;
// extern UNK_TYPE4 D_801F6B04;
// extern UNK_TYPE4 D_801F6B08;
extern void (*sKaleidoScopeUpdateFunc)(PlayState* play);
extern void (*sKaleidoScopeDrawFunc)(PlayState* play);
Port OoT's docs for `fault.c` and `fault_drawer.c` (#1199) * fault.h * some docs stealing * fix building * fault_internal.h * pass * finish stealing docs * finish cleanup * format * warning * Update src/boot_O2_g3/fault.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/boot_O2_g3/fault.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/boot_O2_g3/fault.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * arggggg * arggggg part 2 * STACK * PHYS_TO_K0(0x400000) * format * fix * Instance * format * Neutral reset * variables.h cleanup * bss * frameBuffer * format * Update src/boot_O2_g3/fault.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/boot_O2_g3/fault.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * bss * bss * bss * callback cleanup * fix function declarations * fix again * bss * bss * Update src/overlays/actors/ovl_En_Fishing/z_en_fishing.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/boot_O2_g3/fault.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * bss * bss * Update src/boot_O2_g3/fault.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review * import bss * format * minor cleanup * bss * review * fix * bss * bss * bss * bss * bss * format * a * Z_PRIORITY_FAULT * bss * fix * idle.c bss doesn't want to get fixed :c * review * bss --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-07-08 18:41:25 +00:00
extern s32 gTransitionTileState;
Play (2 NON_MATCHINGS) (#1109) * Bring over progress from another branch Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com> * cleanup, fake match Play_Init * small fixes * Some small cleanup * Match func_80165460 (from debug) * Match func_80165658 * Match func_80165DB8, func_80165DCC, func_80165DF0, func_80165E04 * Match func_80167DE4 (from debug) * Match func_80167F0C * Match func_80168DAC * Matched func_80169100 * Matched func_801691F0 * import D_801DFA18 * match Play_Main thanks to debug * cleanup * synray does it again * add docs from debug * fix func_801656A4 * more docs and cleanup * Match func_80166B30 and diff fake match in Init * import transition docs from OoT * Play Update, sort of * cleanup Play_Update * more cleanup * slightly more docs * small docs * Play_Draw WIP Thanks @petrie911 * progress? * two more matches * format * misc play docs * transitions cleanup * Motion Blur * Transitions * Fog * Bombers notebook + small cleanup * bss * Camera Functions * Picto functions * Init * MotionBlur Clean up * Floor Surface * Pictographs some more * regs * fix circular dependency problem * Cleanup PR commits outside play * namefixer * PR picto * PR audio * PR small clean ups * debug strings * Picto defines * bss * enums * remove void * typedefs * Hireso -> BombersNotebook * bss comments * bss and I8/I5 functions * Smaller PR comments * Transitions * Combine enums * Revert "Combine enums" This reverts commit 0da1ebcaed69a3ce0fbd5942460b67f80f0e15e7. * Fix Transition defines * RGBA16 macros * Unname * worldCoverAlpha * Rename Update and Draw * PR review, plus annotate bug * Clean up nonmatchings with a closer DrawGame * Format * New macros * UpdateMain and DrawMain * Fix merge * Small cleanups from PR * zFar * Intensity macros * Format * Remove bss comments * Compression/decompression * Small cleanup * Format * More PR cleanup * Cleanup picto stuff * format * Fix compression comments * Play processes state enums DONE -> READY * cutscene comment * fix bss Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: angie <angheloalf95@gmail.com>
2023-01-14 15:18:13 +00:00
extern Color_RGBA8_u32 gVisMonoColor;
extern GfxMasterList* gGfxMasterDL;
extern u64* gAudioSPDataPtr;
extern u32 gAudioSPDataSize;
Port OoT's docs for `fault.c` and `fault_drawer.c` (#1199) * fault.h * some docs stealing * fix building * fault_internal.h * pass * finish stealing docs * finish cleanup * format * warning * Update src/boot_O2_g3/fault.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/boot_O2_g3/fault.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/boot_O2_g3/fault.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * arggggg * arggggg part 2 * STACK * PHYS_TO_K0(0x400000) * format * fix * Instance * format * Neutral reset * variables.h cleanup * bss * frameBuffer * format * Update src/boot_O2_g3/fault.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/boot_O2_g3/fault.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * bss * bss * bss * callback cleanup * fix function declarations * fix again * bss * bss * Update src/overlays/actors/ovl_En_Fishing/z_en_fishing.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/boot_O2_g3/fault.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * bss * bss * Update src/boot_O2_g3/fault.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review * import bss * format * minor cleanup * bss * review * fix * bss * bss * bss * bss * bss * format * a * Z_PRIORITY_FAULT * bss * fix * idle.c bss doesn't want to get fixed :c * review * bss --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-07-08 18:41:25 +00:00
extern MtxF* sMatrixStack;
extern MtxF* sCurrentMatrix;
extern s32 D_801FD120;
// extern UNK_TYPE1 D_801FD140;
// extern UNK_TYPE1 D_801FD158;
// extern UNK_TYPE1 D_801FD198;
// extern UNK_TYPE1 D_801FD1E0;
// extern UNK_TYPE1 D_801FD1F0;
// extern UNK_TYPE1 D_801FD250;
// extern UNK_TYPE1 D_801FD254;
// extern UNK_TYPE1 D_801FD258;
// extern UNK_TYPE1 D_801FD25C;
// extern UNK_TYPE1 D_801FD260;
// extern UNK_TYPE1 D_801FD264;
// extern UNK_TYPE1 D_801FD268;
// extern UNK_TYPE1 D_801FD278;
// extern UNK_TYPE1 D_801FD288;
// extern UNK_TYPE1 D_801FD28C;
// extern UNK_TYPE1 D_801FD28D;
// extern UNK_TYPE1 D_801FD28E;
// extern UNK_TYPE1 D_801FD28F;
// extern UNK_TYPE1 D_801FD290;
// extern UNK_TYPE1 D_801FD291;
// extern UNK_TYPE1 D_801FD294;
// extern UNK_TYPE1 D_801FD298;
// extern UNK_TYPE1 D_801FD29C;
// extern UNK_TYPE1 D_801FD2A0;
// extern UNK_TYPE1 D_801FD2A8;
// extern UNK_TYPE1 sRomaniSingingTimer;
// extern UNK_TYPE1 sRomaniSingingDisabled;
// extern UNK_TYPE1 D_801FD3AA;
// extern UNK_TYPE1 D_801FD3AB;
// extern UNK_TYPE1 D_801FD3AC;
// extern UNK_TYPE1 D_801FD3AE;
// extern UNK_TYPE1 D_801FD3AF;
// extern UNK_TYPE1 D_801FD3B0;
// extern UNK_TYPE1 D_801FD3B4;
// extern UNK_TYPE1 D_801FD3B7;
// extern UNK_TYPE1 D_801FD3B8;
// extern UNK_TYPE1 D_801FD3D8;
// extern UNK_TYPE1 D_801FD3D9;
// extern UNK_TYPE1 D_801FD3DA;
// extern UNK_TYPE1 D_801FD3E0;
// extern UNK_TYPE1 D_801FD3EC;
// extern UNK_TYPE1 D_801FD3F0;
// extern UNK_TYPE1 D_801FD3FC;
// extern UNK_TYPE1 D_801FD400;
// extern UNK_TYPE1 D_801FD404;
// extern UNK_TYPE1 D_801FD408;
// extern UNK_TYPE1 D_801FD40C;
// extern UNK_TYPE1 D_801FD410;
// extern UNK_TYPE1 D_801FD420;
// extern UNK_TYPE1 D_801FD42C;
// extern UNK_TYPE1 D_801FD430;
// extern UNK_TYPE1 D_801FD431;
// extern UNK_TYPE1 D_801FD432;
// extern UNK_TYPE1 D_801FD433;
// extern UNK_TYPE1 D_801FD434;
// extern UNK_TYPE1 D_801FD435;
// extern UNK_TYPE1 D_801FD436;
// extern UNK_TYPE1 sPrevAmbienceSeqId;
// extern UNK_TYPE1 D_801FD43A;
// extern UNK_TYPE1 D_801FD43B;
// extern UNK_TYPE1 D_801FD43E;
// extern UNK_TYPE1 D_801FD442;
// extern UNK_TYPE1 D_801FD448;
// extern UNK_TYPE1 D_801FD44C;
// extern UNK_TYPE1 D_801FD44D;
// extern UNK_TYPE1 D_801FD450;
// extern UNK_TYPE1 D_801FD454;
// extern UNK_TYPE1 D_801FD458;
// extern UNK_TYPE1 D_801FD45C;
// extern UNK_TYPE1 D_801FD460;
// extern UNK_TYPE1 D_801FD461;
// extern UNK_TYPE1 D_801FD462;
// extern UNK_TYPE1 D_801FD463;
// extern UNK_TYPE1 D_801FD464;
// extern UNK_TYPE1 D_801FD468;
// extern UNK_TYPE1 D_801FD46C;
// extern UNK_TYPE1 D_801FD470;
// extern UNK_TYPE1 D_801FD4A0;
// extern UNK_TYPE1 D_801FD4D0;
// extern UNK_TYPE1 D_801FD500;
// extern UNK_TYPE1 D_801FD518;
// extern UNK_TYPE1 D_801FD530;
// extern UNK_TYPE1 D_801FD533;
// extern UNK_TYPE1 D_801FD590;
// extern UNK_TYPE1 D_801FD598;
// extern UNK_TYPE1 D_801FD5A0;
// extern UNK_TYPE1 D_801FD5A4;
// extern UNK_TYPE1 D_801FD5C4;
// extern UNK_TYPE1 D_801FD5C8;
// extern UNK_TYPE1 D_801FD5E8;
2021-11-12 02:25:34 +00:00
extern u8 sVoiceMaskPattern[];
// extern UNK_TYPE1 D_801FD610;
extern ActiveSfx gActiveSfx[7][3];
extern SeqRequest sSeqRequests[][5];
extern u8 sNumSeqRequests[5];
2024-03-01 15:27:52 +00:00
extern u32 sAudioSeqCmds[0x100];
extern ActiveSequence gActiveSeqs[];
extern u8 sResetAudioHeapTimer;
extern u16 sResetAudioHeapFadeReverbVolume;
extern u16 sResetAudioHeapFadeReverbVolumeStep;
2022-10-13 20:17:27 +00:00
extern AudioContext gAudioCtx; // at 0x80200C70
extern AudioCustomUpdateFunction gAudioCustomUpdateFunction;
extern AudioCustomSeqFunction gAudioCustomSeqFunction;
extern AudioCustomReverbFunction gAudioCustomReverbFunction;
extern AudioCustomSynthFunction gAudioCustomSynthFunction;
2018-10-26 02:29:41 +00:00
Overhaul the build system (#234) * wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-08-04 03:21:31 +00:00
// other segments
extern GfxMasterList D_0E000000;
extern Mtx D_01000000;
extern u16 D_0F000000[];
Overhaul the build system (#234) * wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-08-04 03:21:31 +00:00
2024-01-06 05:33:13 +00:00
// #region 2S2H [General]
extern PlayState* gPlayState;
extern GameState* gGameState;
2024-01-06 05:33:13 +00:00
// #endregion
#ifdef __cplusplus
};
#endif
Overhaul the build system (#234) * wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-08-04 03:21:31 +00:00
#endif