Merge function names and known labels from Q-Gears_reverse to batini

config/sym_ovl_export.us.txt

@@ -1,24 +1,24 @@
-func_801B0050 = 0x801b0050;
-func_801B0490 = 0x801b0490;
-func_801B0668 = 0x801b0668;
-func_801B085C = 0x801b085c;
-func_801B08C0 = 0x801b08c0;
-func_801B0F08 = 0x801b0f08;
-func_801B1120 = 0x801b1120;
-func_801B11BC = 0x801b11bc;
-func_801B137C = 0x801b137c;
-func_801B13DC = 0x801b13dc;
-func_801B14E8 = 0x801b14e8;
-func_801B1530 = 0x801b1530;
-func_801B1598 = 0x801b1598;
-func_801B1734 = 0x801b1734;
-func_801B18F8 = 0x801b18f8;
-func_801B19AC = 0x801b19ac;
-func_801B1CB0 = 0x801b1cb0;
-func_801B1E0C = 0x801b1e0c;
-func_801B2308 = 0x801b2308;
-func_801B2738 = 0x801b2738;
-func_801B2770 = 0x801b2770;
+BattleInitMain = 0x801b0050;
+BattleInitSetup = 0x801b0490;
+BattleInitATBTimers = 0x801b0668;
+BattleInitSetSpeed = 0x801b085c;
+BattleInitPlayer = 0x801b08c0;
+BattleInitPartyFromSavemap = 0x801b0f08;
+BattleInitPartyScripts = 0x801b1120;
+BattleInitCharCmdMenu = 0x801b11bc;
+BattleInitResetExtraCmds = 0x801b137c;
+BattleResolveMateriaSlots = 0x801b13dc;
+BattleGetMateriaValue = 0x801b14e8;
+BattleGetEquipMateriaVal = 0x801b1530;
+BattleInitApplyAccStatus = 0x801b1598;
+BattleInitApplyStartFX = 0x801b1734;
+BattleInitCharStats = 0x801b18f8;
+BattleInitFormation = 0x801b19ac;
+BattleInitItemList = 0x801b1cb0;
+BattleInitEnemyUnits = 0x801b1e0c;
+BattleInitEnemyAI = 0x801b2308;
+BattleGetScenePackId = 0x801b2738;
+BattleBoostVal25Percent = 0x801b2770;
 func_801B0000 = 0x801b0000;
 CommitBattleResults = 0x801b09c0;
 GiveMateriaAp = 0x801b0c74;
@@ -74,7 +74,7 @@ func_800A3ED0 = 0x800a3ed0;
 func_800A4350 = 0x800a4350;
 func_800A4480 = 0x800a4480;
 func_800A44D8 = 0x800a44d8;
-func_800A4540 = 0x800a4540;
+BattleUpdateUnitMasks = 0x800a4540;
 func_800A4844 = 0x800a4844;
 BATTLE_RunToResultScreen = 0x800a4860;
 BATTLE_RunEscapeSequence = 0x800a4954;
@@ -83,7 +83,7 @@ func_800A4ACC = 0x800a4acc;
 func_800A4AF4 = 0x800a4af4;
 func_800A4B3C = 0x800a4b3c;
 func_800A4B9C = 0x800a4b9c;
-func_800A4BA4 = 0x800a4ba4;
+BattleInitCharCmdState = 0x800a4ba4;
 func_800A4CA8 = 0x800a4ca8;
 func_800A4CC8 = 0x800a4cc8;
 func_800A4D2C = 0x800a4d2c;
@@ -109,7 +109,7 @@ func_800A5AC8 = 0x800a5ac8;
 func_800A5BC8 = 0x800a5bc8;
 BATTLE_ExpandScriptToBuffer = 0x800a5eb0;
 func_800A5FB0 = 0x800a5fb0;
-func_800A6000 = 0x800a6000;
+BattleRunUnitScript = 0x800a6000;
 func_800A61D4 = 0x800a61d4;
 func_800A6278 = 0x800a6278;
 func_800A64A0 = 0x800a64a0;
@@ -151,7 +151,7 @@ func_800A7130 = 0x800a7130;
 func_800A71E0 = 0x800a71e0;
 func_800A71E8 = 0x800a71e8;
 func_800A71F4 = 0x800a71f4;
-func_800A7254 = 0x800a7254;
+BattleQueueEvent = 0x800a7254;
 func_800A72C8 = 0x800a72c8;
 BATTLE_ResolveMagicActionIndex = 0x800a73c0;
 BATTLE_ResolveSummonActionIndex = 0x800a73d8;
@@ -249,7 +249,7 @@ func_800AE42C = 0x800ae42c;
 func_800AE6C0 = 0x800ae6c0;
 func_800AE764 = 0x800ae764;
 func_800AE82C = 0x800ae82c;
-func_800AE954 = 0x800ae954;
+BattleRecalcUnitSpeed = 0x800ae954;
 func_800AEB20 = 0x800aeb20;
 func_800AEB80 = 0x800aeb80;
 func_800AEBF0 = 0x800aebf0;
@@ -286,7 +286,7 @@ func_800B0EB4 = 0x800b0eb4;
 func_800B0F04 = 0x800b0f04;
 func_800B0FFC = 0x800b0ffc;
 func_800B1060 = 0x800b1060;
-func_800B108C = 0x800b108c;
+BattleInitUnitAction = 0x800b108c;
 BATTLE_QueueEffect = 0x800b10f0;
 func_800B1218 = 0x800b1218;
 func_800B1268 = 0x800b1268;
@@ -308,7 +308,7 @@ func_800B2C60 = 0x800b2c60;
 func_800B2CFC = 0x800b2cfc;
 BATTLE_GetAttackData = 0x800b2ebc;
 func_800B2F30 = 0x800b2f30;
-func_800B2F50 = 0x800b2f50;
+BattleGetRndU16 = 0x800b2f50;
 func_800B3030 = 0x800b3030;
 func_800B30E4 = 0x800b30e4;
 func_800B33A4 = 0x800b33a4;
@@ -890,7 +890,19 @@ D_800F5B73 = 0x800f5b73;
 D_800F5B74 = 0x800f5b74;
 g_CombatantTurnState = 0x800f5bb8;
 D_800F5C84 = 0x800f5c84;
-D_800F5E60 = 0x800f5e60;
+g_BattlePartyWork = 0x800f5e60;
+D_800F5E64 = 0x800f5e64;
+D_800F5E65 = 0x800f5e65;
+D_800F5E66 = 0x800f5e66;
+D_800F5E67 = 0x800f5e67;
+D_800F5E68 = 0x800f5e68;
+D_800F5E6A = 0x800f5e6a;
+D_800F5E6C = 0x800f5e6c;
+D_800F5E70 = 0x800f5e70;
+D_800F5E72 = 0x800f5e72;
+D_800F5E74 = 0x800f5e74;
+D_800F5E76 = 0x800f5e76;
+D_800F5E78 = 0x800f5e78;
 D_800F5EFC = 0x800f5efc;
 D_800F5F01 = 0x800f5f01;
 D_800F5F44 = 0x800f5f44;
@@ -1038,7 +1050,7 @@ D_800F99F6 = 0x800f99f6;
 D_800F9D94 = 0x800f9d94;
 D_800F9D98 = 0x800f9d98;
 D_800F9D9C = 0x800f9d9c;
-D_800F9DA0 = 0x800f9da0;
+g_BattleStartFXFlags = 0x800f9da0;
 D_800F9DA4 = 0x800f9da4;
 D_800F9DA8 = 0x800f9da8;
 D_800F9DAA = 0x800f9daa;
@@ -1300,15 +1312,15 @@ D_80163608 = 0x80163608;
 D_8016360C = 0x8016360c;
 D_801636B8 = 0x801636b8;
 D_80163758 = 0x80163758;
-D_8016375A = 0x8016375a;
+g_BattleUnitPresentMask = 0x8016375a;
 D_8016375C = 0x8016375c;
 D_8016375E = 0x8016375e;
 D_80163762 = 0x80163762;
 D_80163766 = 0x80163766;
 D_80163768 = 0x80163768;
 D_8016376A = 0x8016376a;
-D_8016376C = 0x8016376c;
-D_8016376E = 0x8016376e;
+g_IsMutiBattle = 0x8016376c;
+g_CharacterMask = 0x8016376e;
 D_80163770 = 0x80163770;
 D_80163772 = 0x80163772;
 D_80163774 = 0x80163774;

config/symbols.batini.txt

@@ -1 +1,24 @@
+BattleBoostVal25Percent = 0x001B2770;
 g_BattleState = 0x800F83AC; // size:0x444
+g_BattleTypeMap = 0x801B0044;
+BattleInitMain = 0x801B0050;
+BattleInitSetup = 0x801B0490;
+BattleInitATBTimers = 0x801B0668;
+BattleInitSetSpeed = 0x801B085C;
+BattleInitPlayer = 0x801B08C0;
+BattleInitPartyFromSavemap = 0x801B0F08;
+BattleInitPartyScripts = 0x801B1120;
+BattleInitCharCmdMenu = 0x801B11BC;
+BattleInitResetExtraCmds = 0x801B137C;
+BattleResolveMateriaSlots = 0x801B13DC;
+BattleGetMateriaValue = 0x801B14E8;
+BattleGetEquipMateriaVal = 0x801B1530;
+BattleInitApplyAccStatus = 0x801B1598;
+BattleInitApplyStartFX = 0x801B1734;
+BattleInitCharStats = 0x801B18F8;
+BattleInitFormation = 0x801B19AC;
+BattleInitItemList = 0x801B1CB0;
+BattleInitEnemyUnits = 0x801B1E0C;
+BattleInitEnemyAI = 0x801B2308;
+BattleInitLoadSceneData = 0x801B23E0;
+BattleGetScenePackId = 0x801B2738;

config/symbols.battle.txt

@@ -3,13 +3,17 @@ BATTLE_SetFocusedActor = 0x800A22C0;
 BATTLE_CheckAllLucky7s = 0x800A2894;
 BATTLE_DropSupersededQueuedActions = 0x800A304C;
 BATTLE_RunFrame = 0x800A3354;
+BattleUpdateUnitMasks = 0x800A4540;
 BATTLE_RunToResultScreen = 0x800A4860;
 BATTLE_RunEscapeSequence = 0x800A4954;
+BattleInitCharCmdState = 0x800A4BA4;
 BATTLE_PickRandomThrowItem = 0x800A5990;
 BATTLE_ExpandScriptToBuffer = 0x800A5EB0;
+BattleRunUnitScript = 0x800A6000;
 BATTLE_ClearStatusBit = 0x800A6CC0;
 BATTLE_ExpireDeathSentence = 0x800A6D10;
 BATTLE_TickPoison = 0x800A6D88;
+BattleQueueEvent = 0x800A7254;
 BATTLE_ResolveMagicActionIndex = 0x800A73C0;
 BATTLE_ResolveSummonActionIndex = 0x800A73D8;
 BATTLE_SetupThrowAction = 0x800A7458;
@@ -27,17 +31,20 @@ BATTLE_ApplyDefaultAbsorbEffect = 0x800AD420;
 BATTLE_ApplySadnessReduction = 0x800AD890;
 BATTLE_ApplyKillCountBonus = 0x800AE318;
 BATTLE_CalcMateriaSlotScore = 0x800AE378;
+BattleRecalcUnitSpeed = 0x800AE954;
 BATTLE_TryApplyHitEffect = 0x800AF1D4;
 BATTLE_ApplyRegenPoisonTick = 0x800AF3AC;
 BATTLE_ClearActorSlotReferences = 0x800AF594;
 BATTLE_RollPhysicalHit = 0x800B079C;
 BATTLE_ApplyConditionalReduction = 0x800B0E5C;
+BattleInitUnitAction = 0x800B108C;
 BATTLE_QueueEffect = 0x800B10F0;
 BATTLE_InvalidateQueuedMessages = 0x800B1304;
 BATTLE_ScriptReadU16 = 0x800B1368;
 BATTLE_ScriptCompare = 0x800B1B64;
 BATTLE_ScriptCollapseVarBank = 0x800B1C94;
 BATTLE_GetAttackEntry = 0x800B2EBC;
+BattleGetRndU16 = 0x800B2F50;
 BattleEffectRegister = 0x800BBEAC;
 BATTLE_EnqueueLoadImage = 0x800D2538;
 BATTLE_FlushImageQueue = 0x800D25E8;
@@ -53,10 +60,11 @@ g_AtbBarPulseColor = 0x800F32C4; // size:0x2
 g_AtbBarPulseValue = 0x800F32C6; // size:0x2
 g_ActiveCharsHPMPInited = 0x800F32C8; // size:0x2
 g_CombatantTurnState = 0x800F5BB8; // size:0xCC
-D_800F5E60 = 0x800F5E60; // size:0x9C
+g_BattlePartyWork = 0x800F5E60;
 D_800F5F44 = 0x800F5F44; // size:0x1E88
 g_dbIndex = 0x800F8368;
 g_BattleState = 0x800F83AC; // size:0x444
+g_BattleStartFXFlags = 0x800F9DA0;
 D_800FA63C = 0x800FA63C; // size:0x38
 D_800FA6D8 = 0x800FA6D8; // size:0xA8
 D_800FA958 = 0x800FA958; // size:0x20
@@ -70,5 +78,8 @@ D_801621F0 = 0x801621F0; // size:0x780
 D_80162978 = 0x80162978; // size:0xC80
 D_8016360C = 0x8016360C; // size:0xAC
 D_801636B8 = 0x801636B8; // size:0xA0
+g_BattleUnitPresentMask = 0x8016375A;
+g_IsMutiBattle = 0x8016376C;
+g_CharacterMask = 0x8016376E;
 D_80163798 = 0x80163798; // size:0x300
 D_80163C80 = 0x80163C80; // size:0xC

config/symbols.main.us.txt

@@ -26,6 +26,7 @@ SysBattleSwirlRender = 0x800140A4;
 SysBattleSwirlInit = 0x800140F4;
 SysLoadUncompressImg = 0x80014980;
 SysLoadDrawSync = 0x800149E0;
+SysMemCopy32 = 0x80014A00;
 SysGetLsbNumber = 0x80014A38;
 SysCountActiveBits = 0x80014A58;
 SysSelectRandomBit = 0x80014A84;
@@ -34,6 +35,7 @@ SysIncSeedForRandom = 0x80014B54;
 SysGetRandomByteFromTable = 0x80014B70;
 SysGetRandomByteRange = 0x80014BA8;
 SysRandomTwoBytes = 0x80014BE4;
+SysInitRndTablePos = 0x80014C44;
 SysGetPointerToTextInKernWithBlockAndTextId = 0x80014D9C;
 SysDecompKernStringWithF9 = 0x800150E4;
 SysGetPtrToKernBattleTxtWithId = 0x800151F4;
@@ -753,6 +755,7 @@ g_ArmorTable = 0x80071E44;
 g_WeaponTable = 0x800738A0;
 g_AkaoVoiceAttr = 0x8007EBE4;
 g_AkaoVoiceAttrMask = 0x8007EBE8;
+g_KernRndTable = 0x80083084;
 g_isFieldLoading = 0x800965E8;
 g_AkaoSoundActiveMaskStored = 0x80099FDC;
 g_AkaoNoiseMask = 0x80099FEC;