pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
e723afa31c
papermario/include/variables.h

211 lines
5.3 KiB
C
Raw Normal View History

headers, some decomp
2020-07-18 02:47:33 +02:00
#ifndef _VARIABLES_H_
#define _VARIABLES_H_
#include "ultra64.h"
#include "common_structs.h"
match show_coin_counter
2020-08-10 23:35:37 +02:00
#include "types.h"
lots of stuff
2020-10-13 03:28:01 +02:00
#include "macros.h"
#include enums.h in variables.h to make format script happy
2020-08-23 01:39:45 +02:00
#include "enums.h"
headers, some decomp
2020-07-18 02:47:33 +02:00
rename types (#20)
2020-08-16 05:19:00 +02:00
extern UiStatus gUIStatus;
extern PlayerData gPlayerData;
Added gPlayerActionState, gPlayerAnimation, gPlayerNpc. Modifed PlayerStatus->actionState from u8 to s8. Defined ActionState enum as s8 type. A handful more script functions matched.
2020-08-23 01:24:51 +02:00
extern ActionState gPlayerActionState;
extern PlayerAnim gPlayerAnimation;
rename types (#20)
2020-08-16 05:19:00 +02:00
extern PlayerStatus gPlayerStatus;
more
2020-09-22 05:10:53 +02:00
extern PlayerStatus* gPlayerStatusPtr;
Some more
2020-10-03 22:04:49 +02:00
extern CollisionStatus gCollisionStatus;
rename types (#20)
2020-08-16 05:19:00 +02:00
extern GameStatus* gGameStatusPtr[1];
PR suggestions, game status macro
2020-09-14 01:03:22 +02:00
extern s32 gRandSeed;
use StaticX for static table entry structs Change prompted by Clover.
2020-08-16 16:19:33 +02:00
extern StaticItem gItemTable[364];
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
extern s16 gMainGameState; /* 0 = battle, 1 = pause, 2 = world */
extern UNK_FUN_PTR(gCurrentUpdateFunction);
more refinements on script list stuff
2020-08-14 16:25:33 +02:00
:cat:
2020-10-16 22:29:55 +02:00
extern s32 gBattleState;
Sounds and flags
2020-09-22 02:56:17 +02:00
extern BattleStatus gBattleStatus;
:stars:
2020-10-17 05:47:10 +02:00
extern s32 gBattleDmaDest;
Sounds and flags
2020-09-22 02:56:17 +02:00
lots of stuff
2020-10-13 03:28:01 +02:00
extern ScriptList gWorldScriptList;
extern ScriptList gBattleScriptList;
extern ScriptList* gCurrentScriptListPtr;
more refinements on script list stuff
2020-08-14 16:25:33 +02:00
big update
2020-09-18 22:57:52 +02:00
extern s32 gNumScripts;
extern s32 D_802DAC98;
more refinements on script list stuff
2020-08-14 16:25:33 +02:00
PR fixes
2020-09-08 15:06:17 +02:00
extern s32 gScriptListCount;
Various funcs
2020-09-06 17:53:48 +02:00
lots of stuff
2020-10-13 03:28:01 +02:00
extern s32 gScriptIdList[MAX_SCRIPTS];
extern s32 gScriptIndexList[MAX_SCRIPTS];
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
fixing extern
2020-10-17 23:48:43 +02:00
extern s32 gMoveScriptTable[][4];
hey rain
2020-10-16 08:09:20 +02:00
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern ModelList gWorldModelList;
extern ModelList gBattleModelList;
extern ModelList* gCurrentModelListPtr;
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
// TODO: potentially a display list, figure this out
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
extern u32* gWorldModelSpecialDls[32];
extern u32* gBattleModelSpecialDls[32];
extern u32** gCurrentModelSpecialDlsPtr[32];
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern EntityList gWorldEntityList;
extern EntityList gBattleEntityList;
extern EntityList* gCurrentEntityListPtr;
Many more functions decomped
2020-10-08 21:03:58 +02:00
extern s32 gLastCreatedEntityIndex;
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern DynamicEntityList gWorldDynamicEntityList;
extern DynamicEntityList gBattleDynamicEntityList;
extern DynamicEntityList* gCurrentDynamicEntityListPtr;
ASM macro fix, decomp of many
2020-09-25 23:18:09 +02:00
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern NpcList gWorldNpcList;
extern NpcList gBattleNpcList;
extern NpcList* gCurrentNpcListPtr;
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern ShadowList gWorldShadowList;
extern ShadowList gBattleShadowList;
extern ShadowList* gCurrentShadowListPtr;
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
Fixing changes for PR: npcPtr to npc, spacing on if, removed else block in EnableNpcShadow that wasn't needed
2020-08-20 00:48:15 +02:00
extern Camera gCameras[4];
Various funcs
2020-09-06 17:53:48 +02:00
extern s32 gCurrentCameraID;
Fixing changes for PR: npcPtr to npc, spacing on if, removed else block in EnableNpcShadow that wasn't needed
2020-08-20 00:48:15 +02:00
Remember to hit ctrl+s on documents. It's important.
2020-08-24 03:40:11 +02:00
extern Npc* gPlayerNpcPtr;
Added gPlayerActionState, gPlayerAnimation, gPlayerNpc. Modifed PlayerStatus->actionState from u8 to s8. Defined ActionState enum as s8 type. A handful more script functions matched.
2020-08-23 01:24:51 +02:00
match functions in ebd0_len_6a0 & code_dc470_len_14c0
2020-08-12 20:48:51 +02:00
extern s8 D_800A0900;
Various funcs
2020-09-06 17:53:48 +02:00
extern EncounterStatus gCurrentEncounter;
more goods
2020-09-27 03:02:29 +02:00
extern s16 D_80151308;
extern s32 D_80151310;
headers, some decomp
2020-07-18 02:47:33 +02:00
extern s16* D_80151328;
match clear_player_data
2020-08-09 06:20:53 +02:00
extern s16 D_8010CD10;
extern s16 D_8010CD12;
ASM macro fix, decomp of many
2020-09-25 23:18:09 +02:00
extern s32 D_8010CD20;
more
2020-09-26 04:49:59 +02:00
extern s32 D_8010EF08;
ASM macro fix, decomp of many
2020-09-25 23:18:09 +02:00
extern s32 D_8010F094; // player shadow index?
match functions in ebd0_len_6a0 & code_dc470_len_14c0
2020-08-12 20:48:51 +02:00
extern s32 D_801595A0;
rename types (#20)
2020-08-16 05:19:00 +02:00
extern BackgroundHeader gBackgroundImage;
headers, some decomp
2020-07-18 02:47:33 +02:00
rename types (#20)
2020-08-16 05:19:00 +02:00
extern PrintContext* gCurrentPrintContext;
More decomp + coverage fix
2020-09-26 03:51:54 +02:00
extern s32 D_802DB264;
rename types (#20)
2020-08-16 05:19:00 +02:00
extern PrintContext* D_802DB268;
Match CloseChoice, CancelMessage, CancelMessageAndBlock. Added gCurrentPrintContext and D_802DB268 (related)
2020-08-15 23:51:44 +02:00
SetNpcFlagBits
2020-11-08 05:33:15 +01:00
// Animation related
ASM update and types
2020-11-08 21:40:26 +01:00
extern AnimatedMeshList* gCurrentAnimMeshListPtr;
SetNpcFlagBits
2020-11-08 05:33:15 +01:00
extern PartnerAnimations gPartnerAnimations[12];
ASM update and types
2020-11-08 21:40:26 +01:00
extern AnimatedModelList gBattleMeshAnimationList;
extern AnimatedModelList gWorldMeshAnimationList;
extern AnimatedModelList* gCurrentMeshAnimationListPtr;
SetNpcFlagBits
2020-11-08 05:33:15 +01:00
Cleanup, starting trigger functions
2020-08-13 07:03:47 +02:00
// Triggers
resolve clang-tidy errors
2020-08-19 02:23:52 +02:00
extern s16 gTriggerCount;
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern TriggerList gTriggerList1;
extern TriggerList gTriggerList2;
extern TriggerList* gCurrentTriggerListPtr;
Cleanup, starting trigger functions
2020-08-13 07:03:47 +02:00
near-match begin_state_intro
2020-10-15 00:22:43 +02:00
// Map transition data. Should probably be a struct
Added item_entity struct and related stuff. More matching functions
2020-08-12 03:59:46 +02:00
extern u16 gMapTransitionAlpha;
near-match begin_state_intro
2020-10-15 00:22:43 +02:00
extern s16 D_800A0942;
Added symbols and restructured game_status a little bit
2020-08-11 01:20:30 +02:00
extern s16 D_800A0944;
Various decomp
2020-11-06 01:30:17 +01:00
extern s16 D_800A0946;
extern s16 D_800A0948;
near-match begin_state_intro
2020-10-15 00:22:43 +02:00
extern s16 D_800A0954;
extern s16 D_800A0956;
extern s16 D_800A0958;
extern s16 D_800A095A;
extern u8 D_800A095B;
extern s16 D_800A095C;
extern u8 D_800A095D;
extern s16 D_800A095E;
extern u8 D_800A095F;
extern s32 D_800A0960;
extern s32 D_800A0964;
A handful of script functions. Commented out ones that aren't fully matching yet
2020-08-11 23:38:21 +02:00
Some shtuff
2020-10-16 00:11:56 +02:00
// Pause
asm update
2020-11-10 17:27:02 +01:00
extern s32 gPauseMenuHeldButtons;
extern s32 gPauseMenuPressedButtons;
extern s32 gPauseMenuCurrentDescString;
extern Bytecode* gPauseMenuCurrentDescIconScript;
extern s8 gPauseMenuCurrentTab;
extern s32 gPauseMenuCommonIconIDs[8];
more syms, file split
2020-11-10 16:11:43 +01:00
extern s32 gPauseMenuTabIconIDs[6];
some pause stuff
2020-11-10 05:23:01 +01:00
extern PauseItemPage gItemMenuPages[20];
treats
2020-10-16 04:05:04 +02:00
extern s32 gPauseMenuStrings[348];
more syms, file split
2020-11-10 16:11:43 +01:00
extern s32 gPauseMenuIconScripts[8];
extern MenuTab* gPauseMenuTabs[7];
more progress
2020-11-10 20:43:24 +01:00
extern s32 gPauseMenuCursorPosX;
extern s32 gPauseMenuCursorPosY;
more syms, file split
2020-11-10 16:11:43 +01:00
extern s32 gPauseMenuCursorOpacity;
more progress
2020-11-10 20:43:24 +01:00
extern s32 gPauseMenuTargetPosX;
extern s32 gPauseMenuTargetPosY;
random progress
2020-11-10 04:48:47 +01:00
extern s32 gPauseMenuCursorTargetOpacity;
asm update
2020-11-10 17:27:02 +01:00
extern u8 gPauseMenuTextScrollInterpEasingLUT[16];
extern u8 gPauseMenuPageScrollInterpEasingLUT[16];
Some shtuff
2020-10-16 00:11:56 +02:00
some pause stuff
2020-11-10 05:23:01 +01:00
// Badges
extern PauseItemPage gBadgeMenuPages[20];
extern s32 gBadgeMenuCurrentScrollPos;
extern s32 gBadgeMenuTargetScrollPos;
more syms
2020-11-10 06:08:44 +01:00
extern ItemId gBadgeMenuItemIDs[128];
extern s32 gBadgeMenuCurrentPage;
// Stats
extern s32 gStatsMenuIconIDs[12];
some pause stuff
2020-11-10 05:23:01 +01:00
Various funcs
2020-09-06 17:53:48 +02:00
extern s32 gGameState;
Handful of new functions matched. Added items enum, other misc changes
2020-08-12 22:53:01 +02:00
extern s32 D_8009A650[1];
match func_80028838
2020-10-14 18:11:59 +02:00
extern u16 D_8009A6A0;
extern u16 D_8009A6A2;
extern u16 D_8009A6A4;
extern u16 D_8009A6A6;
Handful of new functions matched. Added items enum, other misc changes
2020-08-12 22:53:01 +02:00
A handful of script functions. Commented out ones that aren't fully matching yet
2020-08-11 23:38:21 +02:00
extern s16 gCurrentDoorSoundsSet;
saving for later
2020-10-02 08:07:54 +02:00
extern s32 D_800D9620;
match show_coin_counter
2020-08-10 23:35:37 +02:00
extern UNK_TYPE D_800E92D8;
extern UNK_TYPE D_80147474;
match all of code_dd930_len_lc0, add commented mostly matching code for update_coin_counter
2020-08-12 03:01:33 +02:00
extern UNK_TYPE D_80147574;
match show_coin_counter
2020-08-10 23:35:37 +02:00
extern UNK_TYPE D_80109270;
extern UNK_TYPE D_80108558;
wip: set_action_state
2020-08-20 20:43:45 +02:00
extern UNK_TYPE D_8010F250; // play_sound state struct?
Some more
2020-10-03 22:04:49 +02:00
extern s8 D_8010EBB0[];
match show_coin_counter
2020-08-10 23:35:37 +02:00
Some shtuff
2020-10-16 00:11:56 +02:00
// Effects
extern EffectTableEntry gEffectTable[135];
hi
2020-09-18 22:48:52 +02:00
//nusys
extern OSPiHandle* carthandle;
byte/flag stuff
2020-09-19 17:16:02 +02:00
extern SaveData gCurrentSaveFile;
more goods
2020-09-27 03:02:29 +02:00
extern s32 D_802D9CA4;
byte/flag stuff
2020-09-19 17:16:02 +02:00
extern u32* gMapFlags;
extern u32* gMapVars;
more goods
2020-09-27 03:02:29 +02:00
extern f32 D_80286540;
byte/flag stuff
2020-09-19 17:16:02 +02:00
Some stuff
2020-10-14 03:55:04 +02:00
extern u32 gWorldMapVars[MAX_MAPVARS];
extern u32 gBattleMapVars[MAX_MAPVARS];
extern u32 gWorldMapFlags[MAX_MAPFLAGS];
extern u32 gBattleMapFlags[MAX_MAPFLAGS];
extern s32 D_8009A5D8;
near-match begin_state_intro
2020-10-15 00:22:43 +02:00
extern u8 D_800779B0;
extern u8 D_800A0963;
Many more functions decomped
2020-10-08 21:03:58 +02:00
// Scripts
extern Bytecode* SCRIPT_NpcDefeat;
Some decomp, tons of cleanup
2020-10-24 23:51:27 +02:00
extern Bytecode* ShakeCam1;
extern Bytecode* ShakeCamX;
:dog:
2020-10-29 21:58:34 +01:00
extern Bytecode* D_802D9D50;
Many more functions decomped
2020-10-08 21:03:58 +02:00
match func_8014AA54
2020-10-29 03:54:01 +01:00
extern s16 gMusicUnkVolume;
match many small funcs, rename symbols
2020-10-29 04:43:58 +01:00
extern s16 gMusicUnkVolume2;
match func_8014AA54
2020-10-29 03:54:01 +01:00
extern s16 gMusicCurrentVolume;
extern s16 gMusicTargetVolume;
badly match func_8014A498
2020-10-30 00:52:24 +01:00
extern MusicPlayer gMusicPlayers[4];
extern MusicPlayer D_8014F6F0;
match set_music_track rewrite flag as NOT clean up set_music_track temps
2020-10-29 02:05:40 +01:00
headers, some decomp
2020-07-18 02:47:33 +02:00
#endif
Reference in New Issue Copy Permalink