diff --git a/include/variables.h b/include/variables.h index c22e529ecb..2051fff0a7 100644 --- a/include/variables.h +++ b/include/variables.h @@ -10,11 +10,36 @@ extern PlayerData gPlayerData; extern PlayerStatus gPlayerStatus; extern GameStatus* gGameStatusPtr[1]; extern StaticItem gItemTable[364]; +extern s16 gMainGameState; /* 0 = battle, 1 = pause, 2 = world */ +extern UNK_FUN_PTR(gCurrentUpdateFunction); extern ScriptInstance* gWorldScriptList[128]; extern ScriptInstance* gBattleScriptList[128]; extern ScriptInstance** gCurrentScriptListPtr[128]; +extern s32 gScriptIdList[128]; +extern s32 gScriptIndexList[128]; + +extern Model* gWorldModelList[256]; +extern Model* gBattleModelList[256]; +extern Model** gCurrentModelListPtr[256]; + +extern u32* gWorldModelSpecialDls[32]; +extern u32* gBattleModelSpecialDls[32]; +extern u32** gCurrentModelSpecialDlsPtr[32]; + +extern Entity* gWorldEntityList[30]; +extern Entity* gBattleEntityList[30]; +extern Entity** gCurrentEntityListPtr[30]; + +extern UNK_TYPE* gWorldDynamicEntityList[16]; +extern UNK_TYPE* gBattleDynamicEntityList[16]; +extern UNK_TYPE** gCurrentDynamicEntityListPtr[16]; + +extern Shadow* gWorldShadowList[60]; +extern Shadow* gBattleShadowList[60]; +extern Shadow** gCurrentShadowListPtr[60]; + extern f32 gGlobalTimeSpace; extern s8 D_800A0900; diff --git a/undefined_syms.txt b/undefined_syms.txt index e3238755fd..149ddab11e 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -10,10 +10,10 @@ gGlobalTimeSpace = 0x802D9CA8; D_80147574 = 0x80147574; gMapTransitionAlpha = 0x800A0940; -D_800E92D8 = 0x800E92D8; -D_80147474 = 0x80147474; -D_80109270 = 0x80109270; -D_80108558 = 0x80108558; +D_800E92D8 = 0x800E92D8; +D_80147474 = 0x80147474; +D_80109270 = 0x80109270; +D_80108558 = 0x80108558; D_800A0940 = 0x800A0940; D_800A0942 = 0x800A0942; D_800A0944 = 0x800A0944; @@ -76,6 +76,32 @@ gCurrentTriggerListPtr = 0x80159390; D_801595A0 = 0x801595A0; D_8015C7C0 = 0x8015C7C0; +gWorldModelList = 0x80151770; +gBattleModelList = 0x80151B70; +gCurrentModelListPtr = 0x801512CC; + +gWorldModelSpecialDls = 0x8015F90; +gBattleModelSpecialDls = 0x80152010; +gCurrentModelSpecialDlsPtr = 0x801512E8; + +gWorldEntityList = 0x80151380; +gWorldBattleEntityList = 0x801513F8; +gCurrentEntityListPtr = 0x80151470; + +gWorldShadowList = 0x80151478; +gBattleShadowList = 0x80151568; +gCurrentShadowListPtr = 0x80151658; + +gMainGameState = 0x80151700; +gCurrentUpdateFunction = 0x8015170C; + +gWorldDynamicEntityList = 0x801543A0; +gBattleDynamicEntityList = 0x801543E0; +gCurrentDynamicEntityListPtr = 0x80154420; + +gScriptIdList = 0x802D1898; +gScriptIndexList = 0x802DAA98; + func_802A91F8 = 0x802A91F8; func_802A9208 = 0x802A9208; func_802A9228 = 0x802A9228;