From dcb1d78fa9e82d65d13d8131a95a4b8ac99bd168 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 16:20:39 +0100 Subject: [PATCH] Add battle controllers var to src from sym_ewram --- include/battle_controllers.h | 1 + src/battle_controller_link_opponent.c | 1 - src/battle_controller_link_partner.c | 2 - src/battle_controller_opponent.c | 1 - src/battle_controller_player.c | 1 - src/battle_controller_player_partner.c | 5 +- src/battle_controller_recorded_opponent.c | 4 +- src/battle_controller_recorded_player.c | 4 -- src/battle_controller_wally.c | 3 - src/battle_controllers.c | 68 +++++++++++------------ src/rom_8034C54.c | 5 +- sym_ewram.txt | 18 +----- 12 files changed, 41 insertions(+), 72 deletions(-) diff --git a/include/battle_controllers.h b/include/battle_controllers.h index ff5a629af5..9449f19865 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -175,6 +175,7 @@ enum CONTROLLER_CMDS_COUNT }; +extern struct UnusedControllerStruct gUnknown_02022D0C; // general functions void HandleLinkBattleSetup(void); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 0cec046e47..36f749061b 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -27,7 +27,6 @@ #include "constants/trainers.h" extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 04a3784da8..0cd15f39e8 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -26,8 +26,6 @@ #include "constants/songs.h" #include "constants/trainers.h" -extern struct UnusedControllerStruct gUnknown_02022D0C; - extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 403cc5eed8..c057e85755 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -34,7 +34,6 @@ #include "constants/trainers.h" extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 49629198ce..2bd5ef365c 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -37,7 +37,6 @@ extern u8 gUnknown_0203CEE8; extern u8 gUnknown_0203CEE9; extern u8 gUnknown_0203CF00[]; -extern struct UnusedControllerStruct gUnknown_02022D0C; extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index bd892c9225..02dd1383bf 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -6,6 +6,7 @@ #include "battle_message.h" #include "battle_interface.h" #include "battle_setup.h" +#include "battle_tower.h" #include "bg.h" #include "data2.h" #include "item_use.h" @@ -26,15 +27,11 @@ #include "constants/songs.h" #include "constants/trainers.h" -extern struct UnusedControllerStruct gUnknown_02022D0C; - extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_81358F4(void); extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void SetMultiuseSpriteTemplateToPokemon(u16, u8); -extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions static void PlayerPartnerHandleGetMonData(void); diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index b54e612557..0cf3634dc1 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -6,6 +6,7 @@ #include "battle_interface.h" #include "battle_message.h" #include "battle_setup.h" +#include "battle_tower.h" #include "battle_tv.h" #include "bg.h" #include "data2.h" @@ -29,14 +30,11 @@ #include "constants/trainers.h" extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct UnusedControllerStruct gUnknown_02022D0C; -extern u8 gUnknown_0203C7B4; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern u16 sub_8068B48(void); -extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions static void RecordedOpponentHandleGetMonData(void); diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 17b115caa5..4d7fdc01e8 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -25,16 +25,12 @@ #include "constants/battle_anim.h" #include "constants/songs.h" -extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT]; -extern u8 gUnknown_0203C7B4; extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions static void RecordedPlayerHandleGetMonData(void); diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 1a3a2d53df..5d87c4f905 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -31,9 +31,6 @@ #include "constants/songs.h" #include "constants/trainers.h" -extern s32 gUnknown_0203CD70; -extern struct UnusedControllerStruct gUnknown_02022D0C; - extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 1c6942eade..a6d6e92943 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -13,10 +13,10 @@ #include "constants/abilities.h" #include "constants/species.h" -extern u8 gUnknown_02022D08; -extern u8 gUnknown_02022D09; -extern u8 gUnknown_02022D0A; - +static EWRAM_DATA u8 sLinkSendTaskId = 0; +static EWRAM_DATA u8 sLinkReceiveTaskId = 0; +static EWRAM_DATA u8 sUnknown_02022D0A = 0; +EWRAM_DATA struct UnusedControllerStruct gUnknown_02022D0C = {}; static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {}; extern void sub_81B8D64(u8 battlerId, u8 arg1); // party_menu @@ -681,20 +681,20 @@ static void PrepareBufferDataTransfer(u8 bufferId, u8 *data, u16 size) static void CreateTasksForSendRecvLinkBuffers(void) { - gUnknown_02022D08 = CreateTask(Task_HandleSendLinkBuffersData, 0); - gTasks[gUnknown_02022D08].data[11] = 0; - gTasks[gUnknown_02022D08].data[12] = 0; - gTasks[gUnknown_02022D08].data[13] = 0; - gTasks[gUnknown_02022D08].data[14] = 0; - gTasks[gUnknown_02022D08].data[15] = 0; + sLinkSendTaskId = CreateTask(Task_HandleSendLinkBuffersData, 0); + gTasks[sLinkSendTaskId].data[11] = 0; + gTasks[sLinkSendTaskId].data[12] = 0; + gTasks[sLinkSendTaskId].data[13] = 0; + gTasks[sLinkSendTaskId].data[14] = 0; + gTasks[sLinkSendTaskId].data[15] = 0; - gUnknown_02022D09 = CreateTask(Task_HandleCopyReceivedLinkBuffersData, 0); - gTasks[gUnknown_02022D09].data[12] = 0; - gTasks[gUnknown_02022D09].data[13] = 0; - gTasks[gUnknown_02022D09].data[14] = 0; - gTasks[gUnknown_02022D09].data[15] = 0; + sLinkReceiveTaskId = CreateTask(Task_HandleCopyReceivedLinkBuffersData, 0); + gTasks[sLinkReceiveTaskId].data[12] = 0; + gTasks[sLinkReceiveTaskId].data[13] = 0; + gTasks[sLinkReceiveTaskId].data[14] = 0; + gTasks[sLinkReceiveTaskId].data[15] = 0; - gUnknown_02022D0A = 0; + sUnknown_02022D0A = 0; } enum @@ -716,24 +716,24 @@ void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data) s32 i; alignedSize = size - size % 4 + 4; - if (gTasks[gUnknown_02022D08].data[14] + alignedSize + LINK_BUFF_DATA + 1 > BATTLE_BUFFER_LINK_SIZE) + if (gTasks[sLinkSendTaskId].data[14] + alignedSize + LINK_BUFF_DATA + 1 > BATTLE_BUFFER_LINK_SIZE) { - gTasks[gUnknown_02022D08].data[12] = gTasks[gUnknown_02022D08].data[14]; - gTasks[gUnknown_02022D08].data[14] = 0; + gTasks[sLinkSendTaskId].data[12] = gTasks[sLinkSendTaskId].data[14]; + gTasks[sLinkSendTaskId].data[14] = 0; } - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_BUFFER_ID] = bufferId; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BATTLER] = gActiveBattler; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBattlerAttacker; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBattlerTarget; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_LO] = alignedSize; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BATTLER_FLAGS] = gAbsentBattlerFlags; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_EFFECT_BATTLER] = gEffectBattler; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_BUFFER_ID] = bufferId; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_ACTIVE_BATTLER] = gActiveBattler; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_ATTACKER] = gBattlerAttacker; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_TARGET] = gBattlerTarget; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_SIZE_LO] = alignedSize; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_ABSENT_BATTLER_FLAGS] = gAbsentBattlerFlags; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_EFFECT_BATTLER] = gEffectBattler; for (i = 0; i < size; i++) - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_DATA + i] = data[i]; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_DATA + i] = data[i]; - gTasks[gUnknown_02022D08].data[14] = gTasks[gUnknown_02022D08].data[14] + alignedSize + LINK_BUFF_DATA; + gTasks[sLinkSendTaskId].data[14] = gTasks[sLinkSendTaskId].data[14] + alignedSize + LINK_BUFF_DATA; } static void Task_HandleSendLinkBuffersData(u8 taskId) @@ -845,19 +845,19 @@ void sub_8033648(void) #endif r6 = gBlockRecvBuffer[i][2]; - if (gTasks[gUnknown_02022D09].data[14] + 9 + r6 > 0x1000) + if (gTasks[sLinkReceiveTaskId].data[14] + 9 + r6 > 0x1000) { - gTasks[gUnknown_02022D09].data[12] = gTasks[gUnknown_02022D09].data[14]; - gTasks[gUnknown_02022D09].data[14] = 0; + gTasks[sLinkReceiveTaskId].data[12] = gTasks[sLinkReceiveTaskId].data[14]; + gTasks[sLinkReceiveTaskId].data[14] = 0; } - dest = &gLinkBattleRecvBuffer[gTasks[gUnknown_02022D09].data[14]]; + dest = &gLinkBattleRecvBuffer[gTasks[sLinkReceiveTaskId].data[14]]; src = recvBuffer; for (j = 0; j < r6 + 8; j++) dest[j] = src[j]; - gTasks[gUnknown_02022D09].data[14] = gTasks[gUnknown_02022D09].data[14] + r6 + 8; + gTasks[sLinkReceiveTaskId].data[14] = gTasks[sLinkReceiveTaskId].data[14] + r6 + 8; } } } diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c index 1ef223c696..be6d6614a8 100644 --- a/src/rom_8034C54.c +++ b/src/rom_8034C54.c @@ -31,8 +31,6 @@ struct UnkStruct1 struct UnkStruct2 *array; }; -extern struct UnkStruct1 *gUnknown_02022E10; - extern const struct SpriteTemplate gUnknown_0831AC88; // this file's functions @@ -50,6 +48,9 @@ static IWRAM_DATA s32 gUnknown_03000DD4; static IWRAM_DATA s32 gUnknown_03000DD8; static IWRAM_DATA s32 gUnknown_03000DDC; +// ewram +static EWRAM_DATA struct UnkStruct1 *gUnknown_02022E10 = {0}; + // const rom data static const u8 gUnknown_082FF1C8[][4] = { diff --git a/sym_ewram.txt b/sym_ewram.txt index 4830343e85..19146b72d6 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -104,24 +104,8 @@ gUnknown_02022D00: @ 2022D00 .space 0x4 .include "src/main_menu.o" - -gUnknown_02022D08: @ 2022D08 - .space 0x1 - -gUnknown_02022D09: @ 2022D09 - .space 0x1 - -gUnknown_02022D0A: @ 2022D0A - .space 0x2 - -gUnknown_02022D0C: @ 2022D0C - .space 0x4 - .include "src/battle_controllers.o" - -gUnknown_02022E10: @ 2022E10 - .space 0x4 - + .include "src/rom_8034C54.o" .include "src/battle_main.o" .include "src/pokemon.o" .include "src/random.o"