ported battle_util2 from pokeem
This commit is contained in:
+4
-4
@@ -9,7 +9,7 @@
|
||||
sub_800FD9C: @ 800FD9C
|
||||
push {r4,lr}
|
||||
bl MoveSaveBlocks_ResetHeap
|
||||
bl sub_802E03C
|
||||
bl AllocateBattleResources
|
||||
bl AllocateBattleSpritesData
|
||||
bl AllocateMonSpritesGfx
|
||||
ldr r4, _0800FDCC @ =gBattleTypeFlags
|
||||
@@ -2425,7 +2425,7 @@ FreeRestoreBattleData: @ 8011174
|
||||
bl m4aSongNumStop
|
||||
bl FreeMonSpritesGfx
|
||||
bl FreeBattleSpritesData
|
||||
bl sub_802E138
|
||||
bl FreeBattleResources
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -3738,7 +3738,7 @@ _08011C10:
|
||||
bl sub_812C224
|
||||
bl FreeMonSpritesGfx
|
||||
bl FreeBattleSpritesData
|
||||
bl sub_802E138
|
||||
bl FreeBattleResources
|
||||
_08011C34:
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
@@ -11524,7 +11524,7 @@ _08015A70:
|
||||
bne _08015A8E
|
||||
bl FreeMonSpritesGfx
|
||||
bl FreeBattleSpritesData
|
||||
bl sub_802E138
|
||||
bl FreeBattleResources
|
||||
_08015A8E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
||||
+10
-10
@@ -1028,7 +1028,7 @@ _0800DA3E:
|
||||
adds r0, r5
|
||||
movs r2, 0x24
|
||||
ldrsh r1, [r0, r2]
|
||||
ldr r4, _0800DB54 @ =gUnknown_2023FEC
|
||||
ldr r4, _0800DB54 @ =gLinkBattleSendBuffer
|
||||
ldr r0, [r4]
|
||||
adds r0, r1
|
||||
strb r6, [r0]
|
||||
@@ -1161,7 +1161,7 @@ _0800DB2C:
|
||||
.align 2, 0
|
||||
_0800DB4C: .4byte gTasks
|
||||
_0800DB50: .4byte gUnknown_202286C
|
||||
_0800DB54: .4byte gUnknown_2023FEC
|
||||
_0800DB54: .4byte gLinkBattleSendBuffer
|
||||
_0800DB58: .4byte gActiveBattler
|
||||
_0800DB5C: .4byte sBattler_AI
|
||||
_0800DB60: .4byte gBattlerTarget
|
||||
@@ -1315,7 +1315,7 @@ _0800DC80:
|
||||
adds r4, r7
|
||||
movs r0, 0x26
|
||||
ldrsh r1, [r4, r0]
|
||||
ldr r5, _0800DCBC @ =gUnknown_2023FEC
|
||||
ldr r5, _0800DCBC @ =gLinkBattleSendBuffer
|
||||
ldr r0, [r5]
|
||||
adds r1, r0
|
||||
ldrb r0, [r1, 0x4]
|
||||
@@ -1339,7 +1339,7 @@ _0800DC80:
|
||||
strh r0, [r4, 0x1E]
|
||||
b _0800DD20
|
||||
.align 2, 0
|
||||
_0800DCBC: .4byte gUnknown_2023FEC
|
||||
_0800DCBC: .4byte gLinkBattleSendBuffer
|
||||
_0800DCC0:
|
||||
subs r0, 0x1
|
||||
strh r0, [r2, 0x22]
|
||||
@@ -1356,7 +1356,7 @@ _0800DCC6:
|
||||
adds r1, r0
|
||||
movs r3, 0x26
|
||||
ldrsh r2, [r1, r3]
|
||||
ldr r0, _0800DD00 @ =gUnknown_2023FEC
|
||||
ldr r0, _0800DD00 @ =gLinkBattleSendBuffer
|
||||
ldr r0, [r0]
|
||||
adds r2, r0
|
||||
ldrb r0, [r2, 0x4]
|
||||
@@ -1372,7 +1372,7 @@ _0800DCC6:
|
||||
b _0800DD1C
|
||||
.align 2, 0
|
||||
_0800DCFC: .4byte gTasks
|
||||
_0800DD00: .4byte gUnknown_2023FEC
|
||||
_0800DD00: .4byte gLinkBattleSendBuffer
|
||||
_0800DD04:
|
||||
lsls r0, r4, 2
|
||||
adds r0, r4
|
||||
@@ -1477,7 +1477,7 @@ _0800DD70:
|
||||
movs r1, 0
|
||||
strh r1, [r0, 0x24]
|
||||
_0800DDD0:
|
||||
ldr r2, _0800DE48 @ =gUnknown_2023FF0
|
||||
ldr r2, _0800DE48 @ =gLinkBattleRecvBuffer
|
||||
mov r4, r12
|
||||
ldrb r1, [r4]
|
||||
lsls r0, r1, 2
|
||||
@@ -1537,7 +1537,7 @@ _0800DE38: .4byte gBitTable
|
||||
_0800DE3C: .4byte gBlockRecvBuffer + 4
|
||||
_0800DE40: .4byte gTasks
|
||||
_0800DE44: .4byte gUnknown_202286D
|
||||
_0800DE48: .4byte gUnknown_2023FF0
|
||||
_0800DE48: .4byte gLinkBattleRecvBuffer
|
||||
thumb_func_end sub_800DD28
|
||||
|
||||
thumb_func_start Task_HandleCopyReceivedLinkBuffersData
|
||||
@@ -1577,7 +1577,7 @@ _0800DE82:
|
||||
adds r5, r0, r1
|
||||
movs r0, 0x26
|
||||
ldrsh r1, [r5, r0]
|
||||
ldr r3, _0800DEB8 @ =gUnknown_2023FF0
|
||||
ldr r3, _0800DEB8 @ =gLinkBattleRecvBuffer
|
||||
mov r8, r3
|
||||
ldr r0, [r3]
|
||||
adds r3, r1, r0
|
||||
@@ -1597,7 +1597,7 @@ _0800DE82:
|
||||
b _0800DF7A
|
||||
.align 2, 0
|
||||
_0800DEB4: .4byte gTasks
|
||||
_0800DEB8: .4byte gUnknown_2023FF0
|
||||
_0800DEB8: .4byte gLinkBattleRecvBuffer
|
||||
_0800DEBC:
|
||||
cmp r0, 0x2
|
||||
beq _0800DF64
|
||||
|
||||
@@ -7510,7 +7510,7 @@ _08021392:
|
||||
strb r0, [r1]
|
||||
_080213C8:
|
||||
ldrb r0, [r7]
|
||||
bl sub_802E228
|
||||
bl AdjustFriendshipOnBattleFaint
|
||||
b _0802142C
|
||||
.align 2, 0
|
||||
_080213D0: .4byte gActiveBattler
|
||||
|
||||
@@ -1,333 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_802E03C
|
||||
sub_802E03C: @ 802E03C
|
||||
push {r4,r5,lr}
|
||||
ldr r4, _0802E118 @ =gBattleTypeFlags
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x80
|
||||
lsls r1, 12
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0802E050
|
||||
bl sub_815DA54
|
||||
_0802E050:
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x80
|
||||
lsls r1, 9
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0802E06E
|
||||
ldr r5, _0802E11C @ =gUnknown_3005EE0
|
||||
movs r4, 0x3
|
||||
_0802E060:
|
||||
movs r0, 0x8
|
||||
bl AllocZeroed
|
||||
stm r5!, {r0}
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
bge _0802E060
|
||||
_0802E06E:
|
||||
ldr r4, _0802E120 @ =gBattleStruct
|
||||
movs r0, 0x80
|
||||
lsls r0, 2
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E124 @ =gBattleResources
|
||||
movs r0, 0x20
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
movs r0, 0xA0
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1]
|
||||
movs r0, 0x10
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x4]
|
||||
movs r0, 0x24
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x8]
|
||||
movs r0, 0x24
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0xC]
|
||||
movs r0, 0xC
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x10]
|
||||
movs r0, 0x1C
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x14]
|
||||
movs r0, 0x30
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x18]
|
||||
movs r0, 0x24
|
||||
bl AllocZeroed
|
||||
ldr r1, [r4]
|
||||
str r0, [r1, 0x1C]
|
||||
ldr r4, _0802E128 @ =gUnknown_2023FEC
|
||||
movs r5, 0x80
|
||||
lsls r5, 5
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E12C @ =gUnknown_2023FF0
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E130 @ =gUnknown_2022BB8
|
||||
movs r0, 0x80
|
||||
lsls r0, 6
|
||||
bl AllocZeroed
|
||||
str r0, [r4]
|
||||
ldr r4, _0802E134 @ =gUnknown_2022BBC
|
||||
adds r0, r5, 0
|
||||
bl AllocZeroed
|
||||
adds r1, r0, 0
|
||||
str r1, [r4]
|
||||
movs r0, 0x1
|
||||
bl SetBgTilemapBuffer
|
||||
ldr r1, [r4]
|
||||
movs r0, 0x2
|
||||
bl SetBgTilemapBuffer
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802E118: .4byte gBattleTypeFlags
|
||||
_0802E11C: .4byte gUnknown_3005EE0
|
||||
_0802E120: .4byte gBattleStruct
|
||||
_0802E124: .4byte gBattleResources
|
||||
_0802E128: .4byte gUnknown_2023FEC
|
||||
_0802E12C: .4byte gUnknown_2023FF0
|
||||
_0802E130: .4byte gUnknown_2022BB8
|
||||
_0802E134: .4byte gUnknown_2022BBC
|
||||
thumb_func_end sub_802E03C
|
||||
|
||||
thumb_func_start sub_802E138
|
||||
sub_802E138: @ 802E138
|
||||
push {r4-r6,lr}
|
||||
ldr r4, _0802E208 @ =gBattleTypeFlags
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x80
|
||||
lsls r1, 12
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0802E14C
|
||||
bl sub_815DBDC
|
||||
_0802E14C:
|
||||
ldr r0, [r4]
|
||||
movs r1, 0x80
|
||||
lsls r1, 9
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0802E16C
|
||||
ldr r5, _0802E20C @ =gUnknown_3005EE0
|
||||
movs r6, 0
|
||||
movs r4, 0x3
|
||||
_0802E15E:
|
||||
ldr r0, [r5]
|
||||
bl Free
|
||||
stm r5!, {r6}
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
bge _0802E15E
|
||||
_0802E16C:
|
||||
ldr r6, _0802E210 @ =gBattleResources
|
||||
ldr r0, [r6]
|
||||
cmp r0, 0
|
||||
beq _0802E200
|
||||
ldr r4, _0802E214 @ =gBattleStruct
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
movs r5, 0
|
||||
str r5, [r4]
|
||||
ldr r0, [r6]
|
||||
ldr r0, [r0]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0]
|
||||
ldr r0, [r0, 0x4]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x4]
|
||||
ldr r0, [r0, 0x8]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x8]
|
||||
ldr r0, [r0, 0xC]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0xC]
|
||||
ldr r0, [r0, 0x10]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x10]
|
||||
ldr r0, [r0, 0x14]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x14]
|
||||
ldr r0, [r0, 0x18]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x18]
|
||||
ldr r0, [r0, 0x1C]
|
||||
bl Free
|
||||
ldr r0, [r6]
|
||||
str r5, [r0, 0x1C]
|
||||
bl Free
|
||||
str r5, [r6]
|
||||
ldr r4, _0802E218 @ =gUnknown_2023FEC
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r4, _0802E21C @ =gUnknown_2023FF0
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r4, _0802E220 @ =gUnknown_2022BB8
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
ldr r4, _0802E224 @ =gUnknown_2022BBC
|
||||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r5, [r4]
|
||||
_0802E200:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802E208: .4byte gBattleTypeFlags
|
||||
_0802E20C: .4byte gUnknown_3005EE0
|
||||
_0802E210: .4byte gBattleResources
|
||||
_0802E214: .4byte gBattleStruct
|
||||
_0802E218: .4byte gUnknown_2023FEC
|
||||
_0802E21C: .4byte gUnknown_2023FF0
|
||||
_0802E220: .4byte gUnknown_2022BB8
|
||||
_0802E224: .4byte gUnknown_2022BBC
|
||||
thumb_func_end sub_802E138
|
||||
|
||||
thumb_func_start sub_802E228
|
||||
sub_802E228: @ 802E228
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r0, _0802E26C @ =gBattleTypeFlags
|
||||
ldr r0, [r0]
|
||||
movs r1, 0x1
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0802E274
|
||||
movs r0, 0x1
|
||||
bl GetBattlerAtPosition
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
movs r0, 0x3
|
||||
bl GetBattlerAtPosition
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
ldr r2, _0802E270 @ =gBattleMons
|
||||
movs r0, 0x58
|
||||
adds r1, r3, 0
|
||||
muls r1, r0
|
||||
adds r1, r2
|
||||
adds r1, 0x2A
|
||||
muls r0, r4
|
||||
adds r0, r2
|
||||
adds r0, 0x2A
|
||||
ldrb r1, [r1]
|
||||
ldrb r0, [r0]
|
||||
cmp r1, r0
|
||||
bls _0802E27E
|
||||
adds r4, r3, 0
|
||||
b _0802E27E
|
||||
.align 2, 0
|
||||
_0802E26C: .4byte gBattleTypeFlags
|
||||
_0802E270: .4byte gBattleMons
|
||||
_0802E274:
|
||||
movs r0, 0x1
|
||||
bl GetBattlerAtPosition
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
_0802E27E:
|
||||
ldr r2, _0802E2C0 @ =gBattleMons
|
||||
movs r1, 0x58
|
||||
adds r0, r4, 0
|
||||
muls r0, r1
|
||||
adds r0, r2
|
||||
adds r3, r0, 0
|
||||
adds r3, 0x2A
|
||||
adds r0, r5, 0
|
||||
muls r0, r1
|
||||
adds r0, r2
|
||||
adds r1, r0, 0
|
||||
adds r1, 0x2A
|
||||
ldrb r0, [r3]
|
||||
ldrb r2, [r1]
|
||||
cmp r0, r2
|
||||
bls _0802E2EC
|
||||
ldrb r1, [r1]
|
||||
subs r0, r1
|
||||
cmp r0, 0x1D
|
||||
ble _0802E2CC
|
||||
ldr r1, _0802E2C4 @ =gBattlerPartyIndexes
|
||||
lsls r0, r5, 1
|
||||
adds r0, r1
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x64
|
||||
muls r0, r1
|
||||
ldr r1, _0802E2C8 @ =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x9
|
||||
bl AdjustFriendship
|
||||
b _0802E302
|
||||
.align 2, 0
|
||||
_0802E2C0: .4byte gBattleMons
|
||||
_0802E2C4: .4byte gBattlerPartyIndexes
|
||||
_0802E2C8: .4byte gPlayerParty
|
||||
_0802E2CC:
|
||||
ldr r1, _0802E2E4 @ =gBattlerPartyIndexes
|
||||
lsls r0, r5, 1
|
||||
adds r0, r1
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x64
|
||||
muls r0, r1
|
||||
ldr r1, _0802E2E8 @ =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x7
|
||||
bl AdjustFriendship
|
||||
b _0802E302
|
||||
.align 2, 0
|
||||
_0802E2E4: .4byte gBattlerPartyIndexes
|
||||
_0802E2E8: .4byte gPlayerParty
|
||||
_0802E2EC:
|
||||
ldr r1, _0802E308 @ =gBattlerPartyIndexes
|
||||
lsls r0, r5, 1
|
||||
adds r0, r1
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x64
|
||||
muls r0, r1
|
||||
ldr r1, _0802E30C @ =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x7
|
||||
bl AdjustFriendship
|
||||
_0802E302:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0802E308: .4byte gBattlerPartyIndexes
|
||||
_0802E30C: .4byte gPlayerParty
|
||||
thumb_func_end sub_802E228
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
+10
-7
@@ -236,7 +236,7 @@ extern const struct Trainer gTrainers[];
|
||||
|
||||
#define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F))
|
||||
|
||||
struct UnknownFlags
|
||||
struct ResourceFlags
|
||||
{
|
||||
u32 flags[4];
|
||||
};
|
||||
@@ -447,11 +447,11 @@ struct StatsArray
|
||||
|
||||
struct BattleResources
|
||||
{
|
||||
struct SecretBaseRecord* secretBase;
|
||||
struct UnknownFlags *flags;
|
||||
struct BattleScriptsStack* battleScriptsStack;
|
||||
struct BattleCallbacksStack* battleCallbackStack;
|
||||
struct StatsArray* statsBeforeLvlUp;
|
||||
struct SecretBaseRecord *secretBase;
|
||||
struct ResourceFlags *flags;
|
||||
struct BattleScriptsStack *battleScriptsStack;
|
||||
struct BattleCallbacksStack *battleCallbackStack;
|
||||
struct StatsArray *beforeLvlUp;
|
||||
struct AI_ThinkingStruct *ai;
|
||||
struct BattleHistory *battleHistory;
|
||||
struct BattleScriptsStack *AI_ScriptsStack;
|
||||
@@ -610,7 +610,7 @@ struct BattleStruct
|
||||
u8 field_2A2;
|
||||
};
|
||||
|
||||
extern struct BattleStruct* gBattleStruct;
|
||||
extern struct BattleStruct *gBattleStruct;
|
||||
|
||||
#define GET_MOVE_TYPE(move, typeArg) \
|
||||
{ \
|
||||
@@ -975,5 +975,8 @@ extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
|
||||
extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
|
||||
extern void (*gPreBattleCallback1)(void);
|
||||
extern bool8 gDoingBattleAnim;
|
||||
extern void *gUnknown_3005EE0[];
|
||||
extern u8 *gUnknown_2022BB8;
|
||||
extern u8 *gUnknown_2022BBC;
|
||||
|
||||
#endif // GUARD_BATTLE_H
|
||||
|
||||
@@ -6,7 +6,5 @@
|
||||
void AllocateBattleResources(void);
|
||||
void FreeBattleResources(void);
|
||||
void AdjustFriendshipOnBattleFaint(u8 bank);
|
||||
void sub_80571DC(u8 bank, u8 arg1);
|
||||
u32 sub_805725C(u8 bank);
|
||||
|
||||
#endif // GUARD_BATTLE_UTIL_H
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
#define BATTLE_TYPE_POKEDUDE 0x10000
|
||||
#define BATTLE_TYPE_PALACE 0x20000
|
||||
#define BATTLE_TYPE_ARENA 0x40000
|
||||
#define BATTLE_TYPE_FACTORY 0x80000
|
||||
#define BATTLE_TYPE_TRAINER_TOWER 0x80000
|
||||
#define BATTLE_TYPE_PIKE 0x100000
|
||||
#define BATTLE_TYPE_PYRAMID 0x200000
|
||||
#define BATTLE_TYPE_INGAME_PARTNER 0x400000
|
||||
|
||||
@@ -2,5 +2,7 @@
|
||||
#define GUARD_TRAINER_TOWER_H
|
||||
|
||||
void PrintTrainerTowerRecords(void);
|
||||
void InitTrainerTowerBattleStruct(void);
|
||||
void FreeTrainerTowerBattleStruct(void);
|
||||
|
||||
#endif //GUARD_TRAINER_TOWER_H
|
||||
|
||||
+1
-1
@@ -69,7 +69,7 @@ SECTIONS {
|
||||
asm/battle_2.o(.text);
|
||||
asm/battle_util.o(.text);
|
||||
asm/battle_script_commands.o(.text);
|
||||
asm/battle_util2.o(.text);
|
||||
src/battle_util2.o(.text);
|
||||
asm/battle_controller_player.o(.text);
|
||||
src/battle_gfx_sfx_util.o(.text);
|
||||
asm/battle_controller_opponent.o(.text);
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
#include "global.h"
|
||||
#include "bg.h"
|
||||
#include "battle.h"
|
||||
#include "pokemon.h"
|
||||
#include "malloc.h"
|
||||
#include "trainer_tower.h"
|
||||
#include "battle_util2.h"
|
||||
|
||||
void AllocateBattleResources(void)
|
||||
{
|
||||
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER)
|
||||
InitTrainerTowerBattleStruct();
|
||||
if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE)
|
||||
{
|
||||
void **ptr = gUnknown_3005EE0;
|
||||
s32 i = 3;
|
||||
|
||||
do
|
||||
*ptr++ = AllocZeroed(8);
|
||||
while (--i >= 0);
|
||||
}
|
||||
// TODO: Figure out whether 0x200 is really the size of *gBattleResources.
|
||||
// The following works in pokeem:
|
||||
// gBattleStruct = AllocZeroed(sizeof(*gBattleStruct));
|
||||
gBattleStruct = AllocZeroed(0x200);
|
||||
gBattleResources = AllocZeroed(sizeof(*gBattleResources));
|
||||
gBattleResources->secretBase = AllocZeroed(sizeof(*gBattleResources->secretBase));
|
||||
gBattleResources->flags = AllocZeroed(sizeof(*gBattleResources->flags));
|
||||
gBattleResources->battleScriptsStack = AllocZeroed(sizeof(*gBattleResources->battleScriptsStack));
|
||||
gBattleResources->battleCallbackStack = AllocZeroed(sizeof(*gBattleResources->battleCallbackStack));
|
||||
gBattleResources->beforeLvlUp = AllocZeroed(sizeof(*gBattleResources->beforeLvlUp));
|
||||
gBattleResources->ai = AllocZeroed(sizeof(*gBattleResources->ai));
|
||||
gBattleResources->battleHistory = AllocZeroed(sizeof(*gBattleResources->battleHistory));
|
||||
gBattleResources->AI_ScriptsStack = AllocZeroed(sizeof(*gBattleResources->AI_ScriptsStack));
|
||||
gLinkBattleSendBuffer = AllocZeroed(BATTLE_BUFFER_LINK_SIZE);
|
||||
gLinkBattleRecvBuffer = AllocZeroed(BATTLE_BUFFER_LINK_SIZE);
|
||||
gUnknown_2022BB8 = AllocZeroed(0x2000);
|
||||
gUnknown_2022BBC = AllocZeroed(0x1000);
|
||||
SetBgTilemapBuffer(1, gUnknown_2022BBC);
|
||||
SetBgTilemapBuffer(2, gUnknown_2022BBC);
|
||||
}
|
||||
|
||||
void FreeBattleResources(void)
|
||||
{
|
||||
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER)
|
||||
FreeTrainerTowerBattleStruct();
|
||||
if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE)
|
||||
{
|
||||
void **ptr = gUnknown_3005EE0;
|
||||
void *nullPtr = NULL;
|
||||
s32 i = 3;
|
||||
|
||||
do
|
||||
{
|
||||
Free(*ptr);
|
||||
*ptr++ = nullPtr;
|
||||
}
|
||||
while (--i >= 0);
|
||||
}
|
||||
if (gBattleResources != NULL)
|
||||
{
|
||||
FREE_AND_SET_NULL(gBattleStruct);
|
||||
FREE_AND_SET_NULL(gBattleResources->secretBase);
|
||||
FREE_AND_SET_NULL(gBattleResources->flags);
|
||||
FREE_AND_SET_NULL(gBattleResources->battleScriptsStack);
|
||||
FREE_AND_SET_NULL(gBattleResources->battleCallbackStack);
|
||||
FREE_AND_SET_NULL(gBattleResources->beforeLvlUp);
|
||||
FREE_AND_SET_NULL(gBattleResources->ai);
|
||||
FREE_AND_SET_NULL(gBattleResources->battleHistory);
|
||||
FREE_AND_SET_NULL(gBattleResources->AI_ScriptsStack);
|
||||
FREE_AND_SET_NULL(gBattleResources);
|
||||
FREE_AND_SET_NULL(gLinkBattleSendBuffer);
|
||||
FREE_AND_SET_NULL(gLinkBattleRecvBuffer);
|
||||
FREE_AND_SET_NULL(gUnknown_2022BB8);
|
||||
FREE_AND_SET_NULL(gUnknown_2022BBC);
|
||||
}
|
||||
}
|
||||
|
||||
void AdjustFriendshipOnBattleFaint(u8 battlerId)
|
||||
{
|
||||
u8 opposingBattlerId, opposingBattlerId2;
|
||||
|
||||
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
|
||||
{
|
||||
opposingBattlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
|
||||
opposingBattlerId2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
|
||||
if (gBattleMons[opposingBattlerId2].level > gBattleMons[opposingBattlerId].level)
|
||||
opposingBattlerId = opposingBattlerId2;
|
||||
}
|
||||
else
|
||||
{
|
||||
opposingBattlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
|
||||
}
|
||||
if (gBattleMons[opposingBattlerId].level > gBattleMons[battlerId].level)
|
||||
{
|
||||
if (gBattleMons[opposingBattlerId].level - gBattleMons[battlerId].level > 29)
|
||||
AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[battlerId]], 9);
|
||||
else
|
||||
AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[battlerId]], 7);
|
||||
}
|
||||
else
|
||||
{
|
||||
AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[battlerId]], 7);
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -631,7 +631,7 @@ u8 sub_815DA3C(void)
|
||||
return gFacilityClassToPicIndex[gUnknown_203F45C->unk_3D];
|
||||
}
|
||||
|
||||
void sub_815DA54(void)
|
||||
void InitTrainerTowerBattleStruct(void)
|
||||
{
|
||||
u16 r10;
|
||||
s32 r9;
|
||||
@@ -660,7 +660,7 @@ void sub_815DA54(void)
|
||||
sub_815DD2C();
|
||||
}
|
||||
|
||||
void sub_815DBDC(void)
|
||||
void FreeTrainerTowerBattleStruct(void)
|
||||
{
|
||||
Free(gUnknown_203F45C);
|
||||
gUnknown_203F45C = NULL;
|
||||
@@ -1122,7 +1122,7 @@ void sub_815E124(u8 taskId)
|
||||
|
||||
void sub_815E160(void)
|
||||
{
|
||||
gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_FACTORY;
|
||||
gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_TRAINER_TOWER;
|
||||
if (gUnknown_203F458->unk_0004.trainers[gUnknown_203F458->unk_0000].unk_002 == 1)
|
||||
gBattleTypeFlags |= BATTLE_TYPE_DOUBLE;
|
||||
gTrainerBattleOpponent_A = 0;
|
||||
|
||||
+2
-2
@@ -403,10 +403,10 @@ gUnknown_2023FC8: @ 2023FC8
|
||||
gBattleStruct: @ 2023FE8
|
||||
.space 0x4
|
||||
|
||||
gUnknown_2023FEC: @ 2023FEC
|
||||
gLinkBattleSendBuffer: @ 2023FEC
|
||||
.space 0x4
|
||||
|
||||
gUnknown_2023FF0: @ 2023FF0
|
||||
gLinkBattleRecvBuffer: @ 2023FF0
|
||||
.space 0x4
|
||||
|
||||
gBattleResources: @ 2023FF4
|
||||
|
||||
Reference in New Issue
Block a user