atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Up To CopyDomeTrainerName

Browse source
This commit is contained in:
DizzyEggg 2018-08-25 18:46:15 +02:00
parent 91349324c6
commit 62a645abaf
9 changed files with 583 additions and 1754 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1661
asm/battle_frontier_1.s
View file

File diff suppressed because it is too large Load diff

36
asm/battle_frontier_2.s
View file

@ -14195,7 +14195,7 @@ sub_81A1B1C: @ 81A1B1C
thumb_func_start sub_81A1B28 thumb_func_start sub_81A1B28
sub_81A1B28: @ 81A1B28 sub_81A1B28: @ 81A1B28
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers ldr r0, =gBattleFrontierTrainers
str r0, [r1] str r0, [r1]
bx lr bx lr
@ -17391,7 +17391,7 @@ _081A370C:
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r3, r0 cmp r3, r0
bhi _081A3738 bhi _081A3738
ldr r2, =gUnknown_0203BC88 ldr r2, =gFacilityTrainers
movs r0, 0x34 movs r0, 0x34
adds r1, r3, 0 adds r1, r3, 0
muls r1, r0 muls r1, r0
@ -17443,7 +17443,7 @@ _081A3794:
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r3, r0 cmp r3, r0
bhi _081A37B8 bhi _081A37B8
ldr r2, =gUnknown_0203BC88 ldr r2, =gFacilityTrainers
movs r0, 0x34 movs r0, 0x34
adds r1, r3, 0 adds r1, r3, 0
muls r1, r0 muls r1, r0
@ -17511,7 +17511,7 @@ _081A3844:
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r3, r0 cmp r3, r0
bhi _081A3868 bhi _081A3868
ldr r2, =gUnknown_0203BC88 ldr r2, =gFacilityTrainers
movs r0, 0x34 movs r0, 0x34
adds r1, r3, 0 adds r1, r3, 0
muls r1, r0 muls r1, r0
@ -20046,7 +20046,7 @@ sub_81A4E04: @ 81A4E04
cmp r0, 0x1 cmp r0, 0x1
bne _081A4E44 bne _081A4E44
ldr r0, =0x000003fe ldr r0, =0x000003fe
bl sub_81953A0 bl TrainerIdToDomeTournamentId
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl GetTrainerMonCountInBits bl GetTrainerMonCountInBits
@ -22329,7 +22329,7 @@ sub_81A61B0: @ 81A61B0
ldrh r0, [r1] ldrh r0, [r1]
movs r1, 0x7 movs r1, 0x7
bl __udivsi3 bl __udivsi3
ldr r2, =gUnknown_0203BC88 ldr r2, =gFacilityTrainers
ldr r1, =gBattleFrontierTrainers ldr r1, =gBattleFrontierTrainers
str r1, [r2] str r1, [r2]
ldr r5, =0x00000cb2 ldr r5, =0x00000cb2
@ -23050,7 +23050,7 @@ sub_81A67EC: @ 81A67EC
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
sub sp, 0x4C sub sp, 0x4C
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers ldr r0, =gBattleFrontierTrainers
str r0, [r1] str r0, [r1]
mov r0, sp mov r0, sp
@ -26455,7 +26455,7 @@ _081A831A:
bne _081A82D2 bne _081A82D2
ldr r5, =gTrainerBattleOpponent_A ldr r5, =gTrainerBattleOpponent_A
strh r4, [r5] strh r4, [r5]
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers ldr r0, =gBattleFrontierTrainers
str r0, [r1] str r0, [r1]
ldrh r0, [r5] ldrh r0, [r5]
@ -26500,7 +26500,7 @@ sub_81A8374: @ 81A8374
bl __udivsi3 bl __udivsi3
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers ldr r0, =gBattleFrontierTrainers
str r0, [r1] str r0, [r1]
lsls r7, r5, 24 lsls r7, r5, 24
@ -26667,7 +26667,7 @@ sub_81A84EC: @ 81A84EC
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r1, r0 cmp r1, r0
bhi _081A8542 bhi _081A8542
ldr r2, =gUnknown_0203BC88 ldr r2, =gFacilityTrainers
movs r0, 0x34 movs r0, 0x34
muls r1, r0 muls r1, r0
ldr r0, [r2] ldr r0, [r2]
@ -26684,7 +26684,7 @@ _081A8524:
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r1, r0 cmp r1, r0
bhi _081A8542 bhi _081A8542
ldr r2, =gUnknown_0203BC88 ldr r2, =gFacilityTrainers
movs r0, 0x34 movs r0, 0x34
muls r1, r0 muls r1, r0
ldr r0, [r2] ldr r0, [r2]
@ -28498,7 +28498,7 @@ _081A940A:
thumb_func_start sub_81A9414 thumb_func_start sub_81A9414
sub_81A9414: @ 81A9414 sub_81A9414: @ 81A9414
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers ldr r0, =gBattleFrontierTrainers
str r0, [r1] str r0, [r1]
bx lr bx lr
@ -28534,7 +28534,7 @@ sub_81A9424: @ 81A9424
lsrs r5, r0, 16 lsrs r5, r0, 16
movs r6, 0 movs r6, 0
ldr r2, =gUnknown_08613C1C ldr r2, =gUnknown_08613C1C
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r5 muls r0, r5
@ -28554,7 +28554,7 @@ _081A9488:
ldr r4, =gUnknown_08613C1C ldr r4, =gUnknown_08613C1C
lsls r3, r6, 1 lsls r3, r6, 1
adds r2, r3, r4 adds r2, r3, r4
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r5 muls r0, r5
@ -29795,7 +29795,7 @@ sub_81A9EDC: @ 81A9EDC
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r2, =gUnknown_0203BC88 ldr r2, =gFacilityTrainers
movs r1, 0x34 movs r1, 0x34
muls r1, r0 muls r1, r0
ldr r0, [r2] ldr r0, [r2]
@ -29812,7 +29812,7 @@ sub_81A9EFC: @ 81A9EFC
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r2, =gUnknown_0203BC88 ldr r2, =gFacilityTrainers
movs r1, 0x34 movs r1, 0x34
muls r1, r0 muls r1, r0
ldr r0, [r2] ldr r0, [r2]
@ -29829,7 +29829,7 @@ sub_81A9F1C: @ 81A9F1C
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r2, =gUnknown_0203BC88 ldr r2, =gFacilityTrainers
movs r1, 0x34 movs r1, 0x34
muls r1, r0 muls r1, r0
ldr r0, [r2] ldr r0, [r2]
@ -29848,7 +29848,7 @@ GetTrainerEncounterMusicIdInBattlePyramind: @ 81A9F3C
lsrs r0, 16 lsrs r0, 16
movs r4, 0 movs r4, 0
ldr r3, =gFacilityClassToTrainerClass ldr r3, =gFacilityClassToTrainerClass
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r2, [r1] ldr r2, [r1]
movs r1, 0x34 movs r1, 0x34
muls r0, r1 muls r0, r1

6
asm/battle_tent.s
View file

@ -14,7 +14,7 @@ sub_81B9EC0: @ 81B9EC0
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
sub sp, 0x3C sub sp, 0x3C
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gSlateportBattleTentTrainers ldr r0, =gSlateportBattleTentTrainers
str r0, [r1] str r0, [r1]
add r0, sp, 0xC add r0, sp, 0xC
@ -205,7 +205,7 @@ sub_81BA040: @ 81BA040
sub sp, 0x10 sub sp, 0x10
movs r0, 0 movs r0, 0
mov r10, r0 mov r10, r0
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gSlateportBattleTentTrainers ldr r0, =gSlateportBattleTentTrainers
str r0, [r1] str r0, [r1]
ldr r1, =gFacilityTrainerMons ldr r1, =gFacilityTrainerMons
@ -261,7 +261,7 @@ _081BA0AA:
ldr r2, =gTrainerBattleOpponent_A ldr r2, =gTrainerBattleOpponent_A
strh r3, [r2] strh r3, [r2]
ldrh r3, [r2] ldrh r3, [r2]
ldr r4, =gUnknown_0203BC88 ldr r4, =gFacilityTrainers
ldr r1, [r4] ldr r1, [r4]
movs r0, 0x34 movs r0, 0x34
muls r0, r3 muls r0, r3

36
asm/battle_tower.s
View file

@ -806,7 +806,7 @@ _08162650:
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r4, r0 cmp r4, r0
bhi _0816266C bhi _0816266C
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r4 muls r0, r4
@ -977,7 +977,7 @@ _081627CC:
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r4, r0 cmp r4, r0
bhi _081627E8 bhi _081627E8
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r4 muls r0, r4
@ -1363,7 +1363,7 @@ _08162AE4:
cmp r4, r0 cmp r4, r0
bhi _08162B08 bhi _08162B08
ldr r2, =gFacilityClassToPicIndex ldr r2, =gFacilityClassToPicIndex
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r4 muls r0, r4
@ -1500,7 +1500,7 @@ _08162C38:
cmp r4, r0 cmp r4, r0
bhi _08162C60 bhi _08162C60
ldr r2, =gFacilityClassToTrainerClass ldr r2, =gFacilityClassToTrainerClass
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r4 muls r0, r4
@ -1617,7 +1617,7 @@ _08162D5C:
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r4, r0 cmp r4, r0
bhi _08162D78 bhi _08162D78
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r4 muls r0, r4
@ -1751,7 +1751,7 @@ _08162E88:
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r5, r0 cmp r5, r0
bhi _08162EB4 bhi _08162EB4
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r5 muls r0, r5
@ -1878,7 +1878,7 @@ _08162FA4:
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r4, r0 cmp r4, r0
bhi _08162FC0 bhi _08162FC0
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r4 muls r0, r4
@ -2039,7 +2039,7 @@ sub_81630C4: @ 81630C4
str r0, [sp, 0x24] str r0, [sp, 0x24]
ldr r0, =gTrainerBattleOpponent_A ldr r0, =gTrainerBattleOpponent_A
ldrh r2, [r0] ldrh r2, [r0]
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r2 muls r0, r2
@ -2554,7 +2554,7 @@ RandomizeFacilityTrainerMonId: @ 8163524
bl GetFrontierEnemyMonLevel bl GetFrontierEnemyMonLevel
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r4 muls r0, r4
@ -3054,7 +3054,7 @@ _08163950:
ldr r0, =0x0000012b ldr r0, =0x0000012b
cmp r3, r0 cmp r3, r0
bhi _08163974 bhi _08163974
ldr r2, =gUnknown_0203BC88 ldr r2, =gFacilityTrainers
movs r0, 0x34 movs r0, 0x34
adds r1, r3, 0 adds r1, r3, 0
muls r1, r0 muls r1, r0
@ -4116,7 +4116,7 @@ _0816431A:
ldrh r0, [r1] ldrh r0, [r1]
cmp r0, r8 cmp r0, r8
beq _08164368 beq _08164368
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r2, [r0] ldr r2, [r0]
movs r4, 0x34 movs r4, 0x34
mov r0, r8 mov r0, r8
@ -6354,7 +6354,7 @@ _08165634:
movs r0, 0 movs r0, 0
str r0, [sp, 0x44] str r0, [sp, 0x44]
movs r2, 0 movs r2, 0
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r7 muls r0, r7
@ -7095,7 +7095,7 @@ GetFrontierEnemyMonLevel: @ 8165C40
ands r0, r1 ands r0, r1
cmp r0, 0x2 cmp r0, 0x2
beq _08165C84 beq _08165C84
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers ldr r0, =gBattleFrontierTrainers
str r0, [r1] str r0, [r1]
ldr r1, =gFacilityTrainerMons ldr r1, =gFacilityTrainerMons
@ -7255,7 +7255,7 @@ sub_8165D78: @ 8165D78
lsrs r0, 16 lsrs r0, 16
cmp r0, 0x4 cmp r0, 0x4
bne _08165DA8 bne _08165DA8
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gSlateportBattleTentTrainers ldr r0, =gSlateportBattleTentTrainers
str r0, [r1] str r0, [r1]
ldr r1, =gFacilityTrainerMons ldr r1, =gFacilityTrainerMons
@ -7265,7 +7265,7 @@ sub_8165D78: @ 8165D78
_08165DA8: _08165DA8:
cmp r0, 0x2 cmp r0, 0x2
bne _08165DC8 bne _08165DC8
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gVerdanturfBattleTentTrainers ldr r0, =gVerdanturfBattleTentTrainers
str r0, [r1] str r0, [r1]
ldr r1, =gFacilityTrainerMons ldr r1, =gFacilityTrainerMons
@ -7275,7 +7275,7 @@ _08165DA8:
_08165DC8: _08165DC8:
cmp r0, 0x3 cmp r0, 0x3
bne _08165DE8 bne _08165DE8
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gFallarborBattleTentTrainers ldr r0, =gFallarborBattleTentTrainers
str r0, [r1] str r0, [r1]
ldr r1, =gFacilityTrainerMons ldr r1, =gFacilityTrainerMons
@ -7283,7 +7283,7 @@ _08165DC8:
b _08165DF2 b _08165DF2
.pool .pool
_08165DE8: _08165DE8:
ldr r1, =gUnknown_0203BC88 ldr r1, =gFacilityTrainers
ldr r0, =gBattleFrontierTrainers ldr r0, =gBattleFrontierTrainers
str r0, [r1] str r0, [r1]
ldr r1, =gFacilityTrainerMons ldr r1, =gFacilityTrainerMons
@ -7390,7 +7390,7 @@ sub_8165EA4: @ 8165EA4
str r0, [sp, 0x20] str r0, [sp, 0x20]
ldr r0, =gTrainerBattleOpponent_A ldr r0, =gTrainerBattleOpponent_A
ldrh r2, [r0] ldrh r2, [r0]
ldr r0, =gUnknown_0203BC88 ldr r0, =gFacilityTrainers
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x34 movs r0, 0x34
muls r0, r2 muls r0, r2

6
include/battle_tower.h
View file

@ -24,7 +24,7 @@ union BattleTowerRecord
struct BattleFrontierTrainer struct BattleFrontierTrainer
{ {
u32 trainerClass; u32 facilityClass;
u8 trainerName[8]; u8 trainerName[8];
u16 speechBefore[6]; u16 speechBefore[6];
u16 speechWin[6]; u16 speechWin[6];
@ -32,7 +32,7 @@ struct BattleFrontierTrainer
u16 *btMonPool; u16 *btMonPool;
}; };
extern struct BattleFrontierTrainer *gUnknown_0203BC88; extern const struct BattleFrontierTrainer *gFacilityTrainers;
u16 sub_8164FCC(u8, u8); u16 sub_8164FCC(u8, u8);
void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1);
@ -40,7 +40,7 @@ bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *);
void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *);
void sub_81628A0(union BattleTowerRecord *); void sub_81628A0(union BattleTowerRecord *);
void sub_8162614(u16 trainerId, u8); void sub_8162614(u16 trainerId, u8);
void ConvertBattleFrontierTrainerSpeechToString(u16 *words); void ConvertBattleFrontierTrainerSpeechToString(const u16 *words);
void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); void GetFrontierTrainerName(u8 *dest, u16 trainerIdx);
void GetEreaderTrainerName(u8 *dest); void GetEreaderTrainerName(u8 *dest);

4
include/global.h
View file

@ -340,8 +340,8 @@ struct FrontierMonData
struct BattleDomeTrainer struct BattleDomeTrainer
{ {
u16 trainerId:10; u16 trainerId:10;
u16 unk1:1; u16 isEliminated:1;
u16 unk2:2; u16 eliminatedAt:2;
u16 unk3:3; u16 unk3:3;
}; };

581
src/battle_frontier_1.c
View file

@ -2,6 +2,7 @@
#include "battle.h" #include "battle.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "battle_frontier_1.h" #include "battle_frontier_1.h"
#include "battle_tower.h"
#include "battle_message.h" #include "battle_message.h"
#include "event_data.h" #include "event_data.h"
#include "overworld.h" #include "overworld.h"
@ -37,7 +38,7 @@
#define DOME_FINAL 3 #define DOME_FINAL 3
#define DOME_ROUNDS_COUNT 4 #define DOME_ROUNDS_COUNT 4
struct Unknown_0203BC8C_Struct struct FacilityMon
{ {
u16 species; u16 species;
u16 moves[4]; u16 moves[4];
@ -68,6 +69,7 @@ extern bool8 sub_81A3610(void);
extern u16 sub_81A4FF0(u8); extern u16 sub_81A4FF0(u8);
extern u8 GetFrontierTrainerFrontSpriteId(u16); extern u8 GetFrontierTrainerFrontSpriteId(u16);
extern u8 GetFrontierOpponentClass(u16); extern u8 GetFrontierOpponentClass(u16);
extern void sub_80F94E8(void);
extern u8 gUnknown_0203CEF8[]; extern u8 gUnknown_0203CEF8[];
extern u32 gUnknown_0203CD70; extern u32 gUnknown_0203CD70;
@ -80,7 +82,7 @@ extern u16 gBattle_BG2_X;
extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_Y;
extern u16 gBattle_BG3_X; extern u16 gBattle_BG3_X;
extern u16 gBattle_BG3_Y; extern u16 gBattle_BG3_Y;
extern struct Unknown_0203BC8C_Struct *gFacilityTrainerMons; extern const struct FacilityMon *gFacilityTrainerMons;
extern struct Unknown_0203CD78_Struct *gUnknown_0203CD78; extern struct Unknown_0203CD78_Struct *gUnknown_0203CD78;
extern u8 *gUnknown_0203CD7C; extern u8 *gUnknown_0203CD7C;
@ -97,7 +99,7 @@ extern const struct SpriteTemplate gUnknown_0860D068;
extern const struct SpriteTemplate gUnknown_0860D050; extern const struct SpriteTemplate gUnknown_0860D050;
extern const u8 gUnknown_0860D080[]; extern const u8 gUnknown_0860D080[];
extern const u8 gUnknown_0860D15C[]; extern const u8 gUnknown_0860D15C[];
extern const u8 gUnknown_0860D1A0[]; extern const u8 gUnknown_0860D1A0[][4];
extern const u8 gUnknown_0860D19C[]; extern const u8 gUnknown_0860D19C[];
extern const u8 gUnknown_0860D349[]; extern const u8 gUnknown_0860D349[];
extern const u8 gUnknown_0860D1C0[]; extern const u8 gUnknown_0860D1C0[];
@ -120,6 +122,8 @@ extern const u8 *const gBattleDomeOpponentStylePointers[];
extern const u8 *const gBattleDomeOpponentStatsPointers[]; extern const u8 *const gBattleDomeOpponentStatsPointers[];
extern const u8 *const gBattleDomeWinStringsPointers[]; extern const u8 *const gBattleDomeWinStringsPointers[];
extern const u8 *const gBattleDomeMatchNumberPointers[]; extern const u8 *const gBattleDomeMatchNumberPointers[];
extern const struct FacilityMon gBattleFrontierMons[];
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
// gfx // gfx
extern const u8 gUnknown_08D83D50[]; extern const u8 gUnknown_08D83D50[];
@ -142,7 +146,7 @@ u8 GetDomeTrainerMonIvs(u16 trainerId);
void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray); void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray);
void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 *stats); void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 *stats);
void CreateDomeTrainerMons(u16 tournamentTrainerId); void CreateDomeTrainerMons(u16 tournamentTrainerId);
s32 TrainerIdToTournamentId(u16 trainerId); static s32 TrainerIdToTournamentId(u16 trainerId);
s32 GetTrainerMonCountInBits(u16 tournamentTrainerId); s32 GetTrainerMonCountInBits(u16 tournamentTrainerId);
s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1); s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1);
s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1); s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1);
@ -154,7 +158,7 @@ void sub_8190CD4(u8 taskId);
void sub_8194220(u8 taskId); void sub_8194220(u8 taskId);
void sub_8194950(u8 taskId); void sub_8194950(u8 taskId);
static void CB2_BattleDome(void); static void CB2_BattleDome(void);
void sub_8194B70(void); static void VblankCb0_BattleDome(void);
static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo); static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo);
static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId); static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId);
u8 sub_819221C(u8 taskId); u8 sub_819221C(u8 taskId);
@ -165,9 +169,9 @@ void CopyDomeBrainTrainerName(u8 *dst);
void CopyDomeTrainerName(u8 *dst, u16 trainerId); void CopyDomeTrainerName(u8 *dst, u16 trainerId);
void sub_8194D48(void); void sub_8194D48(void);
void sub_8194BEC(void); void sub_8194BEC(void);
void sub_8194CE4(void); static void VblankCb1_BattleDome(void);
u8 sub_8193BDC(u8 taskId); u8 sub_8193BDC(u8 taskId);
void sub_8195438(u8 roundId); void DecideRoundWinners(u8 roundId);
u8 sub_81953E8(u8 tournamentId, u8); u8 sub_81953E8(u8 tournamentId, u8);
void sub_81948EC(u8, u8); void sub_81948EC(u8, u8);
@ -709,8 +713,8 @@ void InitDomeTrainers(void)
gSaveBlock2Ptr->frontier.field_D0A = gSaveBlock2Ptr->frontier.chosenLvl + 1; gSaveBlock2Ptr->frontier.field_D0A = gSaveBlock2Ptr->frontier.chosenLvl + 1;
gSaveBlock2Ptr->frontier.field_D0B = VarGet(VAR_0x40CE) + 1; gSaveBlock2Ptr->frontier.field_D0B = VarGet(VAR_0x40CE) + 1;
gSaveBlock2Ptr->frontier.domeTrainers[0].trainerId = TRAINER_PLAYER; gSaveBlock2Ptr->frontier.domeTrainers[0].trainerId = TRAINER_PLAYER;
gSaveBlock2Ptr->frontier.domeTrainers[0].unk1 = 0; gSaveBlock2Ptr->frontier.domeTrainers[0].isEliminated = 0;
gSaveBlock2Ptr->frontier.domeTrainers[0].unk2 = 0; gSaveBlock2Ptr->frontier.domeTrainers[0].eliminatedAt = 0;
gSaveBlock2Ptr->frontier.domeTrainers[0].unk3 = 0; gSaveBlock2Ptr->frontier.domeTrainers[0].unk3 = 0;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
@ -774,8 +778,8 @@ void InitDomeTrainers(void)
species[j] = gFacilityTrainerMons[monTournamentId].species; species[j] = gFacilityTrainerMons[monTournamentId].species;
} }
gSaveBlock2Ptr->frontier.domeTrainers[i].unk1 = 0; gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated = 0;
gSaveBlock2Ptr->frontier.domeTrainers[i].unk2 = 0; gSaveBlock2Ptr->frontier.domeTrainers[i].eliminatedAt = 0;
gSaveBlock2Ptr->frontier.domeTrainers[i].unk3 = 0; gSaveBlock2Ptr->frontier.domeTrainers[i].unk3 = 0;
} }
@ -1575,7 +1579,7 @@ s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId)
for (j = gUnknown_0860D10C[i][roundId]; j < val; j++) for (j = gUnknown_0860D10C[i][roundId]; j < val; j++)
{ {
if (gUnknown_0860D14C[j] != i && !gSaveBlock2Ptr->frontier.domeTrainers[gUnknown_0860D14C[j]].unk1) if (gUnknown_0860D14C[j] != i && !gSaveBlock2Ptr->frontier.domeTrainers[gUnknown_0860D14C[j]].isEliminated)
break; break;
} }
@ -1586,8 +1590,8 @@ s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId)
} }
else else
{ {
if (!gSaveBlock2Ptr->frontier.domeTrainers[gUnknown_0860D10C[i][0]].unk1) if (!gSaveBlock2Ptr->frontier.domeTrainers[gUnknown_0860D10C[i][roundId]].isEliminated)
return gUnknown_0860D10C[i][0]; return gUnknown_0860D10C[i][roundId];
else else
return 0xFF; return 0xFF;
} }
@ -1707,7 +1711,7 @@ void sub_8190400(u8 taskId)
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 3: case 3:
SetVBlankCallback(sub_8194B70); SetVBlankCallback(VblankCb0_BattleDome);
gUnknown_0203CD78 = AllocZeroed(sizeof(*gUnknown_0203CD78)); gUnknown_0203CD78 = AllocZeroed(sizeof(*gUnknown_0203CD78));
for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
gUnknown_0203CD78->arr[i] |= 0xFF; gUnknown_0203CD78->arr[i] |= 0xFF;
@ -1945,12 +1949,12 @@ void sub_8190B40(struct Sprite *sprite)
{ {
if (sprite->data[1]) if (sprite->data[1])
{ {
if ((gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].unk1 if ((gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].isEliminated
&& gUnknown_0203CD78->unk_10 - 1 < gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].unk2)) && gUnknown_0203CD78->unk_10 - 1 < gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].eliminatedAt))
{ {
sprite->invisible = 0; sprite->invisible = 0;
} }
else if (!gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].unk1 else if (!gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].isEliminated
&& gUnknown_0203CD78->unk_10 - 1 < r12) && gUnknown_0203CD78->unk_10 - 1 < r12)
{ {
sprite->invisible = 0; sprite->invisible = 0;
@ -2788,12 +2792,12 @@ u8 sub_819221C(u8 taskId)
} }
else if (gMain.newKeys & DPAD_RIGHT) else if (gMain.newKeys & DPAD_RIGHT)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[r10].unk1 && gUnknown_0203CD78->unk_10 - 1 < gSaveBlock2Ptr->frontier.domeTrainers[r10].unk2) if (gSaveBlock2Ptr->frontier.domeTrainers[r10].isEliminated && gUnknown_0203CD78->unk_10 - 1 < gSaveBlock2Ptr->frontier.domeTrainers[r10].eliminatedAt)
{ {
gUnknown_0203CD78->unk_10++; gUnknown_0203CD78->unk_10++;
retVal = 4; retVal = 4;
} }
if (!gSaveBlock2Ptr->frontier.domeTrainers[r10].unk1 && gUnknown_0203CD78->unk_10 - 1 < roundId) if (!gSaveBlock2Ptr->frontier.domeTrainers[r10].isEliminated && gUnknown_0203CD78->unk_10 - 1 < roundId)
{ {
gUnknown_0203CD78->unk_10++; gUnknown_0203CD78->unk_10++;
retVal = 4; retVal = 4;
@ -2803,7 +2807,7 @@ u8 sub_819221C(u8 taskId)
if (retVal == 9) if (retVal == 9)
{ {
if (gUnknown_0203CD78->unk_10 != 0) if (gUnknown_0203CD78->unk_10 != 0)
gTasks[taskId2].data[1] = gUnknown_0860D1A0[(r5 / 2) * 4 + (gUnknown_0203CD78->unk_10 - 1)]; gTasks[taskId2].data[1] = gUnknown_0860D1A0[r5 / 2][gUnknown_0203CD78->unk_10 - 1];
else else
gTasks[taskId2].data[1] = r5; gTasks[taskId2].data[1] = r5;
} }
@ -3230,7 +3234,7 @@ s32 sub_8192F08(u8 arg0, u8 *arg1)
for (i = gUnknown_0860D3C4[arg0][0]; i < gUnknown_0860D3C4[arg0][0] + gUnknown_0860D3C4[arg0][1]; i++) for (i = gUnknown_0860D3C4[arg0][0]; i < gUnknown_0860D3C4[arg0][0] + gUnknown_0860D3C4[arg0][1]; i++)
{ {
tournamentId = gUnknown_0860D3B4[i]; tournamentId = gUnknown_0860D3B4[i];
if (!gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].unk1) if (!gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].isEliminated)
{ {
arg1[count] = tournamentId; arg1[count] = tournamentId;
if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].trainerId == TRAINER_PLAYER) if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].trainerId == TRAINER_PLAYER)
@ -3249,12 +3253,12 @@ s32 sub_8192F08(u8 arg0, u8 *arg1)
for (i = gUnknown_0860D3C4[arg0][0]; i < gUnknown_0860D3C4[arg0][0] + gUnknown_0860D3C4[arg0][1]; i++) for (i = gUnknown_0860D3C4[arg0][0]; i < gUnknown_0860D3C4[arg0][0] + gUnknown_0860D3C4[arg0][1]; i++)
{ {
tournamentId = gUnknown_0860D3B4[i]; tournamentId = gUnknown_0860D3B4[i];
if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].unk1 if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].isEliminated
&& gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].unk2 >= gUnknown_0860D3C4[arg0][2]) && gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].eliminatedAt >= gUnknown_0860D3C4[arg0][2])
{ {
arg1[count] = tournamentId; arg1[count] = tournamentId;
count++; count++;
if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].unk2 == gUnknown_0860D3C4[arg0][2]) if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].eliminatedAt == gUnknown_0860D3C4[arg0][2])
{ {
StringCopy(gStringVar2, gMoveNames[gSaveBlock2Ptr->frontier.field_EC0[tournamentId]]); StringCopy(gStringVar2, gMoveNames[gSaveBlock2Ptr->frontier.field_EC0[tournamentId]]);
retVal = gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].unk3 * 2; retVal = gSaveBlock2Ptr->frontier.domeTrainers[tournamentId].unk3 * 2;
@ -3312,8 +3316,8 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
{ {
tournamentIds[i] = gUnknown_0203CD78->unk_11[i]; tournamentIds[i] = gUnknown_0203CD78->unk_11[i];
trainerIds[i] = gSaveBlock2Ptr->frontier.domeTrainers[tournamentIds[i]].trainerId; trainerIds[i] = gSaveBlock2Ptr->frontier.domeTrainers[tournamentIds[i]].trainerId;
if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentIds[i]].unk2 <= gUnknown_0860D3C4[matchNo][2] if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentIds[i]].eliminatedAt <= gUnknown_0860D3C4[matchNo][2]
&& gSaveBlock2Ptr->frontier.domeTrainers[tournamentIds[i]].unk1) && gSaveBlock2Ptr->frontier.domeTrainers[tournamentIds[i]].isEliminated)
lost[i] = TRUE; lost[i] = TRUE;
else else
lost[i] = FALSE; lost[i] = FALSE;
@ -3669,21 +3673,21 @@ void sub_8193D7C(void)
if (gSpecialVar_0x8005 == 1) if (gSpecialVar_0x8005 == 1)
{ {
gSaveBlock2Ptr->frontier.domeTrainers[TrainerIdToTournamentId(gTrainerBattleOpponent_A)].unk1 = 1; gSaveBlock2Ptr->frontier.domeTrainers[TrainerIdToTournamentId(gTrainerBattleOpponent_A)].isEliminated = 1;
gSaveBlock2Ptr->frontier.domeTrainers[TrainerIdToTournamentId(gTrainerBattleOpponent_A)].unk2 = gSaveBlock2Ptr->frontier.field_CB2; gSaveBlock2Ptr->frontier.domeTrainers[TrainerIdToTournamentId(gTrainerBattleOpponent_A)].eliminatedAt = gSaveBlock2Ptr->frontier.field_CB2;
gSaveBlock2Ptr->frontier.field_EC0[TrainerIdToTournamentId(gTrainerBattleOpponent_A)] = gBattleResults.lastUsedMovePlayer; gSaveBlock2Ptr->frontier.field_EC0[TrainerIdToTournamentId(gTrainerBattleOpponent_A)] = gBattleResults.lastUsedMovePlayer;
if (gSaveBlock2Ptr->frontier.field_CB2 < DOME_FINAL) if (gSaveBlock2Ptr->frontier.field_CB2 < DOME_FINAL)
sub_8195438(gSaveBlock2Ptr->frontier.field_CB2); DecideRoundWinners(gSaveBlock2Ptr->frontier.field_CB2);
} }
else else
{ {
gSaveBlock2Ptr->frontier.domeTrainers[TrainerIdToTournamentId(TRAINER_PLAYER)].unk1 = 1; gSaveBlock2Ptr->frontier.domeTrainers[TrainerIdToTournamentId(TRAINER_PLAYER)].isEliminated = 1;
gSaveBlock2Ptr->frontier.domeTrainers[TrainerIdToTournamentId(TRAINER_PLAYER)].unk2 = gSaveBlock2Ptr->frontier.field_CB2; gSaveBlock2Ptr->frontier.domeTrainers[TrainerIdToTournamentId(TRAINER_PLAYER)].eliminatedAt = gSaveBlock2Ptr->frontier.field_CB2;
gSaveBlock2Ptr->frontier.field_EC0[TrainerIdToTournamentId(TRAINER_PLAYER)] = gBattleResults.lastUsedMoveOpponent; gSaveBlock2Ptr->frontier.field_EC0[TrainerIdToTournamentId(TRAINER_PLAYER)] = gBattleResults.lastUsedMoveOpponent;
if (gBattleOutcome == B_OUTCOME_FORFEITED || gSpecialVar_0x8005 == 9) if (gBattleOutcome == B_OUTCOME_FORFEITED || gSpecialVar_0x8005 == 9)
gSaveBlock2Ptr->frontier.domeTrainers[TrainerIdToTournamentId(TRAINER_PLAYER)].unk3 = 1; gSaveBlock2Ptr->frontier.domeTrainers[TrainerIdToTournamentId(TRAINER_PLAYER)].unk3 = 1;
for (i = gSaveBlock2Ptr->frontier.field_CB2; i < DOME_ROUNDS_COUNT; i++) for (i = gSaveBlock2Ptr->frontier.field_CB2; i < DOME_ROUNDS_COUNT; i++)
sub_8195438(i); DecideRoundWinners(i);
} }
} }
@ -3908,11 +3912,11 @@ void sub_8194220(u8 taskId)
CopyDomeTrainerName(gDisplayedStringBattle, gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); CopyDomeTrainerName(gDisplayedStringBattle, gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
if (r10 == 1) if (r10 == 1)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[i].unk1) if (gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[i].unk2 != 0) if (gSaveBlock2Ptr->frontier.domeTrainers[i].eliminatedAt != 0)
{ {
var2 = gSaveBlock2Ptr->frontier.domeTrainers[i].unk2 - 1; var2 = gSaveBlock2Ptr->frontier.domeTrainers[i].eliminatedAt - 1;
sub_81948EC(i, var2); sub_81948EC(i, var2);
} }
} }
@ -3923,11 +3927,11 @@ void sub_8194220(u8 taskId)
} }
else if (r10 == 0) else if (r10 == 0)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[i].unk1) if (gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[i].unk2 != 0) if (gSaveBlock2Ptr->frontier.domeTrainers[i].eliminatedAt != 0)
{ {
var2 = gSaveBlock2Ptr->frontier.domeTrainers[i].unk2 - 1; var2 = gSaveBlock2Ptr->frontier.domeTrainers[i].eliminatedAt - 1;
sub_81948EC(i, var2); sub_81948EC(i, var2);
} }
} }
@ -3946,9 +3950,9 @@ void sub_8194220(u8 taskId)
else else
var = gSaveBlock2Ptr->frontier.field_CB2 - 1; var = gSaveBlock2Ptr->frontier.field_CB2 - 1;
if ( ((r10 == 1 && gSaveBlock2Ptr->frontier.domeTrainers[i].unk2 < gSaveBlock2Ptr->frontier.field_CB2 - 1) if ( ((r10 == 1 && gSaveBlock2Ptr->frontier.domeTrainers[i].eliminatedAt < gSaveBlock2Ptr->frontier.field_CB2 - 1)
|| (r10 == 0 && gSaveBlock2Ptr->frontier.domeTrainers[i].unk2 <= var)) || (r10 == 0 && gSaveBlock2Ptr->frontier.domeTrainers[i].eliminatedAt <= var))
&& gSaveBlock2Ptr->frontier.domeTrainers[i].unk1) && gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated)
{ {
if (gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId == TRAINER_PLAYER) if (gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId == TRAINER_PLAYER)
{ {
@ -3994,7 +3998,7 @@ void sub_8194220(u8 taskId)
CopyWindowToVram(1, 3); CopyWindowToVram(1, 3);
CopyWindowToVram(2, 3); CopyWindowToVram(2, 3);
SetHBlankCallback(sub_8194BEC); SetHBlankCallback(sub_8194BEC);
SetVBlankCallback(sub_8194CE4); SetVBlankCallback(VblankCb1_BattleDome);
if (r4 == 2) if (r4 == 2)
{ {
if (r10 == 0) if (r10 == 0)
@ -4082,8 +4086,8 @@ void sub_8194950(u8 taskId)
for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
{ {
CopyDomeTrainerName(gDisplayedStringBattle, gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); CopyDomeTrainerName(gDisplayedStringBattle, gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
if (gSaveBlock2Ptr->frontier.domeTrainers[i].unk2 == gSaveBlock2Ptr->frontier.field_CB2 - 1 if (gSaveBlock2Ptr->frontier.domeTrainers[i].eliminatedAt == gSaveBlock2Ptr->frontier.field_CB2 - 1
&& gSaveBlock2Ptr->frontier.domeTrainers[i].unk1) && gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated)
{ {
if (gUnknown_0860D3F1[i][0] == 0) if (gUnknown_0860D3F1[i][0] == 0)
textPrinter.currentX = GetStringWidthDifference(textPrinter.fontId, gDisplayedStringBattle, 0x3D, textPrinter.letterSpacing); textPrinter.currentX = GetStringWidthDifference(textPrinter.fontId, gDisplayedStringBattle, 0x3D, textPrinter.letterSpacing);
@ -4095,7 +4099,7 @@ void sub_8194950(u8 taskId)
textPrinter.currentY = gUnknown_0860D3F1[i][1]; textPrinter.currentY = gUnknown_0860D3F1[i][1];
AddTextPrinter(&textPrinter, 0, NULL); AddTextPrinter(&textPrinter, 0, NULL);
} }
if (!gSaveBlock2Ptr->frontier.domeTrainers[i].unk1) if (!gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated)
{ {
s32 var = gSaveBlock2Ptr->frontier.field_CB2 - 1; s32 var = gSaveBlock2Ptr->frontier.field_CB2 - 1;
sub_81948EC(i, var); sub_81948EC(i, var);
@ -4132,3 +4136,488 @@ static void CB2_BattleDome(void)
UpdatePaletteFade(); UpdatePaletteFade();
RunTasks(); RunTasks();
} }
static void VblankCb0_BattleDome(void)
{
ChangeBgX(3, 0x80, 1);
ChangeBgY(3, 0x80, 2);
SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_X);
SetGpuReg(REG_OFFSET_BG0VOFS, gBattle_BG0_Y);
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X);
SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y);
LoadOam();
ProcessSpriteCopyRequests();
TransferPlttBuffer();
}
#define SET_WIN0H_WIN1H(win0H, win1H) \
{ \
*(vu32*)(REG_ADDR_WIN0H) = ((win0H << 16) | (win1H)); \
}
void sub_8194BEC(void)
{
register u32 vCount asm("r0") = REG_VCOUNT;
register u32 vCount_ asm("r1") = vCount;
if (vCount > 41)
{
if (vCount < 50)
{
REG_WININ = 0x3B3B;
SET_WIN0H_WIN1H(0x989B, 0x5558);
return;
}
else if (vCount > 57)
{
if (vCount < 75)
{
REG_WININ = 0x3B3B;
SET_WIN0H_WIN1H(0x9098, 0x5860);
return;
}
else if (vCount < 82)
{
REG_WININ = 0x3B3B;
SET_WIN0H_WIN1H(0x989B, 0x5558);
return;
}
else if (vCount > 94)
{
if (vCount < 103)
{
REG_WININ = 0x3737;
SET_WIN0H_WIN1H(0x989B, 0x5558);
return;
}
else if (vCount < 119)
{
REG_WININ = 0x3737;
SET_WIN0H_WIN1H(0x9098, 0x5860);
return;
}
else if (vCount > 126)
{
if (vCount_ < 135)
{
REG_WININ = 0x3737;
SET_WIN0H_WIN1H(0x989B, 0x5558);
return;
}
}
}
}
}
REG_WININ = 0x3F3F;
SET_WIN0H_WIN1H(0, 0);
}
static void VblankCb1_BattleDome(void)
{
SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_X);
SetGpuReg(REG_OFFSET_BG0VOFS, gBattle_BG0_Y);
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
ChangeBgY(2, 0x80, 2);
ChangeBgY(3, 0x80, 1);
LoadOam();
ProcessSpriteCopyRequests();
TransferPlttBuffer();
ScanlineEffect_InitHBlankDmaTransfer();
}
void sub_8194D48(void)
{
gFacilityTrainerMons = gBattleFrontierMons;
gFacilityTrainers = gBattleFrontierTrainers;
}
void sub_8194D68(void)
{
s32 i, moveSlot;
for (i = 0; i < 2; i++)
{
s32 playerMonId = gSaveBlock2Ptr->frontier.field_CAA[gUnknown_0203CEF8[i] - 1] - 1;
s32 count;
for (moveSlot = 0; moveSlot < 4; moveSlot++)
{
count = 0;
while (count < 4)
{
if (GetMonData(&gSaveBlock1Ptr->playerParty[playerMonId], MON_DATA_MOVE1 + count, NULL) == GetMonData(&gPlayerParty[i], MON_DATA_MOVE1 + moveSlot, NULL))
break;
count++;
}
if (count == 4)
SetMonMoveSlot(&gPlayerParty[i], MOVE_SKETCH, moveSlot);
}
gSaveBlock1Ptr->playerParty[playerMonId] = gPlayerParty[i];
}
}
void sub_8194E44(void)
{
s32 i;
for (i = 0; i < 2; i++)
{
s32 playerMonId = gSaveBlock2Ptr->frontier.field_CAA[gUnknown_0203CEF8[i] - 1] - 1;
u16 item = GetMonData(&gSaveBlock1Ptr->playerParty[playerMonId], MON_DATA_HELD_ITEM, NULL);
SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &item);
}
}
void sub_8194EB4(void)
{
sub_80F94E8();
}
void sub_8194EC0(void)
{
if (TrainerIdToTournamentId(gTrainerBattleOpponent_A) > TrainerIdToTournamentId(TRAINER_PLAYER))
gSpecialVar_Result = 1;
else
gSpecialVar_Result = 2;
}
void sub_8194EF8(void)
{
s32 i;
sub_8194D48();
for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
{
if (!gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated)
break;
}
CopyDomeTrainerName(gStringVar1, gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
}
void sub_8194F58(void)
{
s32 i, j, k;
s32 monLevel;
s32 species[3];
s32 monTypesBits;
s32 trainerId;
s32 monTournamentId;
u8 lvlMode;
u16 *statSums;
s32 *statValues;
u8 ivs = 0;
species[0] = 0;
species[1] = 0;
species[2] = 0;
if ((gSaveBlock2Ptr->frontier.field_D0A != -gSaveBlock2Ptr->frontier.field_D0B) && gSaveBlock2Ptr->frontier.field_CA8 != 1)
return;
statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT);
statValues = AllocZeroed(sizeof(s32) * 6);
lvlMode = gSaveBlock2Ptr->frontier.chosenLvl;
gSaveBlock2Ptr->frontier.chosenLvl = 0;
// This one, I'd like to call a 'C fakematching'.
{
u8 one;
gSaveBlock2Ptr->frontier.field_D0A = (one = 1);
gSaveBlock2Ptr->frontier.field_D0B = one;
}
for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
{
do
{
if (i < 5)
trainerId = Random() % 10;
else if (i < 15)
trainerId = Random() % 20 + 10;
else
trainerId = Random() % 10 + 30;
for (j = 0; j < i; j++)
{
if (gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId == trainerId)
break;
}
} while (j != i);
gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId = trainerId;
for (j = 0; j < 3; j++)
{
// Make sure the mon is valid.
do
{
monTournamentId = RandomizeFacilityTrainerMonId(trainerId);
for (k = 0; k < j; k++)
{
s32 checkingMonId = gSaveBlock2Ptr->frontier.domeMonId[i][k];
if (checkingMonId == monTournamentId
|| species[0] == gFacilityTrainerMons[monTournamentId].species
|| species[1] == gFacilityTrainerMons[monTournamentId].species
|| gFacilityTrainerMons[checkingMonId].itemTableId == gFacilityTrainerMons[monTournamentId].itemTableId)
break;
}
} while (k != j);
gSaveBlock2Ptr->frontier.domeMonId[i][j] = monTournamentId;
species[j] = gFacilityTrainerMons[monTournamentId].species;
}
gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated = 0;
gSaveBlock2Ptr->frontier.domeTrainers[i].eliminatedAt = 0;
gSaveBlock2Ptr->frontier.domeTrainers[i].unk3 = 0;
}
monLevel = 50;
for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
{
monTypesBits = 0;
statSums[i] = 0;
ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
for (j = 0; j < 3; j++)
{
CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].species,
monLevel, ivs,
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].evSpread,
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].nature,
statValues);
statSums[i] += statValues[STAT_ATK];
statSums[i] += statValues[STAT_DEF];
statSums[i] += statValues[STAT_SPATK];
statSums[i] += statValues[STAT_SPDEF];
statSums[i] += statValues[STAT_SPEED];
statSums[i] += statValues[STAT_HP];
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].species].type1];
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[i][j]].species].type2];
}
// Because GF hates temporary vars, trainerId acts like monTypesCount here.
for (trainerId = 0, j = 0; j < 32; j++)
{
if (monTypesBits & 1)
trainerId++;
monTypesBits >>= 1;
}
statSums[i] += (trainerId * monLevel) / 20;
}
for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT - 1; i++)
{
for (j = i + 1; j < DOME_TOURNAMENT_TRAINERS_COUNT; j++)
{
if (statSums[i] < statSums[j])
{
SwapDomeTrainers(i, j, statSums);
}
else if (statSums[i] == statSums[j])
{
if (gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId > gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId)
SwapDomeTrainers(i, j, statSums);
}
}
}
Free(statSums);
Free(statValues);
for (i = 0; i < 4; i++)
DecideRoundWinners(i);
gSaveBlock2Ptr->frontier.chosenLvl = lvlMode;
}
static s32 TrainerIdToTournamentId(u16 trainerId)
{
s32 i;
for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
{
if (gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId == trainerId)
break;
}
return i;
}
// The same as the above one, but has global scope.
s32 TrainerIdToDomeTournamentId(u16 trainerId)
{
s32 i;
for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
{
if (gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId == trainerId)
break;
}
return i;
}
u8 sub_81953E8(u8 tournamentId, u8 arg1)
{
u8 arr[2];
sub_8192F08(gUnknown_0860D1A0[gUnknown_0860D1C0[tournamentId] / 2][arg1] - 16, arr);
if (tournamentId == arr[0])
return arr[1];
else
return arr[0];
}
void DecideRoundWinners(u8 roundId)
{
s32 i;
s32 moveSlot, monId1, monId2;
s32 tournamentId1, tournamentId2;
s32 species;
s32 points1 = 0, points2 = 0;
for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
{
if (gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated || gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId == TRAINER_PLAYER)
continue;
tournamentId1 = i;
tournamentId2 = TournamentIdOfOpponent(roundId, gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId);
// Frontier Brain always wins, check tournamentId1.
if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != 0xFF)
{
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].isEliminated = 1;
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].eliminatedAt = roundId;
gSaveBlock2Ptr->frontier.field_EC0[tournamentId2] = GetWinningMove(tournamentId1, tournamentId2, roundId);
}
// Frontier Brain always wins, check tournamentId2.
else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != 0xFF)
{
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].isEliminated = 1;
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].eliminatedAt = roundId;
gSaveBlock2Ptr->frontier.field_EC0[tournamentId1] = GetWinningMove(tournamentId2, tournamentId1, roundId);
}
// Decide which one of two trainers wins!
else if (tournamentId2 != 0xFF)
{
// BUG: points1 and points2 are not cleared at the beginning of the loop resulting in not fair results.
// Calculate points for both trainers.
for (monId1 = 0; monId1 < 3; monId1++)
{
for (moveSlot = 0; moveSlot < 4; moveSlot++)
{
for (monId2 = 0; monId2 < 3; monId2++)
{
points1 += sub_818FFC0(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId1][monId1]].moves[moveSlot],
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId2][monId2]].species, 2);
}
}
species = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId1][monId1]].species;
points1 += ( gBaseStats[species].baseHP
+ gBaseStats[species].baseAttack
+ gBaseStats[species].baseDefense
+ gBaseStats[species].baseSpeed
+ gBaseStats[species].baseSpAttack
+ gBaseStats[species].baseSpDefense) / 10;
}
// Random part of the formula.
points1 += (Random() & 0x1F);
// Favor trainers with higher id;
points1 += tournamentId1;
for (monId1 = 0; monId1 < 3; monId1++)
{
for (moveSlot = 0; moveSlot < 4; moveSlot++)
{
for (monId2 = 0; monId2 < 3; monId2++)
{
points2 += sub_818FFC0(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId2][monId1]].moves[moveSlot],
gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId1][monId2]].species, 2);
}
}
species = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonId[tournamentId2][monId1]].species;
points2 += ( gBaseStats[species].baseHP
+ gBaseStats[species].baseAttack
+ gBaseStats[species].baseDefense
+ gBaseStats[species].baseSpeed
+ gBaseStats[species].baseSpAttack
+ gBaseStats[species].baseSpDefense) / 10;
}
// Random part of the formula.
points2 += (Random() & 0x1F);
// Favor trainers with higher id;
points2 += tournamentId2;
if (points1 > points2)
{
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].isEliminated = 1;
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].eliminatedAt = roundId;
gSaveBlock2Ptr->frontier.field_EC0[tournamentId2] = GetWinningMove(tournamentId1, tournamentId2, roundId);
}
else if (points1 < points2)
{
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].isEliminated = 1;
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].eliminatedAt = roundId;
gSaveBlock2Ptr->frontier.field_EC0[tournamentId1] = GetWinningMove(tournamentId2, tournamentId1, roundId);
}
// Points are the same, so we favor the one with the higher id.
else if (tournamentId1 > tournamentId2)
{
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].isEliminated = 1;
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].eliminatedAt = roundId;
gSaveBlock2Ptr->frontier.field_EC0[tournamentId2] = GetWinningMove(tournamentId1, tournamentId2, roundId);
}
else
{
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].isEliminated = 1;
gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].eliminatedAt = roundId;
gSaveBlock2Ptr->frontier.field_EC0[tournamentId1] = GetWinningMove(tournamentId2, tournamentId1, roundId);
}
}
}
}
void CopyDomeTrainerName(u8 *dst, u16 trainerId)
{
s32 i = 0;
GetFrontierEnemyMonLevel(); // Unused return value.
if (trainerId == TRAINER_FRONTIER_BRAIN)
{
CopyDomeBrainTrainerName(dst);
}
else
{
if (trainerId == TRAINER_PLAYER)
{
for (i = 0; i < OT_NAME_LENGTH; i++)
dst[i] = gSaveBlock2Ptr->playerName[i];
}
else if (trainerId < 300)
{
for (i = 0; i < 7; i++)
dst[i] = gFacilityTrainers[trainerId].trainerName[i];
}
dst[i] = EOS;
}
}
u8 GetDomeBrainTrainerPicId(void)
{
return gTrainers[TRAINER_TUCKER].trainerPic;
}
u8 GetDomeBrainTrainerClass(void)
{
return gTrainers[TRAINER_TUCKER].trainerClass;
}
void CopyDomeBrainTrainerName(u8 *dst)
{
s32 i;
for (i = 0; i < 7; i++)
dst[i] = gTrainers[TRAINER_TUCKER].trainerName[i];
dst[i] = EOS;
}

4
src/battle_tent.c
View file

@ -11,7 +11,7 @@
#include "constants/items.h" #include "constants/items.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"
// this file's functions // This file's functions.
void sub_81B99D4(void); void sub_81B99D4(void);
void sub_81B9A28(void); void sub_81B9A28(void);
void sub_81B9A44(void); void sub_81B9A44(void);
@ -115,7 +115,7 @@ void sub_81B9A60(void)
void sub_81B9A90(void) void sub_81B9A90(void)
{ {
if (gTrainerBattleOpponent_A < 300) if (gTrainerBattleOpponent_A < 300)
ConvertBattleFrontierTrainerSpeechToString(gUnknown_0203BC88[gTrainerBattleOpponent_A].speechBefore); ConvertBattleFrontierTrainerSpeechToString(gFacilityTrainers[gTrainerBattleOpponent_A].speechBefore);
} }
void sub_81B9ABC(void) void sub_81B9ABC(void)

3
sym_ewram.txt
View file

@ -607,12 +607,11 @@ gUnknown_0203ABB8: @ 203ABB8
.space 0x4 /*unused var?*/ .space 0x4 /*unused var?*/
.include "src/mystery_event_script.o" .include "src/mystery_event_script.o"
.include "src/learn_move.o" .include "src/learn_move.o"
.include "src/decoration_inventory.o" .include "src/decoration_inventory.o"
.include "src/roamer.o" .include "src/roamer.o"
gUnknown_0203BC88: @ 203BC88 gFacilityTrainers: @ 203BC88
.space 0x4 .space 0x4
gFacilityTrainerMons: @ 203BC8C gFacilityTrainerMons: @ 203BC8C