Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-02-10 23:23:34 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add consts

Browse Source
This commit is contained in:
Adrienn Tindall 2023-07-15 19:28:51 -04:00
parent 02ff7ebf88
commit 1676388249
14 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_12_022378C0.inc
View File

@ -210,7 +210,7 @@
.public BattleSystem_GetFieldSide
.public BattleSystem_GetTerrainId
.public BattleSystem_GetBattlerIdPartner
.public BattleSystem_GetBattleFlags
.public BattleSystem_GetBattleSpecial
.public ov12_0223B52C
.public ov12_0223B5EC
.public ov12_0223B708

2
asm/include/overlay_12_battle_controller_opponent.inc
View File

@ -179,7 +179,7 @@
.public BattleSystem_GetTerrainId
.public ov12_0223AB54
.public BattleSystem_GetBattlerIdPartner
.public BattleSystem_GetBattleFlags
.public BattleSystem_GetBattleSpecial
.public ov12_0223B52C
.public ov12_0223B580
.public ov12_0223B688

2
asm/include/overlay_12_battle_controller_player.inc
View File

@ -37,7 +37,7 @@
.public ov12_0223AB0C
.public BattleSystem_GetFieldSide
.public BattleSystem_GetBattlerIdPartner
.public BattleSystem_GetBattleFlags
.public BattleSystem_GetBattleSpecial
.public ov12_0223B6B4
.public ov12_0223B6C0
.public ov12_0223B740

2
asm/include/overlay_12_battle_system.inc
View File

@ -118,7 +118,7 @@
.public BattleSystem_GetBattlerIdPartner
.public ov12_0223ABB8
.public BattleSystem_RecoverStatus
.public BattleSystem_GetBattleFlags
.public BattleSystem_GetBattleSpecial
.public ov12_0223B520
.public ov12_0223B52C
.public ov12_0223B580

2
asm/include/unk_02074E5C.inc
View File

@ -50,7 +50,7 @@
.public ov12_0223A978
.public ov12_0223A984
.public ov12_0223A990
.public BattleSystem_GetBattleFlags
.public BattleSystem_GetBattleSpecial
.public ov12_0223BBFC
.public ov12_0223BC08
.public ov12_0223BC14

4
asm/overlay_12_022378C0.s
View File

@ -3796,7 +3796,7 @@ _022398A0:
cmp r0, #0
bne _022398BE
add r0, r5, #0
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x10
tst r0, r1
beq _022398D6
@ -3807,7 +3807,7 @@ _022398BE:
cmp r0, #0
bne _022398FE
add r0, r5, #0
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x10
tst r0, r1
beq _022398FE

20
asm/overlay_12_battle_controller_opponent.s
View File

@ -2509,7 +2509,7 @@ _02259AD2:
cmp r0, #2
bne _02259B12
ldr r0, [sp, #0x24]
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x40
tst r0, r1
beq _02259B12
@ -2573,7 +2573,7 @@ _02259B1E:
cmp r0, #2
bne _02259B78
ldr r0, [sp, #0x24]
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x40
tst r0, r1
beq _02259B78
@ -6431,7 +6431,7 @@ _0225B990:
tst r0, r1
ldr r0, [r4]
beq _0225B9C8
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x20
tst r0, r1
bne _0225BA06
@ -6446,7 +6446,7 @@ _0225B990:
str r0, [r4, #0x10]
b _0225BA06
_0225B9C8:
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x20
tst r0, r1
bne _0225BA06
@ -7018,7 +7018,7 @@ _0225BE66:
tst r0, r1
ldr r0, [r4]
beq _0225BE9E
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x20
tst r0, r1
bne _0225BEDC
@ -7033,7 +7033,7 @@ _0225BE66:
str r0, [r4, #0x10]
b _0225BEDC
_0225BE9E:
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x20
tst r0, r1
bne _0225BEDC
@ -10775,7 +10775,7 @@ _0225DC9E:
mov r1, #1
bl ov12_022698AC
ldr r0, [r4]
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #1
tst r0, r1
beq _0225DD20
@ -10876,7 +10876,7 @@ _0225DDC8:
b _0225DE98
_0225DDD2:
ldr r0, [r4]
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #1
tst r0, r1
beq _0225DDF4
@ -11623,7 +11623,7 @@ ov12_0225E404: ; 0x0225E404
tst r0, r4
bne _0225E43A
ldr r0, [r6]
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #1
tst r0, r1
bne _0225E43A
@ -16931,7 +16931,7 @@ ov12_02260EA4: ; 0x02260EA4
bl BattleSystem_GetBattleType
add r4, r0, #0
add r0, r6, #0
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x40
tst r1, r4
beq _02260F2C

6
asm/overlay_12_battle_system.s
View File

@ -1849,14 +1849,14 @@ _0223B50C:
.balign 4, 0
thumb_func_end BattleSystem_RecoverStatus
thumb_func_start BattleSystem_GetBattleFlags
BattleSystem_GetBattleFlags: ; 0x0223B514
thumb_func_start BattleSystem_GetBattleSpecial
BattleSystem_GetBattleSpecial: ; 0x0223B514
ldr r1, _0223B51C ; =0x0000240C
ldr r0, [r0, r1]
bx lr
nop
_0223B51C: .word 0x0000240C
thumb_func_end BattleSystem_GetBattleFlags
thumb_func_end BattleSystem_GetBattleSpecial
thumb_func_start ov12_0223B520
ov12_0223B520: ; 0x0223B520

2
asm/unk_02074E5C.s
View File

@ -50,7 +50,7 @@ _020FFE30:
sub_02074E5C: ; 0x02074E5C
push {r4, r5, r6, lr}
add r5, r0, #0
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x10
tst r0, r1
bne _02074EB6

6
include/constants/battle.h
View File

@ -62,8 +62,10 @@ enum Terrain {
#define BATTLE_TYPE_NO_EXP (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_TOWER | BATTLE_TYPE_PAL_PARK)
//Battle Flags
#define BATTLE_FLAG_7 (1 << 7)
//Battle Status Flags
#define BATTLE_SPECIAL_FIRST_RIVAL (1 << 0)
#define BATTLE_SPECIAL_RECORDED (1 << 4)
#define BATTLE_SPECIAL_DISTORTION_WORLD (1 << 7)
//Move Effects Flags
#define MOVE_EFFECT_FLAG_0 (1 << 0)

2
include/overlay_12_0224E4FC.h
View File

@ -128,7 +128,7 @@ BOOL ov12_02251C74(BATTLECONTEXT *ctx, int battlerIdAttacker, int battlerIdTarge
void Link_CheckTimeout(BATTLECONTEXT *ctx);
BOOL CheckLegalMeFirstMove(BATTLECONTEXT *ctx, u16 move);
int ov12_02253DA0(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId);
u32 BattleSystem_GetBattleFlags(BattleSystem *bsys);
u32 BattleSystem_GetBattleSpecial(BattleSystem *bsys);
u32 ov12_0223C24C(PARTY *party, u32 *a1);
int ov12_0223AB0C(BattleSystem *bsys, int battlerId);
int ov12_02251D28(BattleSystem *bsys, BATTLECONTEXT *ctx, int moveNo, int moveType, int battlerIdAttacker, int battlerIdTarget, int dmg, u32 *statusFlag);

4
src/battle/battle_command.c
View File

@ -1170,7 +1170,7 @@ BOOL BtlCmd_JumpToEffectScript(BattleSystem *bsys, BATTLECONTEXT *ctx) {
BOOL BtlCmd_CritCalc(BattleSystem *bsys, BATTLECONTEXT *ctx) {
BattleScriptIncrementPointer(ctx, 1);
if ((BattleSystem_GetBattleType(bsys) & BATTLE_TYPE_TUTORIAL) || (BattleSystem_GetBattleFlags(bsys) & 1)) {
if ((BattleSystem_GetBattleType(bsys) & BATTLE_TYPE_TUTORIAL) || (BattleSystem_GetBattleSpecial(bsys) & BATTLE_SPECIAL_FIRST_RIVAL)) {
ctx->criticalMultiplier = 1;
} else {
ctx->criticalMultiplier = TryCriticalHit(bsys, ctx, ctx->battlerIdAttacker, ctx->battlerIdTarget, ctx->criticalCnt, ov12_022581D4(bsys, ctx, 0, ctx->battlerIdTarget));
@ -5237,7 +5237,7 @@ BOOL BtlCmd_CheckChatterActivation(BattleSystem *bsys, BATTLECONTEXT *ctx) {
int param;
if (ctx->battleMons[ctx->battlerIdAttacker].species == SPECIES_CHATOT && ctx->battleMons[ctx->battlerIdTarget].hp && !(ctx->battleMons[ctx->battlerIdAttacker].status2 & (1 << 21))) {
if ((BattleSystem_GetBattleFlags(bsys) & 16) == FALSE) {
if ((BattleSystem_GetBattleSpecial(bsys) & BATTLE_SPECIAL_RECORDED) == FALSE) {
param = sub_02006EFC(BattleSystem_GetChatotVoice(bsys, ctx->battlerIdAttacker));
} else {
param = BattleSystem_GetChatotVoiceParam(bsys, ctx->battlerIdAttacker);

19
src/battle/battle_controller_player.c
View File

@ -5,6 +5,7 @@
#include "battle_system.h"
#include "overlay_12_0224E4FC.h"
#include "heap.h"
#include "msgdata/msg/msg_0197.h"
extern ControllerFunction sPlayerBattleCommands[];
@ -226,7 +227,7 @@ void BattleControllerPlayer_SelectionScreenInput(BattleSystem *bsys, BATTLECONTE
if (StruggleCheck(bsys, ctx, battlerId, 0, 0xffffffff) == 15) {
ctx->turnData[battlerId].struggleFlag = 1;
if (BattleSystem_GetBattleFlags(bsys) & 0x10) {
if (BattleSystem_GetBattleSpecial(bsys) & BATTLE_SPECIAL_RECORDED) {
ctx->unk_0[battlerId] = 13;
} else {
ctx->unk_0[battlerId] = 17;
@ -237,7 +238,7 @@ void BattleControllerPlayer_SelectionScreenInput(BattleSystem *bsys, BATTLECONTE
ctx->unk_30B4[battlerId] = ctx->battleMons[battlerId].unk88.encoredMove;
ctx->unk_21A8[battlerId][2] = 0;
if (BattleSystem_GetBattleFlags(bsys) & 0x10) {
if (BattleSystem_GetBattleSpecial(bsys) & BATTLE_SPECIAL_RECORDED) {
ctx->unk_0[battlerId] = 13;
} else {
ctx->unk_0[battlerId] = 17;
@ -255,7 +256,7 @@ void BattleControllerPlayer_SelectionScreenInput(BattleSystem *bsys, BATTLECONTE
ctx->unk_4[battlerId] = 13;
ctx->unk_21A8[battlerId][0] = 21;
} else if (BattleSystem_GetBattleType(bsys) & (BATTLE_TYPE_LINK | BATTLE_TYPE_TOWER)) {
msg.id = 593;
msg.id = msg_0197_00593; //Items can't be used here
msg.tag = 0;
ov12_022639B8(bsys, battlerId, msg);
ctx->unk_0[battlerId] = 15;
@ -301,7 +302,7 @@ void BattleControllerPlayer_SelectionScreenInput(BattleSystem *bsys, BATTLECONTE
ctx->unk_0[battlerId] = 11;
break;
} else if (ov12_02251A28(bsys, ctx, battlerId, ctx->unk_2300[battlerId][0] - 1, &msg) == 0) {
if (BattleSystem_GetBattleFlags(bsys) & BATTLE_TYPE_INGAME_PARTNER) {
if (BattleSystem_GetBattleSpecial(bsys) & BATTLE_SPECIAL_RECORDED) {
ov12_0223BFFC(bsys, 1);
ov12_022581BC(bsys, ov12_0223A7E4(bsys));
} else {
@ -359,7 +360,7 @@ void BattleControllerPlayer_SelectionScreenInput(BattleSystem *bsys, BATTLECONTE
v8 = BattlerCanSwitch(bsys, ctx, battlerId);
if (((ov12_0223AB0C(bsys, battlerId) == 4) || (ov12_0223AB0C(bsys, battlerId) == 5)) && ((battleType == (0x2 | 0x1)) || (battleType == (0x4 | 0x1 | 0x2)) || (battleType == (0x2 | 0x1 | 0x80)) || ((battleType == (0x2 | 0x1 | 0x10)) && (ov12_0223AB0C(bsys, battlerId) == 4)))) {
if (((ov12_0223AB0C(bsys, battlerId) == 4) || (ov12_0223AB0C(bsys, battlerId) == 5)) && ((battleType == (BATTLE_TYPE_SINGLES | BATTLE_TYPE_DOUBLES)) || (battleType == (BATTLE_TYPE_SINGLES | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_LINK)) || (battleType == (BATTLE_TYPE_SINGLES | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_TOWER)) || ((battleType == (BATTLE_TYPE_SINGLES | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_INGAME_PARTNER)) && (ov12_0223AB0C(bsys, battlerId) == 4)))) {
partnerId = BattleSystem_GetBattlerIdPartner(bsys, battlerId);
if (ctx->unk_21A8[partnerId][0] == 15) {
@ -384,18 +385,18 @@ void BattleControllerPlayer_SelectionScreenInput(BattleSystem *bsys, BATTLECONTE
BattleController_EmitDrawYesNoBox(bsys, ctx, battlerId, 955, 0, 0, 0);
ctx->unk_0[battlerId] = 12;
} else if ((battleType & BATTLE_TYPE_SINGLES) && !(battleType & BATTLE_TYPE_LINK)) {
if (BattleSystem_GetBattleFlags(bsys) & 0x10) {
if (BattleSystem_GetBattleSpecial(bsys) & BATTLE_SPECIAL_RECORDED) {
ov12_0223BFFC(bsys, 1);
ov12_022581BC(bsys, ov12_0223A7E4(bsys));
} else {
msg.tag = 0;
msg.id = 793; //TODO: replace with msg constants
msg.id = msg_0197_00793; //There's no running from a Trainer battle!
ov12_022639B8(bsys, battlerId, msg);
ctx->unk_0[battlerId] = 15;
ctx->unk_4[battlerId] = 0;
}
} else if (CantEscape(bsys, ctx, battlerId, &msg)) {
if (BattleSystem_GetBattleFlags(bsys) & 0x10) {
if (BattleSystem_GetBattleSpecial(bsys) & BATTLE_SPECIAL_RECORDED) {
ov12_0223BFFC(bsys, 1);
ov12_022581BC(bsys, ov12_0223A7E4(bsys));
} else {
@ -451,7 +452,7 @@ void BattleControllerPlayer_SelectionScreenInput(BattleSystem *bsys, BATTLECONTE
break;
case 16:
msg.tag = 2;
msg.id = 608;
msg.id = msg_0197_00608; //Spheal has no moves left!
msg.param[0] = CreateNicknameTag(ctx, battlerId);
ov12_022639B8(bsys, battlerId, msg);
ctx->unk_0[battlerId] = 15;

2
src/battle/overlay_12_0224E4FC.c
View File

@ -5953,7 +5953,7 @@ BOOL Battler_CheckWeatherFormChange(BattleSystem *bsys, BATTLECONTEXT *ctx, int
ctx->battleMons[ctx->battlerIdTemp].hp &&
ctx->battleMons[ctx->battlerIdTemp].form == GIRATINA_ORIGIN) {
if ((ctx->battleMons[ctx->battlerIdTemp].status2 & STATUS2_TRANSFORMED) ||
(!(BattleSystem_GetBattleFlags(bsys) & BATTLE_FLAG_7) && ctx->battleMons[ctx->battlerIdTemp].item != ITEM_GRISEOUS_ORB)) {
(!(BattleSystem_GetBattleSpecial(bsys) & BATTLE_SPECIAL_DISTORTION_WORLD) && ctx->battleMons[ctx->battlerIdTemp].item != ITEM_GRISEOUS_ORB)) {
if (ctx->battleMons[ctx->battlerIdTemp].status2 & STATUS2_TRANSFORMED) {
Pokemon *mon2;
int battlerIdTarget;