summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bard_music.c199
-rw-r--r--src/battle_ai.c166
-rw-r--r--src/berry_tag_screen.c571
-rw-r--r--src/contest_painting.c1186
-rw-r--r--src/credits.c432
-rw-r--r--src/daycare.c33
-rw-r--r--src/field_special_scene.c (renamed from src/truck_scene.c)123
-rw-r--r--src/menu_cursor.c4
-rw-r--r--src/rom4.c7
-rw-r--r--src/save_failed_screen.c38
-rw-r--r--src/starter_choose.c4
11 files changed, 1138 insertions, 1625 deletions
diff --git a/src/bard_music.c b/src/bard_music.c
index 73eaa0f58..ee70f5319 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -1,157 +1,84 @@
#include "global.h"
#include "asm.h"
-typedef struct BardSound {
+struct BardSound
+{
u8 pad_00[48];
-} BardSound;
-
-typedef struct UnkBard {
- /* 0x00 */ u8 var00;
- /* 0x01 */ s8 var01;
- /* 0x02 */ u16 var02;
- /* 0x04 */ u16 var04;
- /* 0x06 */ u16 var06;
-} UnkBard;
-
-typedef struct UnkBard3 {
- /* 0x00 */ u16 var00;
- /* 0x02 */ u16 var02;
- /* 0x04 */ s16 var04;
- /* 0x06 */ u16 var06;
-} UnkBard3;
-
-typedef struct UnkBard2 {
- /* 0x00 */ u8 var00;
- /* 0x01 */ u8 var01;
- /* 0x02 */ u8 var02;
- /* 0x03 */ u8 var03;
- /* 0x04 */ u16 var04;
- u8 pad06[4];
- /* 0x0A */ u16 var0A;
- u8 pad0C[12];
- /* 0x18 */ UnkBard3 var18[6];
-} UnkBard2;
-
-extern BardSound *gBardMusicTable[];
+};
+
+struct UnkBard
+{
+ /*0x00*/ u8 var00;
+ /*0x01*/ s8 var01;
+ /*0x02*/ u16 var02;
+ /*0x04*/ u16 var04;
+ /*0x06*/ u16 var06;
+};
+
+struct UnkBard3
+{
+ /*0x00*/ u16 var00;
+ /*0x02*/ u16 var02;
+ /*0x04*/ s16 var04;
+ /*0x06*/ u16 var06;
+};
+
+struct UnkBard2
+{
+ /*0x00*/ u8 var00;
+ /*0x01*/ u8 var01;
+ /*0x02*/ u8 var02;
+ /*0x03*/ u8 var03;
+ /*0x04*/ u16 var04;
+ u8 pad06[4];
+ /*0x0A*/ u16 var0A;
+ u8 pad0C[12];
+ /*0x18*/ struct UnkBard3 var18[6];
+};
+
+extern struct BardSound *gBardMusicTable[];
extern s16 *gUnknown_08417068[];
extern u32 gUnknown_084170F4[];
-s16 sub_814A2B8(u32 arg0, u32 arg1) {
+static s16 sub_814A2B8(u32 arg0, u32 arg1)
+{
return gUnknown_08417068[arg0][arg1];
}
-BardSound *sub_814A2D0(u16 arg0, u16 arg1) {
- BardSound *sounds;
-
- sounds = gBardMusicTable[arg0];
-
+struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
+{
+ struct BardSound *sounds = gBardMusicTable[arg0];
+
return &sounds[arg1];
}
-#ifdef NONMATCHING
-int sub_814A2EC(UnkBard2 *dest, UnkBard *src, u16 arg2) {
- int i;
- int n;
-
- for (i = 0; i < 6; i++) {
- s8 var01;
-
+s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2)
+{
+ s32 i;
+ s32 j;
+ s32 thirty;
+
+ for (i = 0; i < 6; i++)
+ {
dest->var18[i].var00 = src[i].var00;
- if (src[i].var00 == 0xFF) {
- continue;
+ if (src[i].var00 != 0xFF)
+ {
+ s32 r1 = src[i].var01 +gUnknown_084170F4[src[i].var00];
+
+ dest->var18[i].var02 = r1;
+ dest->var18[i].var06 = src[i].var04;
+ dest->var04 += r1;
}
-
- var01 = src[i].var01;
- dest->var18[i].var02 = var01 + gUnknown_084170F4[src[i].var00];
- dest->var18[i].var06 = src[i].var04;
- dest->var04 += 1;
}
-
- i = 6;
-
- for (n = 0; n < i; n++) {
- dest->var18[n].var04 = sub_814A2B8(30 + arg2, n);
- }
-
- dest->var00 += 1;
+
+ for (j = 0, thirty = 30; j < i; j++)
+ dest->var18[j].var04 = sub_814A2B8(thirty + arg2, j);
+
+ dest->var00++;
dest->var01 = 0;
dest->var02 = 0;
dest->var03 = 0;
dest->var0A = 0;
+
+ //warning: no return statement in function returning non-void
}
-#else
-__attribute__((naked))
-void sub_814A2EC(void) {
- asm(".syntax unified\n\
- push {r4-r7,lr}\n\
- mov r7, r9\n\
- mov r6, r8\n\
- push {r6,r7}\n\
- adds r6, r0, 0\n\
- lsls r2, 16\n\
- lsrs r2, 16\n\
- mov r9, r2\n\
- ldr r4, _0814A370 @ =gUnknown_084170F4\n\
- adds r2, r1, 0\n\
- adds r3, r6, 0\n\
- adds r3, 0x18\n\
- movs r7, 0x5\n\
-_0814A306:\n\
- ldrb r0, [r2]\n\
- strh r0, [r3]\n\
- ldrb r0, [r2]\n\
- cmp r0, 0xFF\n\
- beq _0814A328\n\
- movs r1, 0x1\n\
- ldrsb r1, [r2, r1]\n\
- lsls r0, 2\n\
- adds r0, r4\n\
- ldr r0, [r0]\n\
- adds r1, r0\n\
- strh r1, [r3, 0x2]\n\
- ldrh r0, [r2, 0x4]\n\
- strh r0, [r3, 0x6]\n\
- ldrh r0, [r6, 0x4]\n\
- adds r0, r1\n\
- strh r0, [r6, 0x4]\n\
-_0814A328:\n\
- adds r2, 0x8\n\
- adds r3, 0x8\n\
- subs r7, 0x1\n\
- cmp r7, 0\n\
- bge _0814A306\n\
- movs r7, 0x6\n\
- movs r5, 0\n\
- movs r0, 0x1E\n\
- mov r8, r0\n\
- adds r4, r6, 0\n\
-_0814A33C:\n\
- mov r0, r8\n\
- add r0, r9\n\
- adds r1, r5, 0\n\
- bl sub_814A2B8\n\
- adds r1, r0, 0\n\
- strh r1, [r4, 0x1C]\n\
- adds r4, 0x8\n\
- adds r5, 0x1\n\
- cmp r5, r7\n\
- blt _0814A33C\n\
- ldrb r1, [r6]\n\
- adds r1, 0x1\n\
- movs r2, 0\n\
- strb r1, [r6]\n\
- strb r2, [r6, 0x1]\n\
- strb r2, [r6, 0x2]\n\
- strb r2, [r6, 0x3]\n\
- strh r2, [r6, 0xA]\n\
- pop {r3,r4}\n\
- mov r8, r3\n\
- mov r9, r4\n\
- pop {r4-r7}\n\
- pop {r1}\n\
- bx r1\n\
- .align 2, 0\n\
-_0814A370: .4byte gUnknown_084170F4\n\
- .syntax divided\n");
-}
-#endif
diff --git a/src/battle_ai.c b/src/battle_ai.c
index e60bf478f..1b703679d 100644
--- a/src/battle_ai.c
+++ b/src/battle_ai.c
@@ -4,6 +4,7 @@
#include "pokemon.h"
#include "rng.h"
#include "abilities.h"
+#include "species.h"
#define AIScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24)
#define AIScriptRead16(ptr) ((ptr)[0] | (ptr)[1] << 8)
@@ -20,6 +21,7 @@ extern void move_effectiveness_something(u16, u8, u8);
extern u16 gBattleTypeFlags;
extern u8 gUnknown_02024A60;
+extern u8 gUnknown_02024A6A[][2];
extern u16 gUnknown_02024BE6;
extern u32 gUnknown_02024BEC;
extern u8 gUnknown_02024C07; // something player?
@@ -1042,128 +1044,52 @@ void BattleAICmd_unk_2A(void)
void BattleAICmd_unk_2B(void)
{}
-__attribute__((naked))
void BattleAICmd_count_alive_pokemon(void)
{
- asm(".syntax unified\n\
- push {r4-r7,lr}\n\
- mov r7, r9\n\
- mov r6, r8\n\
- push {r6,r7}\n\
- ldr r1, _08108550 @ =0x02016800\n\
- movs r0, 0\n\
- str r0, [r1, 0x8]\n\
- ldr r0, _08108554 @ =gAIScriptPtr\n\
- ldr r0, [r0]\n\
- ldrb r0, [r0, 0x1]\n\
- cmp r0, 0x1\n\
- bne _0810855C\n\
- ldr r0, _08108558 @ =gUnknown_02024C07\n\
- b _0810855E\n\
- .align 2, 0\n\
-_08108550: .4byte 0x02016800\n\
-_08108554: .4byte gAIScriptPtr\n\
-_08108558: .4byte gUnknown_02024C07\n\
-_0810855C:\n\
- ldr r0, _081085A8 @ =gUnknown_02024C08\n\
-_0810855E:\n\
- ldrb r5, [r0]\n\
- adds r0, r5, 0\n\
- bl battle_side_get_owner\n\
- lsls r0, 24\n\
- ldr r1, _081085AC @ =gEnemyParty\n\
- mov r9, r1\n\
- cmp r0, 0\n\
- bne _08108574\n\
- ldr r0, _081085B0 @ =gPlayerParty\n\
- mov r9, r0\n\
-_08108574:\n\
- ldr r0, _081085B4 @ =gBattleTypeFlags\n\
- ldrh r1, [r0]\n\
- movs r0, 0x1\n\
- ands r0, r1\n\
- cmp r0, 0\n\
- beq _081085BC\n\
- ldr r4, _081085B8 @ =gUnknown_02024A6A\n\
- lsls r0, r5, 1\n\
- adds r0, r4\n\
- ldrb r0, [r0]\n\
- mov r8, r0\n\
- adds r0, r5, 0\n\
- bl battle_get_per_side_status\n\
- movs r1, 0x2\n\
- eors r0, r1\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- bl battle_get_side_with_given_state\n\
- lsls r0, 24\n\
- lsrs r0, 23\n\
- adds r0, r4\n\
- ldrb r6, [r0]\n\
- b _081085C6\n\
- .align 2, 0\n\
-_081085A8: .4byte gUnknown_02024C08\n\
-_081085AC: .4byte gEnemyParty\n\
-_081085B0: .4byte gPlayerParty\n\
-_081085B4: .4byte gBattleTypeFlags\n\
-_081085B8: .4byte gUnknown_02024A6A\n\
-_081085BC:\n\
- ldr r1, _08108624 @ =gUnknown_02024A6A\n\
- lsls r0, r5, 1\n\
- adds r0, r1\n\
- ldrb r6, [r0]\n\
- mov r8, r6\n\
-_081085C6:\n\
- movs r5, 0\n\
- ldr r7, _08108628 @ =0x02016800\n\
-_081085CA:\n\
- cmp r5, r8\n\
- beq _08108608\n\
- cmp r5, r6\n\
- beq _08108608\n\
- movs r0, 0x64\n\
- muls r0, r5\n\
- mov r1, r9\n\
- adds r4, r1, r0\n\
- adds r0, r4, 0\n\
- movs r1, 0x39\n\
- bl GetMonData\n\
- cmp r0, 0\n\
- beq _08108608\n\
- adds r0, r4, 0\n\
- movs r1, 0x41\n\
- bl GetMonData\n\
- cmp r0, 0\n\
- beq _08108608\n\
- adds r0, r4, 0\n\
- movs r1, 0x41\n\
- bl GetMonData\n\
- movs r1, 0xCE\n\
- lsls r1, 1\n\
- cmp r0, r1\n\
- beq _08108608\n\
- ldr r0, [r7, 0x8]\n\
- adds r0, 0x1\n\
- str r0, [r7, 0x8]\n\
-_08108608:\n\
- adds r5, 0x1\n\
- cmp r5, 0x5\n\
- ble _081085CA\n\
- ldr r1, _0810862C @ =gAIScriptPtr\n\
- ldr r0, [r1]\n\
- adds r0, 0x2\n\
- str r0, [r1]\n\
- pop {r3,r4}\n\
- mov r8, r3\n\
- mov r9, r4\n\
- pop {r4-r7}\n\
- pop {r0}\n\
- bx r0\n\
- .align 2, 0\n\
-_08108624: .4byte gUnknown_02024A6A\n\
-_08108628: .4byte 0x02016800\n\
-_0810862C: .4byte gAIScriptPtr\n\
- .syntax divided");
+ u8 index;
+ struct Pokemon *party;
+ struct AI_ThinkingStruct *ai = &battle_2000000.ai;
+ int i;
+ u8 var, var2;
+
+ ai->unk8 = 0;
+
+ if (gAIScriptPtr[1] == USER)
+ index = gUnknown_02024C07;
+ else
+ index = gUnknown_02024C08;
+
+ if (battle_side_get_owner(index) == 0)
+ party = gPlayerParty;
+ else
+ party = gEnemyParty;
+
+ if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
+ {
+ u32 status;
+ var = gUnknown_02024A6A[index][0];
+ status = battle_get_per_side_status(index) ^ 2;
+ var2 = gUnknown_02024A6A[battle_get_side_with_given_state(status)][0];
+ }
+ else
+ {
+ var = gUnknown_02024A6A[index][0];
+ var2 = gUnknown_02024A6A[index][0];
+ }
+
+ for (i = 0; i < 6; i++)
+ {
+ struct AI_ThinkingStruct *ai2 = &battle_2000000.ai;
+ if (i != var && i != var2
+ && GetMonData(&party[i], MON_DATA_HP) != 0
+ && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
+ && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG)
+ {
+ ai2->unk8++;
+ }
+ }
+
+ gAIScriptPtr += 2;
}
void BattleAICmd_unk_2D(void)
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 1b432fe70..164e2cfc2 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -18,12 +18,14 @@
#define OFFSET_7B (123)
#define FIRST_BERRY ITEM_CHERI_BERRY
-struct Struct2000000 {
+struct Struct2000000
+{
/*0x00*/ u8 filler_0[0x1FFFF];
- /*0x1FFFF*/ bool8 var_1FFFF;
+ /*0x1FFFF*/ u8 var_1FFFF;
};
-struct BerryTagStatus {
+struct BerryTagStatus
+{
s16 circles[5];
};
@@ -59,19 +61,21 @@ static void sub_8146480(u8 taskid);
static void sub_81464E4(void);
static void sub_8146600(u8 berry);
// static void sub_81466A0(void);
-static void sub_81466E8(u8 taskId, s32 direction);
+static void sub_81466E8(u8 taskId, s8 direction);
// static void sub_8146798(u8 berry);
// static void sub_8146810(u8 berry);
// static void sub_81468BC(void);
-static void sub_8146014(void) {
+static void sub_8146014(void)
+{
AnimateSprites();
BuildOamBuffer();
RunTasks();
UpdatePaletteFade();
}
-static void sub_814602C(void) {
+static void sub_814602C(void)
+{
REG_BG0VOFS = gUnknown_030041B4;
REG_BG1VOFS = gUnknown_030041B4;
@@ -80,162 +84,146 @@ static void sub_814602C(void) {
TransferPlttBuffer();
}
-static bool8 sub_8146058(void) {
+static bool8 sub_8146058(void)
+{
u8 berry;
u16 backup;
- switch (gMain.state) {
- case 0:
- sub_80F9438();
- sub_80F9368();
- sub_8146288();
- REG_BLDCNT = 0;
- gMain.state += 1;
- break;
-
- case 1:
- ResetPaletteFade();
- gPaletteFade.bufferTransferDisabled = 1;
- gMain.state += 1;
- break;
-
- case 2:
- ResetSpriteData();
- gMain.state += 1;
- break;
-
- case 3:
- SetUpWindowConfig(&gWindowConfig_81E6E18);
- gMain.state += 1;
- break;
-
- case 4:
- MultistepInitMenuWindowBegin(&gWindowConfig_81E6E18);
- gMain.state += 1;
- break;
-
- case 5:
- if (!MultistepInitMenuWindowContinue()) {
- return FALSE;
- }
- unk_2000000.var_1FFFF = 0;
- gMain.state += 1;
- break;
-
- case 6:
- if (!sub_81462B8()) {
- break;
- }
-
- unk_2000000.var_1FFFF = 0;
- gMain.state += 1;
- break;
-
- case 7:
- sub_81464E4();
- gMain.state += 1;
- break;
-
- case 8:
- berry = gScriptItemId + OFFSET_7B;
- gUnknown_0203932C = sub_80A7D8C(berry, 56, 64);
- gMain.state += 1;
- break;
-
- case 9:
- sub_8146600(gScriptItemId + OFFSET_7B);
- gMain.state += 1;
+ switch (gMain.state)
+ {
+ case 0:
+ sub_80F9438();
+ sub_80F9368();
+ sub_8146288();
+ REG_BLDCNT = 0;
+ gMain.state += 1;
+ break;
+ case 1:
+ ResetPaletteFade();
+ gPaletteFade.bufferTransferDisabled = 1;
+ gMain.state += 1;
+ break;
+ case 2:
+ ResetSpriteData();
+ gMain.state += 1;
+ break;
+ case 3:
+ SetUpWindowConfig(&gWindowConfig_81E6E18);
+ gMain.state += 1;
+ break;
+ case 4:
+ MultistepInitMenuWindowBegin(&gWindowConfig_81E6E18);
+ gMain.state += 1;
+ break;
+ case 5:
+ if (!MultistepInitMenuWindowContinue())
break;
-
- case 10:
- backup = REG_IME;
- REG_IME = 0;
- REG_IE |= INTR_FLAG_VBLANK;
- REG_IME = backup;
-
- REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
- SetVBlankCallback(sub_814602C);
- REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP;
- gMain.state += 1;
+ unk_2000000.var_1FFFF = 0;
+ gMain.state += 1;
+ break;
+ case 6:
+ if (!sub_81462B8())
break;
-
- case 11:
- if (sub_8055870() == TRUE) {
- break;
- }
- gMain.state += 1;
+ unk_2000000.var_1FFFF = 0;
+ gMain.state += 1;
+ break;
+ case 7:
+ sub_81464E4();
+ gMain.state += 1;
+ break;
+ case 8:
+ berry = gScriptItemId + OFFSET_7B;
+ gUnknown_0203932C = sub_80A7D8C(berry, 56, 64);
+ gMain.state += 1;
+ break;
+ case 9:
+ sub_8146600(gScriptItemId + OFFSET_7B);
+ gMain.state += 1;
+ break;
+ case 10:
+ backup = REG_IME;
+ REG_IME = 0;
+ REG_IE |= INTR_FLAG_VBLANK;
+ REG_IME = backup;
+ REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
+ SetVBlankCallback(sub_814602C);
+ REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP;
+ gMain.state += 1;
+ break;
+ case 11:
+ if (sub_8055870() == TRUE)
break;
-
- case 12:
- BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
- gPaletteFade.bufferTransferDisabled = 0;
- SetMainCallback2(sub_8146014);
- return TRUE;
-
+ gMain.state += 1;
+ break;
+ case 12:
+ BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+ gPaletteFade.bufferTransferDisabled = 0;
+ SetMainCallback2(sub_8146014);
+ return TRUE;
}
return FALSE;
}
-void BerryTagScreen_814625C(u8 taskId) {
- do {
- if (sub_8146058() == TRUE) {
+void BerryTagScreen_814625C(u8 taskId)
+{
+ do
+ {
+ if (sub_8146058() == TRUE)
+ {
CreateTask(sub_8146480, 0);
return;
}
-
} while (sub_80F9344() != TRUE);
}
-static void sub_8146288(void) {
+static void sub_8146288(void)
+{
REG_BG1CNT = 0x502;
REG_BG2CNT = 0x600;
REG_BG3CNT = 0x703;
gUnknown_030041B4 = 0;
}
-#ifdef NONMATCHING
-bool8 sub_81462B8(void) {
+bool8 sub_81462B8(void)
+{
u16 i;
+ void *addr;
- switch (unk_2000000.var_1FFFF) {
+ switch (unk_2000000.var_1FFFF)
+ {
case 0:
LZDecompressVram(gBerryCheck_Gfx, (void *) VRAM);
unk_2000000.var_1FFFF += 1;
break;
-
case 1:
LZDecompressVram(gUnknown_08E788E4, (void *) VRAM + 0x2800);
unk_2000000.var_1FFFF += 1;
break;
-
case 2:
LZDecompressVram(gUnknown_08E78A84, (void *) VRAM + 0x3000);
unk_2000000.var_1FFFF += 1;
break;
-
case 3:
- for (i = 0; i < 0x400; i++) {
- u16 (*buffer)[0x400] = &gBGTilemapBuffers[3];
- if (gSaveBlock2.playerGender == MALE) {
- (*buffer)[i] = 0x4042;
- } else {
- (*buffer)[i] = 0x5042;
- }
+ for (i = 0; i < 0x400; i++)
+ {
+ if (gSaveBlock2.playerGender == MALE)
+ gBGTilemapBuffers[2][i] = 0x4042;
+ else
+ gBGTilemapBuffers[2][i] = 0x5042;
}
+ addr = (void *)(VRAM + 0x3800);
+ DmaCopy16(3, gBGTilemapBuffers[2], addr, 0x800);
unk_2000000.var_1FFFF += 1;
break;
-
case 4:
LoadCompressedPalette(gBerryCheck_Pal, 0, 96 * 2);
unk_2000000.var_1FFFF += 1;
break;
-
case 5:
LoadCompressedObjectPic(&gUnknown_083C1F74);
unk_2000000.var_1FFFF += 1;
break;
-
case 6:
LoadCompressedObjectPalette(&gUnknown_083C1F7C);
unk_2000000.var_1FFFF = 0;
@@ -244,208 +232,40 @@ bool8 sub_81462B8(void) {
return FALSE;
}
-#else
-__attribute__((naked))
-static bool8 sub_81462B8(void) {
- asm(".syntax unified\n\
- push {r4-r7,lr}\n\
- ldr r1, _081462D4 @ =0x02000000\n\
- ldr r2, _081462D8 @ =0x0001ffff\n\
- adds r0, r1, r2\n\
- ldrb r0, [r0]\n\
- mov r12, r1\n\
- cmp r0, 0x6\n\
- bls _081462CA\n\
- b _08146404\n\
-_081462CA:\n\
- lsls r0, 2\n\
- ldr r1, _081462DC @ =_081462E0\n\
- adds r0, r1\n\
- ldr r0, [r0]\n\
- mov pc, r0\n\
- .align 2, 0\n\
-_081462D4: .4byte 0x02000000\n\
-_081462D8: .4byte 0x0001ffff\n\
-_081462DC: .4byte _081462E0\n\
- .align 2, 0\n\
-_081462E0:\n\
- .4byte _081462FC\n\
- .4byte _0814630C\n\
- .4byte _0814632C\n\
- .4byte _08146340\n\
- .4byte _081463A4\n\
- .4byte _081463C4\n\
- .4byte _081463E4\n\
-_081462FC:\n\
- ldr r0, _08146308 @ =gBerryCheck_Gfx\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl LZDecompressVram\n\
- b _081463CA\n\
- .align 2, 0\n\
-_08146308: .4byte gBerryCheck_Gfx\n\
-_0814630C:\n\
- ldr r0, _0814631C @ =gUnknown_08E788E4\n\
- ldr r1, _08146320 @ =0x06002800\n\
- bl LZDecompressVram\n\
- ldr r1, _08146324 @ =0x02000000\n\
- ldr r2, _08146328 @ =0x0001ffff\n\
- adds r1, r2\n\
- b _081463D0\n\
- .align 2, 0\n\
-_0814631C: .4byte gUnknown_08E788E4\n\
-_08146320: .4byte 0x06002800\n\
-_08146324: .4byte 0x02000000\n\
-_08146328: .4byte 0x0001ffff\n\
-_0814632C:\n\
- ldr r0, _08146338 @ =gUnknown_08E78A84\n\
- ldr r1, _0814633C @ =0x06003000\n\
- bl LZDecompressVram\n\
- b _081463CA\n\
- .align 2, 0\n\
-_08146338: .4byte gUnknown_08E78A84\n\
-_0814633C: .4byte 0x06003000\n\
-_08146340:\n\
- movs r1, 0\n\
- ldr r7, _0814635C @ =gBGTilemapBuffers + 0x1000\n\
- adds r2, r7, 0\n\
- ldr r6, _08146360 @ =0x00004042\n\
- ldr r5, _08146364 @ =gSaveBlock2\n\
- ldr r4, _08146368 @ =0x00005042\n\
- ldr r3, _0814636C @ =0x000003ff\n\
-_0814634E:\n\
- ldrb r0, [r5, 0x8]\n\
- cmp r0, 0\n\
- bne _08146370\n\
- lsls r0, r1, 1\n\
- adds r0, r2\n\
- strh r6, [r0]\n\
- b _08146376\n\
- .align 2, 0\n\
-_0814635C: .4byte gBGTilemapBuffers + 0x1000\n\
-_08146360: .4byte 0x00004042\n\
-_08146364: .4byte gSaveBlock2\n\
-_08146368: .4byte 0x00005042\n\
-_0814636C: .4byte 0x000003ff\n\
-_08146370:\n\
- lsls r0, r1, 1\n\
- adds r0, r2\n\
- strh r4, [r0]\n\
-_08146376:\n\
- adds r0, r1, 0x1\n\
- lsls r0, 16\n\
- lsrs r1, r0, 16\n\
- cmp r1, r3\n\
- bls _0814634E\n\
- ldr r1, _08146394 @ =0x06003800\n\
- ldr r0, _08146398 @ =0x040000d4\n\
- str r7, [r0]\n\
- str r1, [r0, 0x4]\n\
- ldr r1, _0814639C @ =0x80000400\n\
- str r1, [r0, 0x8]\n\
- ldr r0, [r0, 0x8]\n\
- ldr r1, _081463A0 @ =0x0001ffff\n\
- add r1, r12\n\
- b _081463D0\n\
- .align 2, 0\n\
-_08146394: .4byte 0x06003800\n\
-_08146398: .4byte 0x040000d4\n\
-_0814639C: .4byte 0x80000400\n\
-_081463A0: .4byte 0x0001ffff\n\
-_081463A4:\n\
- ldr r0, _081463B8 @ =gBerryCheck_Pal\n\
- movs r1, 0\n\
- movs r2, 0xC0\n\
- bl LoadCompressedPalette\n\
- ldr r1, _081463BC @ =0x02000000\n\
- ldr r2, _081463C0 @ =0x0001ffff\n\
- adds r1, r2\n\
- b _081463D0\n\
- .align 2, 0\n\
-_081463B8: .4byte gBerryCheck_Pal\n\
-_081463BC: .4byte 0x02000000\n\
-_081463C0: .4byte 0x0001ffff\n\
-_081463C4:\n\
- ldr r0, _081463D8 @ =gUnknown_083C1F74\n\
- bl LoadCompressedObjectPic\n\
-_081463CA:\n\
- ldr r1, _081463DC @ =0x02000000\n\
- ldr r0, _081463E0 @ =0x0001ffff\n\
- adds r1, r0\n\
-_081463D0:\n\
- ldrb r0, [r1]\n\
- adds r0, 0x1\n\
- strb r0, [r1]\n\
- b _08146404\n\
- .align 2, 0\n\
-_081463D8: .4byte gUnknown_083C1F74\n\
-_081463DC: .4byte 0x02000000\n\
-_081463E0: .4byte 0x0001ffff\n\
-_081463E4:\n\
- ldr r0, _081463F8 @ =gUnknown_083C1F7C\n\
- bl LoadCompressedObjectPalette\n\
- ldr r0, _081463FC @ =0x02000000\n\
- ldr r1, _08146400 @ =0x0001ffff\n\
- adds r0, r1\n\
- movs r1, 0\n\
- strb r1, [r0]\n\
- movs r0, 0x1\n\
- b _08146406\n\
- .align 2, 0\n\
-_081463F8: .4byte gUnknown_083C1F7C\n\
-_081463FC: .4byte 0x02000000\n\
-_08146400: .4byte 0x0001ffff\n\
-_08146404:\n\
- movs r0, 0\n\
-_08146406:\n\
- pop {r4-r7}\n\
- pop {r1}\n\
- bx r1\n\
- .syntax divided\n");
-}
-#endif
-static void sub_814640C(u8 taskId) {
- if (gPaletteFade.active) {
- return;
+static void sub_814640C(u8 taskId)
+{
+ if (!gPaletteFade.active)
+ {
+ SetMainCallback2(sub_80A5B40);
+ sub_80A7DD4();
+ gpu_pal_allocator_reset__manage_upper_four();
+ DestroyTask(taskId);
}
-
- SetMainCallback2(sub_80A5B40);
- sub_80A7DD4();
- gpu_pal_allocator_reset__manage_upper_four();
- DestroyTask(taskId);
}
-static void sub_8146440(u8 taskId) {
+static void sub_8146440(u8 taskId)
+{
PlaySE(SE_SELECT);
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-
gTasks[taskId].func = sub_814640C;
}
-static void sub_8146480(u8 taskid) {
- register u16 keys asm("r1");
-
- if (gPaletteFade.active) {
- return;
- }
-
- keys = gMain.newAndRepeatedKeys & (DPAD_RIGHT | DPAD_LEFT | DPAD_UP | DPAD_DOWN);
- if (keys == DPAD_UP) {
- sub_81466E8(taskid, -1);
- }
-
- keys = gMain.newAndRepeatedKeys & (DPAD_RIGHT | DPAD_LEFT | DPAD_UP | DPAD_DOWN);
- if (keys == DPAD_DOWN) {
- sub_81466E8(taskid, 1);
- }
-
- if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) {
- sub_8146440(taskid);
+static void sub_8146480(u8 taskid)
+{
+ if (!gPaletteFade.active)
+ {
+ if ((gMain.newAndRepeatedKeys & (DPAD_RIGHT | DPAD_LEFT | DPAD_UP | DPAD_DOWN)) == DPAD_UP)
+ sub_81466E8(taskid, -1);
+ if ((gMain.newAndRepeatedKeys & (DPAD_RIGHT | DPAD_LEFT | DPAD_UP | DPAD_DOWN)) == DPAD_DOWN)
+ sub_81466E8(taskid, 1);
+ if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+ sub_8146440(taskid);
}
}
-static void sub_81464E4(void) {
+static void sub_81464E4(void)
+{
struct Berry *berryInfo;
u32 size;
s32 sizeMajor;
@@ -461,163 +281,68 @@ static void sub_81464E4(void) {
MenuPrint(berryInfo->description2, 4, 16);
size = (berryInfo->size * 1000) / 254;
- if (size % 10 >= 5) {
+ if (size % 10 >= 5)
size += 10;
- }
sizeMinor = (size % 100) / 10;
sizeMajor = size / 100;
MenuPrint(gOtherText_Size, 11, 7);
- if (berryInfo->size != 0) {
+ if (berryInfo->size != 0)
+ {
ConvertIntToDecimalStringN(gStringVar1, sizeMajor, STR_CONV_MODE_LEFT_ALIGN, 2);
ConvertIntToDecimalStringN(gStringVar2, sizeMinor, STR_CONV_MODE_LEFT_ALIGN, 2);
MenuPrint(gContestStatsText_Unknown1, 16, 7);
- } else {
+ }
+ else
+ {
MenuPrint(gOtherText_ThreeQuestions2, 16, 7);
}
MenuPrint(gOtherText_Firm, 11, 9);
- if (berryInfo->firmness != 0) {
+ if (berryInfo->firmness != 0)
MenuPrint(gUnknown_0841192C[berryInfo->firmness - 1], 16, 9);
- } else {
+ else
MenuPrint(gOtherText_ThreeQuestions2, 16, 9);
- }
}
-#ifdef NONMATCHING
-static void sub_8146600(u8 berry) {
+static void sub_8146600(u8 berry)
+{
struct Berry *berryInfo;
u16 i;
berryInfo = GetBerryInfo(berry +1);
+ for (i = 0; i < 5; i++)
+ gUnknown_0203932E.circles[i] = (u16)gUnknown_0203932E.circles[i] | 0xFFFF;
- for (i = 0; i < 5; i++) {
- gUnknown_0203932E.circles[i] |= 0xFFFF;
- }
-
- if (berryInfo->spicy) {
- // argument is the center of the circle
+ // argument is the center of the circle
+ if (berryInfo->spicy)
gUnknown_0203932E.circles[0] = sub_80A7E5C(48);
- }
-
- if (berryInfo->dry) {
+ if (berryInfo->dry)
gUnknown_0203932E.circles[1] = sub_80A7E5C(88);
- }
-
- if (berryInfo->sweet) {
+ if (berryInfo->sweet)
gUnknown_0203932E.circles[2] = sub_80A7E5C(128);
- }
-
- if (berryInfo->bitter) {
+ if (berryInfo->bitter)
gUnknown_0203932E.circles[3] = sub_80A7E5C(168);
- }
-
- if (berryInfo->sour) {
+ if (berryInfo->sour)
gUnknown_0203932E.circles[4] = sub_80A7E5C(208);
- }
}
-#else
-__attribute__((naked))
-static void sub_8146600(u8 berry) {
- asm(".syntax unified\n\
- push {r4,r5,lr}\n\
- lsls r0, 24\n\
- movs r1, 0x80\n\
- lsls r1, 17\n\
- adds r0, r1\n\
- lsrs r0, 24\n\
- bl GetBerryInfo\n\
- adds r4, r0, 0\n\
- movs r2, 0\n\
- ldr r5, _08146698 @ =gUnknown_0203932E\n\
- ldr r0, _0814669C @ =0x0000ffff\n\
- adds r3, r0, 0\n\
-_0814661A:\n\
- lsls r0, r2, 1\n\
- adds r0, r5\n\
- ldrh r1, [r0]\n\
- orrs r1, r3\n\
- strh r1, [r0]\n\
- adds r0, r2, 0x1\n\
- lsls r0, 16\n\
- lsrs r2, r0, 16\n\
- cmp r2, 0x4\n\
- bls _0814661A\n\
- ldrb r0, [r4, 0x15]\n\
- cmp r0, 0\n\
- beq _08146642\n\
- movs r0, 0x30\n\
- bl sub_80A7E5C\n\
- ldr r1, _08146698 @ =gUnknown_0203932E\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- strh r0, [r1]\n\
-_08146642:\n\
- ldrb r0, [r4, 0x16]\n\
- cmp r0, 0\n\
- beq _08146656\n\
- movs r0, 0x58\n\
- bl sub_80A7E5C\n\
- ldr r1, _08146698 @ =gUnknown_0203932E\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- strh r0, [r1, 0x2]\n\
-_08146656:\n\
- ldrb r0, [r4, 0x17]\n\
- cmp r0, 0\n\
- beq _0814666A\n\
- movs r0, 0x80\n\
- bl sub_80A7E5C\n\
- ldr r1, _08146698 @ =gUnknown_0203932E\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- strh r0, [r1, 0x4]\n\
-_0814666A:\n\
- ldrb r0, [r4, 0x18]\n\
- cmp r0, 0\n\
- beq _0814667E\n\
- movs r0, 0xA8\n\
- bl sub_80A7E5C\n\
- ldr r1, _08146698 @ =gUnknown_0203932E\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- strh r0, [r1, 0x6]\n\
-_0814667E:\n\
- ldrb r0, [r4, 0x19]\n\
- cmp r0, 0\n\
- beq _08146692\n\
- movs r0, 0xD0\n\
- bl sub_80A7E5C\n\
- ldr r1, _08146698 @ =gUnknown_0203932E\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- strh r0, [r1, 0x8]\n\
-_08146692:\n\
- pop {r4,r5}\n\
- pop {r0}\n\
- bx r0\n\
- .align 2, 0\n\
-_08146698: .4byte gUnknown_0203932E\n\
-_0814669C: .4byte 0x0000ffff\n\
- .syntax divided\n");
-}
-#endif
-
-void sub_81466A0(void) {
+void sub_81466A0(void)
+{
u16 i;
- for (i = 0; i < 5; i++) {
- if (gUnknown_0203932E.circles[i] != -1) {
+ for (i = 0; i < 5; i++)
+ {
+ if (gUnknown_0203932E.circles[i] != -1)
+ {
DestroySprite(&gSprites[gUnknown_0203932E.circles[i]]);
gUnknown_0203932E.circles[i] = -1;
}
}
}
-
__attribute__((naked))
-static void sub_81466E8(u8 taskId, s32 direction) {
+static void sub_81466E8(u8 taskId, s8 direction) {
asm(".syntax unified\n\
push {r4-r7,lr}\n\
mov r7, r8\n\
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 2e8a73ec4..b6cdda034 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -14,7 +14,8 @@
#define MOSAIC_BIT_OBJ_HSIZE (8)
#define MOSAIC_BIT_OBJ_VSIZE (12)
-enum {
+enum
+{
CONTEST_COOL,
CONTEST_BEAUTY,
CONTEST_CUTE,
@@ -22,7 +23,8 @@ enum {
CONTEST_TOUGH,
};
-enum {
+enum
+{
CONTESTRESULT_COOL = 9,
CONTESTRESULT_BEAUTY = 13,
CONTESTRESULT_CUTE = 2,
@@ -30,26 +32,36 @@ enum {
CONTESTRESULT_TOUGH = 6,
};
-struct ContestEntry {
- /* 0x00 */ u8 var0;
- /* 0x04 */ u32 var4;
- /* 0x08 */ u16 var8;
- /* 0x0A */ u8 contestType;
- /* 0x0B */ u8 pokemon_name[POKEMON_NAME_LENGTH];
- /* 0x15 */ u8 pad15;
- /* 0x16 */ u8 trainer_name[OT_NAME_LENGTH];
+struct Unk2015E00
+{
+ u16 unk2015e00[128][32];
+ u16 unk2017e00[0];
};
-struct Unk3000756 {
- /* 0x00 */ u8 var_0;
+struct ContestEntry
+{
+ /*0x00*/ u8 var0;
+ /*0x04*/ u32 var4;
+ /*0x08*/ u16 var8;
+ /*0x0A*/ u8 contestType;
+ /*0x0B*/ u8 pokemon_name[POKEMON_NAME_LENGTH];
+ /*0x15*/ u8 pad15;
+ /*0x16*/ u8 trainer_name[OT_NAME_LENGTH];
};
-struct LabelPair {
+struct Unk3000756
+{
+ /*0x00*/ u8 var_0;
+};
+
+struct LabelPair
+{
u8 (*prefix)[];
u8 (*suffix)[];
};
-struct Unk03005E20 {
+struct Unk03005E20
+{
u8 var_0;
u8 pad1[3];
u16 (*var_4)[][32];
@@ -68,19 +80,18 @@ struct Unk03005E20 {
u8 var_1F;
};
-extern struct Unk03005E20 gUnknown_03005E20;
-extern u16 (*gUnknown_03005E90)[];
-
-extern u8 gUnknown_03005E40[];
-
extern u8 unk_2000000[];
-extern u8 unk_2015de0[];
+extern struct ContestEntry unk_2015de0;
+extern struct Unk2015E00 unk_2015e00;
+extern u8 gUnknown_03000750;
extern u16 gUnknown_03000752;
extern u16 gUnknown_03000754;
extern struct Unk3000756 gUnknown_03000756;
+extern u16 (*gUnknown_03005E10)[][32];
+extern struct Unk03005E20 gUnknown_03005E20;
+extern u8 gUnknown_03005E40[];
extern struct ContestEntry *gUnknown_03005E8C;
-
-extern u16 (*gUnknown_03005E10)[32][32];
+extern u16 (*gUnknown_03005E90)[];
extern const struct SpriteSheet gMonFrontPicTable[];
extern const struct MonCoords gMonFrontPicCoords[];
@@ -113,24 +124,25 @@ extern u16 gUnknown_083F6140[];
extern u8 gContestText_ContestWinner[];
extern u8 gOtherText_Unknown1[];
-void HoldContestPainting(void);
-void ShowContestPainting();
-void ContestPaintingInitWindow(u8 arg0);
-void ContestPaintingInitVars(u8 arg0);
-void sub_8107090(u8 arg0, u8 arg1);
-void ContestPaintingPrintCaption(u8 arg0, u8 arg1);
-void ContestPaintingInitBG(void);
-void CB2_HoldContestPainting(void);
-void VBlankCB_ContestPainting(void);
-
-void sub_80FC7A0(struct Unk03005E20*);
-void sub_80FDA18(struct Unk03005E20*);
-void sub_80FD8CC(struct Unk03005E20*);
+static void ShowContestPainting();
+static void CB2_HoldContestPainting(void);
+static void HoldContestPainting(void);
+static void ContestPaintingInitWindow(u8 arg0);
+static void ContestPaintingPrintCaption(u8 arg0, u8 arg1);
+static void ContestPaintingInitBG(void);
+static void ContestPaintingInitVars(u8 arg0);
+static void VBlankCB_ContestPainting(void);
+void sub_8106B90(); //should be static
+static void sub_8107090(u8 arg0, u8 arg1);
+
+extern void sub_80FC7A0(struct Unk03005E20*);
+extern void sub_80FDA18(struct Unk03005E20*);
+extern void sub_80FD8CC(struct Unk03005E20*);
extern void *species_and_otid_get_pal();
-void sub_8106B90();
__attribute__((naked))
-void sub_8106630(u32 arg0) {
+void sub_8106630(u32 arg0)
+{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
ldr r2, _0810665C @ =0x02015de0\n\
@@ -161,371 +173,128 @@ _08106664: .4byte 0x00002dfc\n\
.syntax divided\n");
}
-void CB2_ContestPainting(void) {
+void CB2_ContestPainting(void)
+{
ShowContestPainting();
}
-#ifdef NONMATCHING
-void ShowContestPainting(void) {
- switch (gMain.state) {
- case 0:
- remove_some_task();
- SetVBlankCallback(NULL);
- gUnknown_03005E8C->data = &unk_2015de0;
- ContestPaintingInitVars(FALSE);
- ContestPaintingInitBG();
- gMain.state += 1;
- break;
-
- case 1:
- ResetPaletteFade();
-
- // DMA STUFF
-
- ResetSpriteData();
- gMain.state += 1;
- break;
-
- case 2:
- SeedRng(gMain.vblankCounter1);
- InitKeys();
- ContestPaintingInitWindow(unk_2000000[0x15DDF]);
- gMain.state += 1;
- break;
-
- case 3:
- sub_8107090(unk_2000000[0x15DDE], unk_2000000[0x15DDF]);
- gMain.state += 1;
- break;
-
- case 4:
- ContestPaintingPrintCaption(unk_2000000[0x15DDE], unk_2000000[0x15DDF]);
- LoadPalette(gUnknown_083F6140, 0, 1 * 2);
- // DMA STUFF
- BeginFastPaletteFade(2);
- SetVBlankCallback(VBlankCB_ContestPainting);
- REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON;
- SetMainCallback2(CB2_HoldContestPainting);
- break;
+static void ShowContestPainting(void)
+{
+ switch (gMain.state)
+ {
+ case 0:
+ remove_some_task();
+ SetVBlankCallback(NULL);
+ gUnknown_03005E8C = &unk_2015de0;
+ ContestPaintingInitVars(TRUE);
+ ContestPaintingInitBG();
+ gMain.state++;
+ break;
+ case 1:
+ {
+ u8 *addr;
+ size_t size;
+
+ ResetPaletteFade();
+ addr = (void *)VRAM;
+ size = 0x18000;
+ while (1)
+ {
+ DmaFill32(3, 0, addr, 0x1000);
+ addr += 0x1000;
+ size -= 0x1000;
+ if (size <= 0x1000)
+ {
+ DmaFill32(3, 0, addr, size);
+ break;
+ }
+ }
+ ResetSpriteData();
+ gMain.state++;
+ break;
+ }
+ case 2:
+ SeedRng(gMain.vblankCounter1);
+ InitKeys();
+ ContestPaintingInitWindow(unk_2000000[0x15DDF]);
+ gMain.state++;
+ break;
+ case 3:
+ sub_8107090(unk_2000000[0x15DDE], unk_2000000[0x15DDF]);
+ gMain.state++;
+ break;
+ case 4:
+ ContestPaintingPrintCaption(unk_2000000[0x15DDE], unk_2000000[0x15DDF]);
+ LoadPalette(gUnknown_083F6140, 0, 1 * 2);
+ DmaClear32(3, PLTT, 0x400);
+ BeginFastPaletteFade(2);
+ SetVBlankCallback(VBlankCB_ContestPainting);
+ gUnknown_03000750 = 0;
+ REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON;
+ SetMainCallback2(CB2_HoldContestPainting);
+ break;
}
-}
-#else
-__attribute__((naked))
-void ShowContestPainting(void) {
- asm(".syntax unified\n\
- push {r4-r7,lr}\n\
- sub sp, 0x4\n\
- ldr r1, _08106694 @ =gMain\n\
- ldr r2, _08106698 @ =0x0000043c\n\
- adds r0, r1, r2\n\
- ldrb r0, [r0]\n\
- adds r4, r1, 0\n\
- cmp r0, 0x4\n\
- bls _08106688\n\
- b _081067E0\n\
-_08106688:\n\
- lsls r0, 2\n\
- ldr r1, _0810669C @ =_081066A0\n\
- adds r0, r1\n\
- ldr r0, [r0]\n\
- mov pc, r0\n\
- .align 2, 0\n\
-_08106694: .4byte gMain\n\
-_08106698: .4byte 0x0000043c\n\
-_0810669C: .4byte _081066A0\n\
- .align 2, 0\n\
-_081066A0:\n\
- .4byte _081066B4\n\
- .4byte _081066D8\n\
- .4byte _08106734\n\
- .4byte _0810675C\n\
- .4byte _0810678C\n\
-_081066B4:\n\
- bl remove_some_task\n\
- movs r0, 0\n\
- bl SetVBlankCallback\n\
- ldr r1, _081066D0 @ =gUnknown_03005E8C\n\
- ldr r0, _081066D4 @ =0x02015de0\n\
- str r0, [r1]\n\
- movs r0, 0x1\n\
- bl ContestPaintingInitVars\n\
- bl ContestPaintingInitBG\n\
- b _0810676E\n\
- .align 2, 0\n\
-_081066D0: .4byte gUnknown_03005E8C\n\
-_081066D4: .4byte 0x02015de0\n\
-_081066D8:\n\
- bl ResetPaletteFade\n\
- movs r2, 0xC0\n\
- lsls r2, 19\n\
- movs r3, 0xC0\n\
- lsls r3, 9\n\
- movs r5, 0\n\
- ldr r1, _08106724 @ =0x040000d4\n\
- movs r4, 0x80\n\
- lsls r4, 5\n\
- ldr r6, _08106728 @ =0x85000400\n\
- movs r7, 0x85\n\
- lsls r7, 24\n\
-_081066F2:\n\
- str r5, [sp]\n\
- mov r0, sp\n\
- str r0, [r1]\n\
- str r2, [r1, 0x4]\n\
- str r6, [r1, 0x8]\n\
- ldr r0, [r1, 0x8]\n\
- adds r2, r4\n\
- subs r3, r4\n\
- cmp r3, r4\n\
- bhi _081066F2\n\
- str r5, [sp]\n\
- mov r0, sp\n\
- str r0, [r1]\n\
- str r2, [r1, 0x4]\n\
- lsrs r0, r3, 2\n\
- orrs r0, r7\n\
- str r0, [r1, 0x8]\n\
- ldr r0, [r1, 0x8]\n\
- bl ResetSpriteData\n\
- ldr r1, _0810672C @ =gMain\n\
- ldr r2, _08106730 @ =0x0000043c\n\
- adds r1, r2\n\
- b _08106774\n\
- .align 2, 0\n\
-_08106724: .4byte 0x040000d4\n\
-_08106728: .4byte 0x85000400\n\
-_0810672C: .4byte gMain\n\
-_08106730: .4byte 0x0000043c\n\
-_08106734:\n\
- ldrh r0, [r4, 0x20]\n\
- bl SeedRng\n\
- bl InitKeys\n\
- ldr r0, _08106750 @ =0x02000000\n\
- ldr r1, _08106754 @ =0x00015ddf\n\
- adds r0, r1\n\
- ldrb r0, [r0]\n\
- bl ContestPaintingInitWindow\n\
- ldr r2, _08106758 @ =0x0000043c\n\
- adds r1, r4, r2\n\
- b _08106774\n\
- .align 2, 0\n\
-_08106750: .4byte 0x02000000\n\
-_08106754: .4byte 0x00015ddf\n\
-_08106758: .4byte 0x0000043c\n\
-_0810675C:\n\
- ldr r1, _0810677C @ =0x02000000\n\
- ldr r2, _08106780 @ =0x00015dde\n\
- adds r0, r1, r2\n\
- ldrb r0, [r0]\n\
- adds r2, 0x1\n\
- adds r1, r2\n\
- ldrb r1, [r1]\n\
- bl sub_8107090\n\
-_0810676E:\n\
- ldr r1, _08106784 @ =gMain\n\
- ldr r0, _08106788 @ =0x0000043c\n\
- adds r1, r0\n\
-_08106774:\n\
- ldrb r0, [r1]\n\
- adds r0, 0x1\n\
- strb r0, [r1]\n\
- b _081067E0\n\
- .align 2, 0\n\
-_0810677C: .4byte 0x02000000\n\
-_08106780: .4byte 0x00015dde\n\
-_08106784: .4byte gMain\n\
-_08106788: .4byte 0x0000043c\n\
-_0810678C:\n\
- ldr r1, _081067E8 @ =0x02000000\n\
- ldr r2, _081067EC @ =0x00015dde\n\
- adds r0, r1, r2\n\
- ldrb r0, [r0]\n\
- adds r2, 0x1\n\
- adds r1, r2\n\
- ldrb r1, [r1]\n\
- bl ContestPaintingPrintCaption\n\
- ldr r0, _081067F0 @ =gUnknown_083F6140\n\
- movs r1, 0\n\
- movs r2, 0x2\n\
- bl LoadPalette\n\
- movs r1, 0xA0\n\
- lsls r1, 19\n\
- movs r4, 0\n\
- str r4, [sp]\n\
- ldr r0, _081067F4 @ =0x040000d4\n\
- mov r2, sp\n\
- str r2, [r0]\n\
- str r1, [r0, 0x4]\n\
- ldr r1, _081067F8 @ =0x85000100\n\
- str r1, [r0, 0x8]\n\
- ldr r0, [r0, 0x8]\n\
- movs r0, 0x2\n\
- bl BeginFastPaletteFade\n\
- ldr r0, _081067FC @ =VBlankCB_ContestPainting\n\
- bl SetVBlankCallback\n\
- ldr r0, _08106800 @ =gUnknown_03000750\n\
- strb r4, [r0]\n\
- movs r1, 0x80\n\
- lsls r1, 19\n\
- movs r2, 0x9A\n\
- lsls r2, 5\n\
- adds r0, r2, 0\n\
- strh r0, [r1]\n\
- ldr r0, _08106804 @ =CB2_HoldContestPainting\n\
- bl SetMainCallback2\n\
-_081067E0:\n\
- add sp, 0x4\n\
- pop {r4-r7}\n\
- pop {r0}\n\
- bx r0\n\
- .align 2, 0\n\
-_081067E8: .4byte 0x02000000\n\
-_081067EC: .4byte 0x00015dde\n\
-_081067F0: .4byte gUnknown_083F6140\n\
-_081067F4: .4byte 0x040000d4\n\
-_081067F8: .4byte 0x85000100\n\
-_081067FC: .4byte VBlankCB_ContestPainting\n\
-_08106800: .4byte gUnknown_03000750\n\
-_08106804: .4byte CB2_HoldContestPainting\n\
- .syntax divided\n");
}
-#endif
-
-void CB2_HoldContestPainting(void) {
+static void CB2_HoldContestPainting(void)
+{
HoldContestPainting();
UpdatePaletteFade();
}
-void CB2_QuitContestPainting(void) {
+static void CB2_QuitContestPainting(void)
+{
SetMainCallback2(gMain.savedCallback);
}
-__attribute__((naked))
-void HoldContestPainting(void) {
- asm(".syntax unified\n\
- push {lr}\n\
- sub sp, 0x4\n\
- ldr r3, _08106844 @ =gUnknown_03000750\n\
- ldrb r1, [r3]\n\
- cmp r1, 0x1\n\
- beq _08106880\n\
- cmp r1, 0x1\n\
- bgt _08106848\n\
- cmp r1, 0\n\
- beq _0810684E\n\
- b _081068E6\n\
- .align 2, 0\n\
-_08106844: .4byte gUnknown_03000750\n\
-_08106848:\n\
- cmp r1, 0x2\n\
- beq _081068C0\n\
- b _081068E6\n\
-_0810684E:\n\
- ldr r0, _08106874 @ =gPaletteFade\n\
- ldrb r1, [r0, 0x7]\n\
- movs r0, 0x80\n\
- ands r0, r1\n\
- cmp r0, 0\n\
- bne _0810685E\n\
- movs r0, 0x1\n\
- strb r0, [r3]\n\
-_0810685E:\n\
- ldr r0, _08106878 @ =gUnknown_03000756\n\
- ldrb r0, [r0]\n\
- cmp r0, 0\n\
- beq _081068E6\n\
- ldr r1, _0810687C @ =gUnknown_03000754\n\
- ldrh r0, [r1]\n\
- cmp r0, 0\n\
- beq _081068E6\n\
- subs r0, 0x1\n\
- b _081068E4\n\
- .align 2, 0\n\
-_08106874: .4byte gPaletteFade\n\
-_08106878: .4byte gUnknown_03000756\n\
-_0810687C: .4byte gUnknown_03000754\n\
-_08106880:\n\
- ldr r0, _081068B4 @ =gMain\n\
- ldrh r2, [r0, 0x2E]\n\
- ands r1, r2\n\
- cmp r1, 0\n\
- bne _08106892\n\
- movs r0, 0x2\n\
- ands r0, r2\n\
- cmp r0, 0\n\
- beq _081068A4\n\
-_08106892:\n\
- movs r0, 0x2\n\
- strb r0, [r3]\n\
- subs r0, 0x3\n\
- movs r1, 0\n\
- str r1, [sp]\n\
- movs r2, 0\n\
- movs r3, 0x10\n\
- bl BeginNormalPaletteFade\n\
-_081068A4:\n\
- ldr r0, _081068B8 @ =gUnknown_03000756\n\
- ldrb r0, [r0]\n\
- cmp r0, 0\n\
- beq _081068E6\n\
- ldr r1, _081068BC @ =gUnknown_03000754\n\
- movs r0, 0\n\
- b _081068E4\n\
- .align 2, 0\n\
-_081068B4: .4byte gMain\n\
-_081068B8: .4byte gUnknown_03000756\n\
-_081068BC: .4byte gUnknown_03000754\n\
-_081068C0:\n\
- ldr r0, _081068EC @ =gPaletteFade\n\
- ldrb r1, [r0, 0x7]\n\
- movs r0, 0x80\n\
- ands r0, r1\n\
- cmp r0, 0\n\
- bne _081068D2\n\
- ldr r0, _081068F0 @ =CB2_QuitContestPainting\n\
- bl SetMainCallback2\n\
-_081068D2:\n\
- ldr r0, _081068F4 @ =gUnknown_03000756\n\
- ldrb r0, [r0]\n\
- cmp r0, 0\n\
- beq _081068E6\n\
- ldr r1, _081068F8 @ =gUnknown_03000754\n\
- ldrh r0, [r1]\n\
- cmp r0, 0x1D\n\
- bhi _081068E6\n\
- adds r0, 0x1\n\
-_081068E4:\n\
- strh r0, [r1]\n\
-_081068E6:\n\
- add sp, 0x4\n\
- pop {r0}\n\
- bx r0\n\
- .align 2, 0\n\
-_081068EC: .4byte gPaletteFade\n\
-_081068F0: .4byte CB2_QuitContestPainting\n\
-_081068F4: .4byte gUnknown_03000756\n\
-_081068F8: .4byte gUnknown_03000754\n\
- .syntax divided\n");
+static void HoldContestPainting(void)
+{
+ switch (gUnknown_03000750)
+ {
+ case 0:
+ if (!gPaletteFade.active)
+ gUnknown_03000750 = 1;
+ if (gUnknown_03000756.var_0 != 0 && gUnknown_03000754 != 0)
+ gUnknown_03000754--;
+ break;
+ case 1:
+ if ((gMain.newKeys & 1) || (gMain.newKeys & 2))
+ {
+ u8 two = 2; //needed to make the asm match
+
+ gUnknown_03000750 = two;
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ }
+ if (gUnknown_03000756.var_0 != 0)
+ gUnknown_03000754 = 0;
+ break;
+ case 2:
+ if (!gPaletteFade.active)
+ SetMainCallback2(CB2_QuitContestPainting);
+ if (gUnknown_03000756.var_0 != 0 && gUnknown_03000754 <= 0x1D)
+ gUnknown_03000754++;
+ break;
+ }
}
-void ContestPaintingInitWindow(u8 arg0) {
+static void ContestPaintingInitWindow(u8 arg0)
+{
InitMenuWindow(&gWindowConfig_81E7160);
SetUpWindowConfig(&gWindowConfig_81E7160);
}
-void ContestPaintingPrintCaption(u8 contestType, u8 arg1) {
+static void ContestPaintingPrintCaption(u8 contestType, u8 arg1)
+{
u8 xPos, yPos;
u8 *ptr;
u8 type;
- if (arg1 == TRUE) {
+ if (arg1 == TRUE)
return;
- }
-
ptr = gUnknown_03005E40;
type = gUnknown_03005E8C->contestType;
- if (contestType < 8) {
+ if (contestType < 8)
+ {
ptr = StringCopy(ptr, gUnknown_083F60AC[type]);
ptr = StringCopy(ptr, gContestText_ContestWinner);
ptr = StringCopy(ptr, gUnknown_03005E8C->trainer_name);
@@ -540,7 +309,9 @@ void ContestPaintingPrintCaption(u8 contestType, u8 arg1) {
xPos = 6;
yPos = 14;
- } else {
+ }
+ else
+ {
ptr = StringCopy(ptr, *gUnknown_083F60C0[type].prefix);
ptr = StringCopy10(ptr, gUnknown_03005E8C->pokemon_name);
ptr = StringCopy(ptr, *gUnknown_083F60C0[type].suffix);
@@ -548,11 +319,11 @@ void ContestPaintingPrintCaption(u8 contestType, u8 arg1) {
xPos = 3;
yPos = 14;
}
-
MenuPrint_PixelCoords(gUnknown_03005E40, xPos * 8 + 1, yPos * 8, 1);
}
-void ContestPaintingInitBG(void) {
+static void ContestPaintingInitBG(void)
+{
REG_DISPCNT = 0;
REG_IE |= INTR_FLAG_VBLANK;
REG_BG0CNT = 0x0C42;
@@ -562,20 +333,26 @@ void ContestPaintingInitBG(void) {
REG_BLDY = 0;
}
-void ContestPaintingInitVars(bool8 arg0) {
- if (arg0 == 0) {
+static void ContestPaintingInitVars(bool8 arg0)
+{
+ if (arg0 == FALSE)
+ {
gUnknown_03000756.var_0 = FALSE;
gUnknown_03000752 = 0;
gUnknown_03000754 = 0;
- } else {
+ }
+ else
+ {
gUnknown_03000756.var_0 = TRUE;
gUnknown_03000752 = 15;
gUnknown_03000754 = 30;
}
}
-void ContestPaintingMosaic(void) {
- if (gUnknown_03000756.var_0 == FALSE) {
+static void ContestPaintingMosaic(void)
+{
+ if (gUnknown_03000756.var_0 == FALSE)
+ {
REG_MOSAIC = 0;
return;
}
@@ -586,19 +363,23 @@ void ContestPaintingMosaic(void) {
REG_MOSAIC = (gUnknown_03000752 << 12) | (gUnknown_03000752 << 8) | (gUnknown_03000752 << 4) | (gUnknown_03000752 << 0);
}
-void VBlankCB_ContestPainting(void) {
+static void VBlankCB_ContestPainting(void)
+{
ContestPaintingMosaic();
LoadOam();
ProcessSpriteCopyRequests();
TransferPlttBuffer();
}
-struct MonCoords {
- u8 x, y;
+
+struct MonCoords
+{
+ u8 x;
+ u8 y;
};
#ifdef NONMATCHING
-void sub_8106AC4(u16 species, u8 arg1) {
+static void sub_8106AC4(u16 species, u8 arg1) {
void *pal;
// Unsure what gUnknown_03005E8C->var0 is supposed to be.
@@ -631,7 +412,7 @@ void sub_8106AC4(u16 species, u8 arg1) {
}
#else
__attribute__((naked))
-void sub_8106AC4(u16 arg0, u8 arg2) {
+static void sub_8106AC4(u16 arg0, u8 arg2) {
asm(".syntax unified\n\
push {r4-r7,lr}\n\
mov r7, r8\n\
@@ -727,8 +508,44 @@ _08106B8C: .4byte gUnknown_03005E10\n\
}
#endif
+#ifdef NONMATCHING
+void sub_8106B90(u8 a[][8][8][4], u16 b[], u16 c[][8][8][8])
+{
+ u16 i;
+ u16 j;
+ u16 k;
+ u16 l;
+
+ for (i = 0; i < 8; i++)
+ {
+ for (j = 0; j < 8; j++)
+ {
+ for (k = 0; k < 8; k++)
+ {
+ for (l = 0; l < 8; l++)
+ {
+ //u8 *arr = a[i][j][k];
+ //u8 r1 = arr[l / 2];
+ u8 r1 = a[i][j][k][l / 2];
+
+ if (l & 1)
+ r1 /= 16;
+ else
+ r1 %= 16;
+ //_08106BEA
+ if (r1 == 0)
+ c[i][k][j][l] = 0x8000;
+ else
+ c[i][k][j][l] = b[r1];
+ }
+ }
+ }
+ }
+}
+#else
__attribute__((naked))
-void sub_8106B90() {
+void sub_8106B90()
+{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
mov r7, r10\n\
@@ -828,481 +645,146 @@ _08106C08:\n\
bx r0\n\
.syntax divided\n");
}
+#endif
-#ifdef NONMATCHING
-void sub_8106C40(u8 arg0, u8 arg1) {
+static void sub_8106C40(u8 arg0, u8 arg1)
+{
+ u8 x, y;
+
LoadPalette(gPictureFramePalettes, 0, 128 * 2);
-
- if (arg1 == 1) {
- switch (gUnknown_03005E8C->contestType / 3) {
- case CONTEST_COOL:
- RLUnCompVram(gPictureFrameTiles_0, (void *) VRAM);
- RLUnCompWram(gPictureFrameTilemap_0, gUnknown_03005E10);
- break;
-
- case CONTEST_BEAUTY:
- RLUnCompVram(gPictureFrameTiles_1, (void *) VRAM);
- RLUnCompWram(gPictureFrameTilemap_1, gUnknown_03005E10);
- break;
-
- case CONTEST_CUTE:
- RLUnCompVram(gPictureFrameTiles_2, (void *) VRAM);
- RLUnCompWram(gPictureFrameTilemap_2, gUnknown_03005E10);
- break;
-
- case CONTEST_SMART:
- RLUnCompVram(gPictureFrameTiles_3, (void *) VRAM);
- RLUnCompWram(gPictureFrameTilemap_3, gUnknown_03005E10);
- break;
-
- case CONTEST_TOUGH:
- RLUnCompVram(gPictureFrameTiles_4, (void *) VRAM);
- RLUnCompWram(gPictureFrameTilemap_4, gUnknown_03005E10);
- break;
+ if (arg1 == 1)
+ {
+ switch (gUnknown_03005E8C->contestType / 3)
+ {
+ case CONTEST_COOL:
+ RLUnCompVram(gPictureFrameTiles_0, (void *) VRAM);
+ RLUnCompWram(gPictureFrameTilemap_0, gUnknown_03005E10);
+ break;
+ case CONTEST_BEAUTY:
+ RLUnCompVram(gPictureFrameTiles_1, (void *) VRAM);
+ RLUnCompWram(gPictureFrameTilemap_1, gUnknown_03005E10);
+ break;
+ case CONTEST_CUTE:
+ RLUnCompVram(gPictureFrameTiles_2, (void *) VRAM);
+ RLUnCompWram(gPictureFrameTilemap_2, gUnknown_03005E10);
+ break;
+ case CONTEST_SMART:
+ RLUnCompVram(gPictureFrameTiles_3, (void *) VRAM);
+ RLUnCompWram(gPictureFrameTilemap_3, gUnknown_03005E10);
+ break;
+ case CONTEST_TOUGH:
+ RLUnCompVram(gPictureFrameTiles_4, (void *) VRAM);
+ RLUnCompWram(gPictureFrameTilemap_4, gUnknown_03005E10);
+ break;
}
-
+
+ #define VRAM_PICTURE_DATA(x, y) (((u16 *)(VRAM + 0x6000))[(y) * 32 + (x)])
+
+ // Set the background
+ for (y = 0; y < 20; y++)
{
- u8 x;
- u8 y;
-
- u16 (*vram)[32][32] = (void *) (VRAM + 0x6000);
-
- // Set the background
- for (y = 0; y < 20; y++) {
- for (x = 0; x < 32; x++) {
- (*vram)[y][x] = 1 << 12 | 21;
- }
- }
-
- // Copy the image frame
- for (y = 0; y < 10; y++) {
- for (x = 0; x < 18; x++) {
- (*vram)[y + 2][x + 6] = (*gUnknown_03005E10)[y + 2][x + 6];
- }
- }
-
- // Re-set the entire top row to the first top frame part
- for (x = 0; x < 16; x++) {
- (*vram)[2][x + 7] = (*gUnknown_03005E10)[2][7];
- }
+ for (x = 0; x < 32; x++)
+ VRAM_PICTURE_DATA(x, y) = 0x1015;
}
- // def_8106C7A
- } else {
- if (arg0 < 8) {
- RLUnCompVram(gPictureFrameTiles_5, (void *) VRAM);
- RLUnCompVram(gPictureFrameTilemap_5, (void *) (VRAM + 0x6000));
- return;
+ // Copy the image frame
+ for (y = 0; y < 10; y++)
+ {
+ for (x = 0; x < 18; x++)
+ VRAM_PICTURE_DATA(x + 6, y + 2) = (*gUnknown_03005E10)[y + 2][x + 6];
}
- switch (gUnknown_03005E8C->contestType / 3) {
- case CONTEST_COOL:
- RLUnCompVram(gPictureFrameTiles_0, (void *) VRAM);
- RLUnCompVram(gPictureFrameTilemap_0, (void *) (VRAM + 0x6000));
- break;
-
- case CONTEST_BEAUTY:
- RLUnCompVram(gPictureFrameTiles_1, (void *) VRAM);
- RLUnCompVram(gPictureFrameTilemap_1, (void *) (VRAM + 0x6000));
- break;
-
- case CONTEST_CUTE:
- RLUnCompVram(gPictureFrameTiles_2, (void *) VRAM);
- RLUnCompVram(gPictureFrameTilemap_2, (void *) (VRAM + 0x6000));
- break;
-
- case CONTEST_SMART:
- RLUnCompVram(gPictureFrameTiles_3, (void *) VRAM);
- RLUnCompVram(gPictureFrameTilemap_3, (void *) (VRAM + 0x6000));
- break;
-
- case CONTEST_TOUGH:
- RLUnCompVram(gPictureFrameTiles_4, (void *) VRAM);
- RLUnCompVram(gPictureFrameTilemap_4, (void *) (VRAM + 0x6000));
- break;
+ // Re-set the entire top row to the first top frame part
+ for (x = 0; x < 16; x++)
+ VRAM_PICTURE_DATA(x + 7, 2) = (*gUnknown_03005E10)[2][7];
+
+ #undef VRAM_PICTURE_DATA
+ }
+ else if (arg0 < 8)
+ {
+ RLUnCompVram(gPictureFrameTiles_5, (void *) VRAM);
+ RLUnCompVram(gPictureFrameTilemap_5, (void *) (VRAM + 0x6000));
+ }
+ else
+ {
+ switch (gUnknown_03005E8C->contestType / 3)
+ {
+ case CONTEST_COOL:
+ RLUnCompVram(gPictureFrameTiles_0, (void *) VRAM);
+ RLUnCompVram(gPictureFrameTilemap_0, (void *) (VRAM + 0x6000));
+ break;
+ case CONTEST_BEAUTY:
+ RLUnCompVram(gPictureFrameTiles_1, (void *) VRAM);
+ RLUnCompVram(gPictureFrameTilemap_1, (void *) (VRAM + 0x6000));
+ break;
+ case CONTEST_CUTE:
+ RLUnCompVram(gPictureFrameTiles_2, (void *) VRAM);
+ RLUnCompVram(gPictureFrameTilemap_2, (void *) (VRAM + 0x6000));
+ break;
+ case CONTEST_SMART:
+ RLUnCompVram(gPictureFrameTiles_3, (void *) VRAM);
+ RLUnCompVram(gPictureFrameTilemap_3, (void *) (VRAM + 0x6000));
+ break;
+ case CONTEST_TOUGH:
+ RLUnCompVram(gPictureFrameTiles_4, (void *) VRAM);
+ RLUnCompVram(gPictureFrameTilemap_4, (void *) (VRAM + 0x6000));
+ break;
}
}
}
-#else
-__attribute__((naked))
-void sub_8106C40(u8 arg0, u8 arg1) {
- asm(".syntax unified\n\
- push {r4-r7,lr}\n\
- adds r4, r1, 0\n\
- lsls r0, 24\n\
- lsrs r5, r0, 24\n\
- lsls r4, 24\n\
- lsrs r4, 24\n\
- ldr r0, _08106C7C @ =gPictureFramePalettes\n\
- movs r2, 0x80\n\
- lsls r2, 1\n\
- movs r1, 0\n\
- bl LoadPalette\n\
- cmp r4, 0x1\n\
- beq _08106C5E\n\
- b _08106DB4\n\
-_08106C5E:\n\
- ldr r0, _08106C80 @ =gUnknown_03005E8C\n\
- ldr r0, [r0]\n\
- ldrb r0, [r0, 0xA]\n\
- movs r1, 0x3\n\
- bl __udivsi3\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- cmp r0, 0x4\n\
- bhi _08106D1C\n\
- lsls r0, 2\n\
- ldr r1, _08106C84 @ =_08106C88\n\
- adds r0, r1\n\
- ldr r0, [r0]\n\
- mov pc, r0\n\
- .align 2, 0\n\
-_08106C7C: .4byte gPictureFramePalettes\n\
-_08106C80: .4byte gUnknown_03005E8C\n\
-_08106C84: .4byte _08106C88\n\
- .align 2, 0\n\
-_08106C88:\n\
- .4byte _08106C9C\n\
- .4byte _08106CB4\n\
- .4byte _08106CCC\n\
- .4byte _08106CE4\n\
- .4byte _08106D08\n\
-_08106C9C:\n\
- ldr r0, _08106CAC @ =gPictureFrameTiles_0\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106CB0 @ =gPictureFrameTilemap_0\n\
- b _08106CF0\n\
- .align 2, 0\n\
-_08106CAC: .4byte gPictureFrameTiles_0\n\
-_08106CB0: .4byte gPictureFrameTilemap_0\n\
-_08106CB4:\n\
- ldr r0, _08106CC4 @ =gPictureFrameTiles_1\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106CC8 @ =gPictureFrameTilemap_1\n\
- b _08106CF0\n\
- .align 2, 0\n\
-_08106CC4: .4byte gPictureFrameTiles_1\n\
-_08106CC8: .4byte gPictureFrameTilemap_1\n\
-_08106CCC:\n\
- ldr r0, _08106CDC @ =gPictureFrameTiles_2\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106CE0 @ =gPictureFrameTilemap_2\n\
- b _08106CF0\n\
- .align 2, 0\n\
-_08106CDC: .4byte gPictureFrameTiles_2\n\
-_08106CE0: .4byte gPictureFrameTilemap_2\n\
-_08106CE4:\n\
- ldr r0, _08106CFC @ =gPictureFrameTiles_3\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106D00 @ =gPictureFrameTilemap_3\n\
-_08106CF0:\n\
- ldr r1, _08106D04 @ =gUnknown_03005E10\n\
- ldr r1, [r1]\n\
- bl RLUnCompWram\n\
- b _08106D1C\n\
- .align 2, 0\n\
-_08106CFC: .4byte gPictureFrameTiles_3\n\
-_08106D00: .4byte gPictureFrameTilemap_3\n\
-_08106D04: .4byte gUnknown_03005E10\n\
-_08106D08:\n\
- ldr r0, _08106D98 @ =gPictureFrameTiles_4\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106D9C @ =gPictureFrameTilemap_4\n\
- ldr r1, _08106DA0 @ =gUnknown_03005E10\n\
- ldr r1, [r1]\n\
- bl RLUnCompWram\n\
-_08106D1C:\n\
- movs r1, 0\n\
- ldr r5, _08106DA4 @ =0x06006000\n\
- ldr r0, _08106DA8 @ =0x00001015\n\
- adds r4, r0, 0\n\
-_08106D24:\n\
- movs r3, 0\n\
- lsls r2, r1, 5\n\
-_08106D28:\n\
- adds r0, r2, r3\n\
- lsls r0, 1\n\
- adds r0, r5\n\
- strh r4, [r0]\n\
- adds r0, r3, 0x1\n\
- lsls r0, 24\n\
- lsrs r3, r0, 24\n\
- cmp r3, 0x1F\n\
- bls _08106D28\n\
- adds r0, r1, 0x1\n\
- lsls r0, 24\n\
- lsrs r1, r0, 24\n\
- cmp r1, 0x13\n\
- bls _08106D24\n\
- movs r1, 0\n\
- ldr r0, _08106DAC @ =0x0600608c\n\
- mov r12, r0\n\
- ldr r7, _08106DA0 @ =gUnknown_03005E10\n\
-_08106D4C:\n\
- movs r3, 0\n\
- adds r6, r1, 0x1\n\
- lsls r5, r1, 5\n\
- lsls r4, r1, 6\n\
-_08106D54:\n\
- adds r2, r5, r3\n\
- lsls r2, 1\n\
- add r2, r12\n\
- ldr r0, [r7]\n\
- adds r0, r4, r0\n\
- lsls r1, r3, 1\n\
- adds r0, r1\n\
- adds r0, 0x8C\n\
- ldrh r0, [r0]\n\
- strh r0, [r2]\n\
- adds r0, r3, 0x1\n\
- lsls r0, 24\n\
- lsrs r3, r0, 24\n\
- cmp r3, 0x11\n\
- bls _08106D54\n\
- lsls r0, r6, 24\n\
- lsrs r1, r0, 24\n\
- cmp r1, 0x9\n\
- bls _08106D4C\n\
- movs r3, 0\n\
- ldr r4, _08106DB0 @ =0x0600608e\n\
- ldr r2, _08106DA0 @ =gUnknown_03005E10\n\
-_08106D80:\n\
- lsls r1, r3, 1\n\
- adds r1, r4\n\
- ldr r0, [r2]\n\
- adds r0, 0x8E\n\
- ldrh r0, [r0]\n\
- strh r0, [r1]\n\
- adds r0, r3, 0x1\n\
- lsls r0, 24\n\
- lsrs r3, r0, 24\n\
- cmp r3, 0xF\n\
- bls _08106D80\n\
- b _08106E86\n\
- .align 2, 0\n\
-_08106D98: .4byte gPictureFrameTiles_4\n\
-_08106D9C: .4byte gPictureFrameTilemap_4\n\
-_08106DA0: .4byte gUnknown_03005E10\n\
-_08106DA4: .4byte 0x06006000\n\
-_08106DA8: .4byte 0x00001015\n\
-_08106DAC: .4byte 0x0600608c\n\
-_08106DB0: .4byte 0x0600608e\n\
-_08106DB4:\n\
- cmp r5, 0x7\n\
- bhi _08106DD0\n\
- ldr r0, _08106DC8 @ =gPictureFrameTiles_5\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106DCC @ =gPictureFrameTilemap_5\n\
- b _08106E60\n\
- .align 2, 0\n\
-_08106DC8: .4byte gPictureFrameTiles_5\n\
-_08106DCC: .4byte gPictureFrameTilemap_5\n\
-_08106DD0:\n\
- ldr r0, _08106DF0 @ =gUnknown_03005E8C\n\
- ldr r0, [r0]\n\
- ldrb r0, [r0, 0xA]\n\
- movs r1, 0x3\n\
- bl __udivsi3\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- cmp r0, 0x4\n\
- bhi _08106E86\n\
- lsls r0, 2\n\
- ldr r1, _08106DF4 @ =_08106DF8\n\
- adds r0, r1\n\
- ldr r0, [r0]\n\
- mov pc, r0\n\
- .align 2, 0\n\
-_08106DF0: .4byte gUnknown_03005E8C\n\
-_08106DF4: .4byte _08106DF8\n\
- .align 2, 0\n\
-_08106DF8:\n\
- .4byte _08106E0C\n\
- .4byte _08106E24\n\
- .4byte _08106E3C\n\
- .4byte _08106E54\n\
- .4byte _08106E74\n\
-_08106E0C:\n\
- ldr r0, _08106E1C @ =gPictureFrameTiles_0\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106E20 @ =gPictureFrameTilemap_0\n\
- b _08106E60\n\
- .align 2, 0\n\
-_08106E1C: .4byte gPictureFrameTiles_0\n\
-_08106E20: .4byte gPictureFrameTilemap_0\n\
-_08106E24:\n\
- ldr r0, _08106E34 @ =gPictureFrameTiles_1\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106E38 @ =gPictureFrameTilemap_1\n\
- b _08106E60\n\
- .align 2, 0\n\
-_08106E34: .4byte gPictureFrameTiles_1\n\
-_08106E38: .4byte gPictureFrameTilemap_1\n\
-_08106E3C:\n\
- ldr r0, _08106E4C @ =gPictureFrameTiles_2\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106E50 @ =gPictureFrameTilemap_2\n\
- b _08106E60\n\
- .align 2, 0\n\
-_08106E4C: .4byte gPictureFrameTiles_2\n\
-_08106E50: .4byte gPictureFrameTilemap_2\n\
-_08106E54:\n\
- ldr r0, _08106E68 @ =gPictureFrameTiles_3\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106E6C @ =gPictureFrameTilemap_3\n\
-_08106E60:\n\
- ldr r1, _08106E70 @ =0x06006000\n\
- bl RLUnCompVram\n\
- b _08106E86\n\
- .align 2, 0\n\
-_08106E68: .4byte gPictureFrameTiles_3\n\
-_08106E6C: .4byte gPictureFrameTilemap_3\n\
-_08106E70: .4byte 0x06006000\n\
-_08106E74:\n\
- ldr r0, _08106E8C @ =gPictureFrameTiles_4\n\
- movs r1, 0xC0\n\
- lsls r1, 19\n\
- bl RLUnCompVram\n\
- ldr r0, _08106E90 @ =gPictureFrameTilemap_4\n\
- ldr r1, _08106E94 @ =0x06006000\n\
- bl RLUnCompVram\n\
-_08106E86:\n\
- pop {r4-r7}\n\
- pop {r0}\n\
- bx r0\n\
- .align 2, 0\n\
-_08106E8C: .4byte gPictureFrameTiles_4\n\
-_08106E90: .4byte gPictureFrameTilemap_4\n\
-_08106E94: .4byte 0x06006000\n\
- .syntax divided\n");
-}
-#endif
-#ifdef NONMATCHING
-void sub_8106E98(u8 arg0 ) {
+static void sub_8106E98(u8 arg0)
+{
+ //Some hacks just to get the asm to match
+#ifndef NONMATCHING
+ asm(""::"r"(arg0));
+#endif
+
gMain.oamBuffer[0] = gOamData_83F6138;
-
gMain.oamBuffer[0].tileNum = 0;
+
+#ifndef NONMATCHING
+ if (arg0) arg0 = gMain.oamBuffer[0].tileNum;
+#endif
+
gMain.oamBuffer[0].x = 88;
gMain.oamBuffer[0].y = 24;
}
-#else
-__attribute__((naked))
-void sub_8106E98(u8 arg0) {
- asm(".syntax unified\n\
- push {r4,lr}\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- ldr r4, _08106ED0 @ =gMain\n\
- ldr r1, _08106ED4 @ =gOamData_83F6138\n\
- ldr r2, [r1, 0x4]\n\
- ldr r1, [r1]\n\
- str r1, [r4, 0x3C]\n\
- str r2, [r4, 0x40]\n\
- adds r3, r4, 0\n\
- adds r3, 0x40\n\
- ldrh r2, [r3]\n\
- ldr r1, _08106ED8 @ =0xfffffc00\n\
- ands r1, r2\n\
- strh r1, [r3]\n\
- ldrh r1, [r4, 0x3E]\n\
- ldr r0, _08106EDC @ =0xfffffe00\n\
- ands r0, r1\n\
- movs r1, 0x58\n\
- orrs r0, r1\n\
- strh r0, [r4, 0x3E]\n\
- adds r1, r4, 0\n\
- adds r1, 0x3C\n\
- movs r0, 0x18\n\
- strb r0, [r1]\n\
- pop {r4}\n\
- pop {r0}\n\
- bx r0\n\
- .align 2, 0\n\
-_08106ED0: .4byte gMain\n\
-_08106ED4: .4byte gOamData_83F6138\n\
-_08106ED8: .4byte 0xfffffc00\n\
-_08106EDC: .4byte 0xfffffe00\n\
- .syntax divided\n");
-}
-#endif
-u8 sub_8106EE0(u8 arg0) {
+static u8 sub_8106EE0(u8 arg0)
+{
u8 contestType;
- if (arg0 < 8) {
+ if (arg0 < 8)
contestType = gUnknown_03005E8C->contestType;
- } else {
+ else
contestType = gUnknown_03005E8C->contestType / 3;
- }
-
- switch (contestType) {
- case CONTEST_COOL:
- return CONTESTRESULT_COOL;
-
- case CONTEST_BEAUTY:
- return CONTESTRESULT_BEAUTY;
-
- case CONTEST_CUTE:
- return CONTESTRESULT_CUTE;
-
- case CONTEST_SMART:
- return CONTESTRESULT_SMART;
- case CONTEST_TOUGH:
- return CONTESTRESULT_TOUGH;
+ switch (contestType)
+ {
+ case CONTEST_COOL:
+ return CONTESTRESULT_COOL;
+ case CONTEST_BEAUTY:
+ return CONTESTRESULT_BEAUTY;
+ case CONTEST_CUTE:
+ return CONTESTRESULT_CUTE;
+ case CONTEST_SMART:
+ return CONTESTRESULT_SMART;
+ case CONTEST_TOUGH:
+ return CONTESTRESULT_TOUGH;
}
return contestType;
}
-#ifdef NONMATCHING
-void sub_8106F4C(void) {
- gUnknown_03005E90 = (void *) 0x02017e00;
- gUnknown_03005E10 = (void *) 0x02015e00;
-}
-#else
-__attribute__((naked))
-void sub_8106F4C(void) {
- asm(".syntax unified\n\
- ldr r0, _08106F5C @ =gUnknown_03005E90\n\
- ldr r1, _08106F60 @ =0x02017e00\n\
- str r1, [r0]\n\
- ldr r0, _08106F64 @ =gUnknown_03005E10\n\
- ldr r2, _08106F68 @ =0xffffe000\n\
- adds r1, r2\n\
- str r1, [r0]\n\
- bx lr\n\
- .align 2, 0\n\
-_08106F5C: .4byte gUnknown_03005E90\n\
-_08106F60: .4byte 0x02017e00\n\
-_08106F64: .4byte gUnknown_03005E10\n\
-_08106F68: .4byte 0xffffe000\n\
- .syntax divided\n");
+static void sub_8106F4C(void)
+{
+ gUnknown_03005E90 = &unk_2015e00.unk2017e00;
+ gUnknown_03005E10 = &unk_2015e00.unk2015e00;
}
-#endif
-void sub_8106F6C(u8 arg0) {
+static void sub_8106F6C(u8 arg0)
+{
gUnknown_03005E20.var_4 = gUnknown_03005E10;
gUnknown_03005E20.var_8 = gUnknown_03005E90;
gUnknown_03005E20.var_18 = 0;
@@ -1314,18 +796,18 @@ void sub_8106F6C(u8 arg0) {
gUnknown_03005E20.var_1D = 64;
gUnknown_03005E20.var_1E = 64;
- switch (arg0) {
- case CONTESTRESULT_SMART:
- case CONTESTRESULT_TOUGH:
- gUnknown_03005E20.var_14 = 3;
- break;
-
- case CONTESTRESULT_COOL:
- case CONTESTRESULT_BEAUTY:
- case CONTESTRESULT_CUTE:
- default:
- gUnknown_03005E20.var_14 = 1;
- break;
+ switch (arg0)
+ {
+ case CONTESTRESULT_SMART:
+ case CONTESTRESULT_TOUGH:
+ gUnknown_03005E20.var_14 = 3;
+ break;
+ case CONTESTRESULT_COOL:
+ case CONTESTRESULT_BEAUTY:
+ case CONTESTRESULT_CUTE:
+ default:
+ gUnknown_03005E20.var_14 = 1;
+ break;
}
gUnknown_03005E20.var_16 = 2;
@@ -1339,15 +821,11 @@ void sub_8106F6C(u8 arg0) {
LoadPalette(gUnknown_03005E90, 256, 256 * 2);
}
-void sub_8107090(u8 arg0, u8 arg1) {
- u8 local0;
-
+static void sub_8107090(u8 arg0, u8 arg1)
+{
sub_8106F4C();
sub_8106AC4(gUnknown_03005E8C->var8, 0);
-
- local0 = sub_8106EE0(arg0);
- sub_8106F6C(local0);
-
+ sub_8106F6C(sub_8106EE0(arg0));
sub_8106E98(arg0);
sub_8106C40(arg0, arg1);
}
diff --git a/src/credits.c b/src/credits.c
index ef89707ff..13a6a1633 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -9,6 +9,72 @@
#include "task.h"
#include "text.h"
+enum {
+ PAGE_TITLE,
+ PAGE_DIRECTOR,
+ PAGE_ART_DIRECTOR,
+ PAGE_BATTLE_DIRECTOR,
+ PAGE_MAIN_PROGRAMMER,
+ PAGE_BATTLE_SYSTEM_PROGRAMMER,
+ PAGE_PROGRAMMERS_1,
+ PAGE_PROGRAMMERS_2,
+ PAGE_PROGRAMMERS_3,
+ PAGE_MAIN_GRAHPICS_DESIGNER,
+ PAGE_POKEMON_GRAHPIC_DESIGNERS_1,
+ PAGE_POKEMON_GRAHPIC_DESIGNERS_2,
+ PAGE_POKEMON_GRAHPIC_DESIGNERS_3,
+ PAGE_POKEMON_DESIGNERS_1,
+ PAGE_POKEMON_DESIGNERS_2,
+ PAGE_MUSIC_COMPOSITION,
+ PAGE_SOUND_EFFECTS,
+ PAGE_GAME_DESIGNERS_1,
+ PAGE_GAME_DESIGNERS_2,
+ PAGE_GAME_DESIGNERS_3,
+ PAGE_PLOT_SCENARIO,
+ PAGE_GAME_SCENARIO,
+ PAGE_SCRIPT_DESIGNERS,
+ PAGE_MAP_DESIGNERS,
+ PAGE_MAP_DATA_DESIGNERS,
+ PAGE_PARAMETRIC_DESIGNERS,
+ PAGE_POKEDEX_TEXT,
+ PAGE_ENVIRONMENT_TOOLS,
+ PAGE_PRODUCT_TESTING,
+ PAGE_SPECIAL_THANKS,
+ PAGE_SPECIAL_THANKS_1,
+ PAGE_SPECIAL_THANKS_2,
+ PAGE_SPECIAL_THANKS_3,
+ PAGE_INFORMATION_SUPERVISORS,
+ PAGE_COORDINATORS,
+ PAGE_TASK_MANAGERS,
+ PAGE_PRODUCERS,
+ PAGE_EXECUTIVE_DIRECTOR,
+ PAGE_EXECUTIVE_PRODUCERS_1,
+ PAGE_EXECUTIVE_PRODUCERS_2,
+ PAGE_TRANSLATION_COORDINATOR,
+ PAGE_TRANSLATORS,
+ PAGE_PROGRAMMERS,
+ PAGE_GRAPHIC_DESIGNERS,
+ PAGE_PRODUCT_SUPPORT,
+ PAGE_ARTWORK,
+ PAGE_TEXT_EDITOR,
+ PAGE_NOA_TESTING,
+ PAGE_BRAILLE_CODE_CHECK_1,
+ PAGE_BRAILLE_CODE_CHECK_2,
+ PAGE_SPECIAL_THANKS_4,
+ PAGE_SPECIAL_THANKS_5,
+
+ PAGE_COUNT
+};
+
+#define UNK_DEFINE_82 (0x82)
+
+#define COLOR_DARK_GREEN 0x1967
+#define COLOR_LIGHT_GREEN 0x328D
+
+enum {
+ TD_CURRENT_PAGE = 2,
+};
+
struct Unk201C000 {
u8 pad_00[0x88];
u16 var_88;
@@ -22,6 +88,11 @@ struct HallOfFame {
u8 sheet2[0x800];
};
+struct CreditsEntry {
+ u8 var_0;
+ u8 *text;
+};
+
extern struct Unk201C000 unk_201C000;
extern struct HallOfFame gHallOfFame;
@@ -45,6 +116,7 @@ extern u8 gBirchHelpGfx[];
// data/credits
extern u16 gUnknown_0840B7BC[32];
extern u16 gUnknown_0840B7FC[32];
+extern struct CreditsEntry *gCreditsEntryPointerTable[][5];
extern struct SpriteSheet gUnknown_0840CAA0;
extern struct SpritePalette gUnknown_0840CAB0;
@@ -62,8 +134,9 @@ static void sub_8144024(u8 taskId);
static void sub_8144080(u8 taskId);
static void sub_8144114(u8 taskId);
static void sub_8144130(void);
+static void sub_81441B8(u8 taskId);
+static u8 sub_8144454(u8 page, u8 taskId);
-void sub_81441B8(u8 taskId);
void sub_8144514(u8 taskId);
u8 sub_8144ECC(u8 data, u8 taskId);
void sub_81450AC(u8 taskId);
@@ -83,15 +156,18 @@ static void sub_814395C(void) {
BuildOamBuffer();
UpdatePaletteFade();
- if (!(gMain.heldKeys & B_BUTTON)) {
+ if (!(gMain.heldKeys & B_BUTTON))
+ {
return;
}
- if (!gUnknown_02039324) {
+ if (!gUnknown_02039324)
+ {
return;
}
- if (gTasks[gUnknown_02039322].func != sub_8143B68) {
+ if (gTasks[gUnknown_02039322].func != sub_8143B68)
+ {
return;
}
@@ -108,7 +184,7 @@ void sub_81439D0(void) {
s16 taskId3;
u8 taskId2;
u16 savedIme;
- struct Unk201C000 * c000;
+ struct Unk201C000 *c000;
sub_8144130();
SetVBlankCallback(NULL);
@@ -122,8 +198,10 @@ void sub_81439D0(void) {
gTasks[taskId].data[11] = 0;
gTasks[taskId].data[13] = 1;
- while (TRUE) {
- if (sub_8144ECC(0, taskId)) {
+ while (TRUE)
+ {
+ if (sub_8144ECC(0, taskId))
+ {
break;
}
}
@@ -171,7 +249,8 @@ void sub_81439D0(void) {
}
void sub_8143B38(u8 taskId) {
- if (gPaletteFade.active) {
+ if (gPaletteFade.active)
+ {
return;
}
@@ -181,7 +260,8 @@ void sub_8143B38(u8 taskId) {
void sub_8143B68(u8 taskId) {
u16 data11;
- if (gTasks[taskId].data[4]) {
+ if (gTasks[taskId].data[4])
+ {
s16 secondaryTaskId;
secondaryTaskId = gTasks[taskId].data[1];
@@ -195,12 +275,15 @@ void sub_8143B68(u8 taskId) {
gUnknown_02039320 = 0;
data11 = gTasks[taskId].data[11];
- if (gTasks[taskId].data[11] == 1) {
+ if (gTasks[taskId].data[11] == 1)
+ {
gTasks[taskId].data[13] = data11;
gTasks[taskId].data[11] = 0;
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
gTasks[taskId].func = sub_8143BFC;
- } else if (gTasks[taskId].data[11] == 2) {
+ }
+ else if (gTasks[taskId].data[11] == 2)
+ {
gTasks[taskId].data[13] = data11;
gTasks[taskId].data[11] = 0;
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
@@ -209,7 +292,8 @@ void sub_8143B68(u8 taskId) {
}
static void sub_8143BFC(u8 taskId) {
- if (gPaletteFade.active) {
+ if (gPaletteFade.active)
+ {
return;
}
@@ -223,7 +307,8 @@ static void c2_080C9BFC(u8 taskId) {
SetVBlankCallback(NULL);
- if (!sub_8144ECC(gTasks[taskId].data[7], taskId)) {
+ if (!sub_8144ECC(gTasks[taskId].data[7], taskId))
+ {
return;
}
@@ -240,7 +325,8 @@ static void c2_080C9BFC(u8 taskId) {
}
static void sub_8143CC0(u8 taskId) {
- if (gPaletteFade.active) {
+ if (gPaletteFade.active)
+ {
return;
}
@@ -252,58 +338,58 @@ static void sub_8143CC0(u8 taskId) {
#ifdef NONMATCHING
static void sub_8143D04(u8 taskId) {
switch (gMain.state) {
- default:
- case 0: {
- u16 i;
-
- ResetSpriteData();
- FreeAllSpritePalettes();
- gReservedSpritePaletteCount = 8;
- LZ77UnCompVram(&gBirchHelpGfx, (void *) VRAM);
- LZ77UnCompVram(&gBirchBagTilemap, (void *) (VRAM + 0x3800));
- LoadPalette(gBirchBagGrassPal + 2, 1, 31 * 2);
-
- for (i = 0; i < 0x800; i++) {
- gHallOfFame.sheet0[i] = 0x11;
- }
+ default:
+ case 0: {
+ u16 i;
+
+ ResetSpriteData();
+ FreeAllSpritePalettes();
+ gReservedSpritePaletteCount = 8;
+ LZ77UnCompVram(&gBirchHelpGfx, (void *) VRAM);
+ LZ77UnCompVram(&gBirchBagTilemap, (void *) (VRAM + 0x3800));
+ LoadPalette(gBirchBagGrassPal + 2, 1, 31 * 2);
+
+ for (i = 0; i < 0x800; i++) {
+ gHallOfFame.sheet0[i] = 0x11;
+ }
- for (i = 0; i < 0x800; i++) {
- gHallOfFame.sheet1[i] = 0x22;
- }
+ for (i = 0; i < 0x800; i++) {
+ gHallOfFame.sheet1[i] = 0x22;
+ }
- for (i = 0; i < 0x800; i++) {
- gHallOfFame.sheet2[i] = 0x33;
- }
+ for (i = 0; i < 0x800; i++) {
+ gHallOfFame.sheet2[i] = 0x33;
+ }
- unk_201f800[0] = 0;
- unk_201f800[1] = 0x53FF;
- unk_201f800[2] = 0x529F;
- unk_201f800[3] = 0x7E94;
+ unk_201f800[0] = 0;
+ unk_201f800[1] = 0x53FF; // light yellow
+ unk_201f800[2] = 0x529F; // light red
+ unk_201f800[3] = 0x7E94; // light blue
- LoadSpriteSheet(&gUnknown_0840CAA0);
- LoadSpritePalette(&gUnknown_0840CAB0);
+ LoadSpriteSheet(&gUnknown_0840CAA0);
+ LoadSpritePalette(&gUnknown_0840CAB0);
- gMain.state += 1;
- break;
- }
+ gMain.state += 1;
+ break;
+ }
- case 1: {
- gTasks[taskId].data[3] = CreateTask(sub_8144514, 0);
- gTasks[gTasks[taskId].data[3]].data[0] = 1;
- gTasks[gTasks[taskId].data[3]].data[1] = taskId;
- gTasks[gTasks[taskId].data[3]].data[2] = gTasks[taskId].data[7];
-
- BeginNormalPaletteFade(-1, 0, 16, 0, 0);
- REG_BG3HOFS = 0;
- REG_BG3VOFS = 32;
- REG_BG3CNT = 0x703;
- REG_DISPCNT = 0x1940;
-
- gMain.state = 0;
- gUnknown_0203935C = 0;
- gTasks[taskId].func = sub_8143B38;
- break;
- }
+ case 1: {
+ gTasks[taskId].data[3] = CreateTask(sub_8144514, 0);
+ gTasks[gTasks[taskId].data[3]].data[0] = 1;
+ gTasks[gTasks[taskId].data[3]].data[1] = taskId;
+ gTasks[gTasks[taskId].data[3]].data[2] = gTasks[taskId].data[7];
+
+ BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+ REG_BG3HOFS = 0;
+ REG_BG3VOFS = 32;
+ REG_BG3CNT = 0x703;
+ REG_DISPCNT = 0x1940;
+
+ gMain.state = 0;
+ gUnknown_0203935C = 0;
+ gTasks[taskId].func = sub_8143B38;
+ break;
+ }
}
}
#else
@@ -508,7 +594,8 @@ _08143EB8: .4byte sub_8143B38\n\
#endif
static void sub_8143EBC(u8 taskId) {
- if (gTasks[taskId].data[12]) {
+ if (gTasks[taskId].data[12])
+ {
gTasks[taskId].data[12] -= 1;
return;
}
@@ -518,7 +605,8 @@ static void sub_8143EBC(u8 taskId) {
}
static void sub_8143F04(u8 taskId) {
- if (gPaletteFade.active) {
+ if (gPaletteFade.active)
+ {
return;
}
@@ -549,7 +637,8 @@ static void sub_8143F3C(u8 taskId) {
}
static void sub_8143FDC(u8 taskId) {
- if (gTasks[taskId].data[0]) {
+ if (gTasks[taskId].data[0])
+ {
gTasks[taskId].data[0] -= 1;
return;
}
@@ -559,7 +648,8 @@ static void sub_8143FDC(u8 taskId) {
}
static void sub_8144024(u8 taskId) {
- if (gPaletteFade.active) {
+ if (gPaletteFade.active)
+ {
return;
}
@@ -571,29 +661,34 @@ static void sub_8144024(u8 taskId) {
}
static void sub_8144080(u8 taskId) {
- if (gPaletteFade.active) {
+ if (gPaletteFade.active)
+ {
return;
}
- if (gTasks[taskId].data[0] == 0) {
+ if (gTasks[taskId].data[0] == 0)
+ {
FadeOutBGM(4);
BeginNormalPaletteFade(-1, 8, 0, 16, 0xFFFF);
gTasks[taskId].func = sub_8144114;
return;
}
- if (gMain.newKeys) {
+ if (gMain.newKeys)
+ {
FadeOutBGM(4);
BeginNormalPaletteFade(-1, 8, 0, 16, 0xFFFF);
gTasks[taskId].func = sub_8144114;
return;
}
- if (gTasks[taskId].data[0] == 7144) {
+ if (gTasks[taskId].data[0] == 7144)
+ {
FadeOutBGM(8);
}
- if (gTasks[taskId].data[0] == 6840) {
+ if (gTasks[taskId].data[0] == 6840)
+ {
m4aSongNumStart(BGM_END);
}
@@ -601,7 +696,8 @@ static void sub_8144080(u8 taskId) {
}
static void sub_8144114(u8 taskId) {
- if (gPaletteFade.active) {
+ if (gPaletteFade.active)
+ {
return;
}
@@ -624,7 +720,197 @@ static void sub_8144130(void) {
REG_BLDALPHA = 0;
REG_BLDY = 0;
- DmaFill16(3, 0, (void *)VRAM, VRAM_SIZE);
- DmaFill32(3, 0, (void *)OAM, OAM_SIZE);
- DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2);
+ DmaFill16(3, 0, (void *) VRAM, VRAM_SIZE);
+ DmaFill32(3, 0, (void *) OAM, OAM_SIZE);
+ DmaFill16(3, 0, (void *) (PLTT + 2), PLTT_SIZE - 2);
+}
+
+static void sub_81441B8(u8 taskId) {
+ u16 i;
+
+ switch (gTasks[taskId].data[0])
+ {
+ case 0:
+ case 6:
+ case 7:
+ case 8:
+ case 9:
+ default:
+ if (gPaletteFade.active)
+ {
+ return;
+ }
+ gTasks[taskId].data[0] = 1;
+ gTasks[taskId].data[3] = 0x58;
+ gTasks[gTasks[taskId].data[1]].data[14] = 0;
+ gUnknown_02039320 = 0;
+ return;
+
+ case 1:
+ if (gTasks[taskId].data[3] != 0)
+ {
+ gTasks[taskId].data[3] -= 1;
+ return;
+ }
+
+ gTasks[taskId].data[0] += 1;
+ return;
+
+ case 2:
+ REG_DISPCNT &= ~DISPCNT_BG0_ON;
+
+ if (gTasks[gTasks[taskId].data[1]].func == sub_8143B68)
+ {
+ if (gTasks[taskId].data[TD_CURRENT_PAGE] < PAGE_COUNT)
+ {
+
+ for (i = 0; i < 5; i++)
+ {
+ sub_8072BD8(gCreditsEntryPointerTable[gTasks[taskId].data[TD_CURRENT_PAGE]][i]->text, 0,
+ 9 + i * 2, 240);
+ }
+
+ gTasks[taskId].data[TD_CURRENT_PAGE] += 1;
+ gTasks[taskId].data[0] += 1;
+
+ gTasks[gTasks[taskId].data[1]].data[14] = 1;
+
+ if (gTasks[gTasks[taskId].data[1]].data[13] == 1)
+ {
+ BeginNormalPaletteFade(0x300, 0, 16, 0, COLOR_LIGHT_GREEN);
+ }
+ else
+ {
+ BeginNormalPaletteFade(0x300, 0, 16, 0, COLOR_DARK_GREEN);
+ }
+ return;
+ }
+
+
+ gTasks[taskId].data[0] = 10;
+ return;
+ }
+
+ gTasks[gTasks[taskId].data[1]].data[14] = 0;
+ return;
+
+ case 3:
+ REG_DISPCNT |= DISPCNT_BG0_ON;
+
+ if (gPaletteFade.active)
+ {
+ return;
+ }
+
+ gTasks[taskId].data[3] = UNK_DEFINE_82;
+ gTasks[taskId].data[0] += 1;
+ return;
+
+ case 4:
+ if (gTasks[taskId].data[3] != 0)
+ {
+ gTasks[taskId].data[3] -= 1;
+ return;
+ }
+
+ if (sub_8144454((u8) gTasks[taskId].data[2], (u8) gTasks[taskId].data[1]))
+ {
+ gTasks[taskId].data[0] += 1;
+ return;
+ }
+
+ gTasks[taskId].data[0] += 1;
+
+ if (gTasks[gTasks[taskId].data[1]].data[13] == 1)
+ {
+ BeginNormalPaletteFade(0x300, 0, 0, 16, COLOR_LIGHT_GREEN);
+ }
+ else
+ {
+ BeginNormalPaletteFade(0x300, 0, 0, 16, COLOR_DARK_GREEN);
+ }
+
+ return;
+
+ case 5:
+ if (gPaletteFade.active)
+ {
+ return;
+ }
+
+ MenuZeroFillWindowRect(0, 9, 29, 19);
+ gTasks[taskId].data[0] = 2;
+ return;
+
+ case 10:
+ gTasks[gTasks[taskId].data[1]].data[4] = 1;
+ DestroyTask(taskId);
+ return;
+ }
+}
+
+#define LAST_PAGE (PAGE_TEXT_EDITOR)
+
+static u8 sub_8144454(u8 page, u8 taskId) {
+ // Starts with bike + ocean + morning
+
+ if (page == PAGE_PROGRAMMERS_1)
+ {
+ // Grass patch
+ gTasks[taskId].data[11] = 2;
+ }
+
+ if (page == PAGE_POKEMON_GRAHPIC_DESIGNERS_3)
+ {
+ // Bike + ocean + sunset
+ gTasks[taskId].data[7] = 1;
+ gTasks[taskId].data[11] = 1;
+ }
+
+ if (page == PAGE_GAME_DESIGNERS_2)
+ {
+ // Grass patch
+ gTasks[taskId].data[11] = 2;
+ }
+
+ if (page == PAGE_MAP_DATA_DESIGNERS)
+ {
+ // Bike + forest + sunset
+ gTasks[taskId].data[7] = 2;
+ gTasks[taskId].data[11] = 1;
+ }
+
+ if (page == PAGE_SPECIAL_THANKS_1)
+ {
+ // Grass patch
+ gTasks[taskId].data[11] = 2;
+ }
+
+ if (page == PAGE_TASK_MANAGERS)
+ {
+ // Bike + forest + sunset
+ gTasks[taskId].data[7] = 3;
+ gTasks[taskId].data[11] = 1;
+ }
+
+ if (page == PAGE_TRANSLATION_COORDINATOR)
+ {
+ // Grass patch
+ gTasks[taskId].data[11] = 2;
+ }
+
+ if (page == LAST_PAGE)
+ {
+ // Bike + town + night
+ gTasks[taskId].data[7] = 4;
+ gTasks[taskId].data[11] = 1;
+ }
+
+ if (gTasks[taskId].data[11] != 0)
+ {
+ // Returns true if changed?
+ return TRUE;
+ }
+
+ return FALSE;
}
diff --git a/src/daycare.c b/src/daycare.c
new file mode 100644
index 000000000..23f0305d8
--- /dev/null
+++ b/src/daycare.c
@@ -0,0 +1,33 @@
+#include "global.h"
+#include "pokemon.h"
+#include "string_util.h"
+
+u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest)
+{
+ s8 nickname[POKEMON_NAME_LENGTH * 2];
+
+ GetMonData(mon, MON_DATA_NICKNAME, nickname);
+ return StringCopy10(dest, nickname);
+}
+
+u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest)
+{
+ s8 nickname[POKEMON_NAME_LENGTH * 2];
+
+ GetBoxMonData(mon, MON_DATA_NICKNAME, nickname);
+ return StringCopy10(dest, nickname);
+}
+
+u8 daycare_count_pokemon(struct BoxPokemon *daycare_data)
+{
+ u8 i, count;
+ count = 0;
+
+ for(i = 0;i <= 1;i++) {
+ if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) {
+ count++;
+ }
+ }
+
+ return count;
+}
diff --git a/src/truck_scene.c b/src/field_special_scene.c
index 64eca498c..80a1727d8 100644
--- a/src/truck_scene.c
+++ b/src/field_special_scene.c
@@ -1,5 +1,5 @@
#include "global.h"
-#include "truck_scene.h"
+#include "field_special_scene.h"
#include "asm.h"
#include "palette.h"
#include "task.h"
@@ -7,9 +7,15 @@
#include "songs.h"
#include "sound.h"
#include "field_camera.h"
+#include "rom4.h"
+#include "event_data.h"
+#include "sprite.h"
extern s8 gTruckCamera_HorizontalTable[];
+extern u8 gUnknown_083D295F[];
+extern u8 gUnknown_083D2961[];
+
s32 GetTruckCameraBobbingY(int a1)
{
if (!(a1 % 120))
@@ -65,10 +71,10 @@ void Task_Truck2(u8 taskId)
s16 box1;
s16 box2;
s16 box3;
-
+
data[0]++;
data[2]++;
-
+
if (data[0] > 5)
{
data[0] = 0;
@@ -82,7 +88,7 @@ void Task_Truck2(u8 taskId)
{
if (gTruckCamera_HorizontalTable[data[1]] == 2)
gTasks[taskId].func = Task_Truck3;
-
+
cameraXpan = gTruckCamera_HorizontalTable[data[1]];
cameraYpan = GetTruckCameraBobbingY(data[2]);
SetCameraPanning(cameraXpan, cameraYpan);
@@ -218,3 +224,112 @@ void EndTruckSequence(void)
sub_805BD90(3, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, -3, 0);
}
}
+
+bool8 sub_80C7754(void)
+{
+ s8 mapGroup, mapNum;
+ s16 x, y;
+
+ if (sub_810D9EC(&mapGroup, &mapNum, &x, &y))
+ {
+ return FALSE;
+ }
+ else
+ {
+ warp1_set(mapGroup, mapNum, -1, x, y);
+ return TRUE;
+ }
+}
+
+void sub_80C77A0(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+ u16 *var = GetVarPointer(0x40B4);
+ struct WarpData *location = &gSaveBlock1.location;
+
+ switch (data[0])
+ {
+ case 0:
+ if (!gPaletteFade.active)
+ {
+ data[1] = 0;
+ data[0] = 2;
+ }
+ break;
+ case 1:
+ if (gMain.newKeys & A_BUTTON)
+ data[1] = 1;
+ if (!sub_80A212C(0xFF, location->mapNum, location->mapGroup))
+ return;
+ if (sub_810D9B0(1) == TRUE)
+ {
+ if (*var == 2)
+ *var = 9;
+ else
+ *var = 10;
+ data[0] = 3;
+ return;
+ }
+ data[0] = 2;
+ case 2:
+ if (data[1])
+ {
+ data[0] = 3;
+ return;
+ }
+
+ if (*var == 2)
+ {
+ exec_movement(0xFF, location->mapNum, location->mapGroup, gUnknown_083D295F);
+ data[0] = 1;
+ }
+ else
+ {
+ exec_movement(0xFF, location->mapNum, location->mapGroup, gUnknown_083D2961);
+ data[0] = 1;
+ }
+ break;
+ case 3:
+ FlagReset(0x4001);
+ FlagReset(0x4000);
+ copy_saved_warp2_bank_and_enter_x_to_warp1(0);
+ sp13E_warp_to_last_warp();
+ DestroyTask(taskId);
+ break;
+ }
+}
+
+void sub_80C78A0(void)
+{
+ u8 spriteId = AddPseudoFieldObject(0x8C, SpriteCallbackDummy, 112, 80, 0);
+
+ gSprites[spriteId].coordOffsetEnabled = FALSE;
+
+ if (VarGet(0x40B4) == 2)
+ {
+ StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(4));
+ }
+ else
+ {
+ StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(3));
+ }
+}
+
+void sub_80C791C(void)
+{
+ sub_80C78A0();
+ gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = TRUE;
+ pal_fill_black();
+ CreateTask(sub_80C77A0, 80);
+ ScriptContext2_Enable();
+}
+
+void sub_80C7958(void)
+{
+ FlagSet(SYS_CRUISE_MODE);
+ FlagSet(0x4001);
+ FlagSet(0x4000);
+ saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1);
+ sub_80C7754();
+ sub_8080F9C();
+}
diff --git a/src/menu_cursor.c b/src/menu_cursor.c
index 5c1f0addf..201c6c4d8 100644
--- a/src/menu_cursor.c
+++ b/src/menu_cursor.c
@@ -13,7 +13,7 @@ extern struct SpriteTemplate gSpriteTemplate_842F298[];
extern struct Subsprite *gUnknown_0842F5BC[];
extern struct SubspriteTable gSubspriteTables_842F5C0[];
-extern struct SubspriteTable gUnknown_0842F6C0[];
+extern struct SubspriteTable gSubspriteTables_842F6C0[];
extern struct SubspriteTable gUnknown_0842F758[];
extern struct Subsprite gUnknown_0842F780;
@@ -601,6 +601,6 @@ void sub_814ADF4(u8 a1)
a1 = 0;
if (gUnknown_0203A3D2 != 0x40)
- SetSubspriteTables(&gSprites[gUnknown_0203A3D2], &gUnknown_0842F6C0[a1]);
+ SetSubspriteTables(&gSprites[gUnknown_0203A3D2], &gSubspriteTables_842F6C0[a1]);
return;
}
diff --git a/src/rom4.c b/src/rom4.c
index 4f3e35fea..3f383b690 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -26,7 +26,7 @@
#include "start_menu.h"
#include "task.h"
#include "tileset_anim.h"
-#include "truck_scene.h"
+#include "field_special_scene.h"
#include "weather.h"
#include "wild_encounter.h"
#include "metatile_behavior.h"
@@ -57,9 +57,6 @@ extern u16 gUnknown_02029814;
extern bool8 gUnknown_02029816;
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
-extern u8 gUnknown_0202E85C;
-extern u8 gUnknown_0202E85D;
-
extern u8 gUnknown_03000580[];
extern u16 (*gUnknown_03000584)(u32);
extern u8 gUnknown_03000588;
@@ -370,7 +367,7 @@ void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y
warp_set(&gSaveBlock1.warp2, mapGroup, mapNum, warpId, x, y);
}
-void copy_saved_warp2_bank_and_enter_x_to_warp1(void)
+void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused)
{
gUnknown_020297F8 = gSaveBlock1.warp2;
}
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 41e61eadb..2396aab15 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -33,9 +33,6 @@ extern struct SaveFailedStruct gUnknown_0203933E;
extern u32 gUnknown_03005EA8;
extern u32 gUnknown_03005EBC;
-extern struct OamData gUnknown_08411940;
-extern u8 gUnknown_08411948[][3];
-
extern u8 gBirchHelpGfx[];
extern u8 gSystemText_SaveFailedBackupCheck[];
@@ -52,6 +49,35 @@ extern const u8 gSaveFailedClockGfx[];
extern const u8 gSaveFailedClockPal[];
extern u8 gBirchBagGrassPal[];
+static const struct OamData sClockOamData =
+{
+ 160, // Y
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ 0
+};
+
+static const u8 sClockFrames[8][3] =
+{
+ { 1, 0, 0 },
+ { 5, 0, 0 },
+ { 9, 0, 0 },
+ { 5, 0, 1 },
+ { 1, 0, 1 },
+ { 5, 1, 1 },
+ { 9, 1, 0 },
+ { 5, 1, 0 },
+};
+
static void VBlankCB(void);
static void CB2_SaveFailedScreen(void);
static void CB2_WipeSave(void);
@@ -236,14 +262,14 @@ static void VBlankCB_UpdateClockGraphics(void)
{
unsigned int n = (gMain.vblankCounter2 >> 3) & 7;
- gMain.oamBuffer[0] = gUnknown_08411940;
+ gMain.oamBuffer[0] = sClockOamData;
gMain.oamBuffer[0].x = 112;
gMain.oamBuffer[0].y = (CLOCK_WIN_TOP + 1) * 8;
if (gUnknown_0203933E.unk0)
{
- gMain.oamBuffer[0].tileNum = gUnknown_08411948[n][0];
- gMain.oamBuffer[0].matrixNum = (gUnknown_08411948[n][2] << 4) | (gUnknown_08411948[n][1] << 3);
+ gMain.oamBuffer[0].tileNum = sClockFrames[n][0];
+ gMain.oamBuffer[0].matrixNum = (sClockFrames[n][2] << 4) | (sClockFrames[n][1] << 3);
}
else
{
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 68e644353..9bd817cce 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -28,7 +28,7 @@ extern struct SpriteSheet gUnknown_083F77A4;
extern u8 gBirchBagGrassPal[];
extern const u8 gStarterChoose_LabelCoords[][2];
extern u16 gStarterMons[];
-extern union AffineAnimCmd *gUnknown_083F778C[];
+extern union AffineAnimCmd *gSpriteAffineAnimTable_83F778C[];
extern u8 gOtherText_DoYouChoosePoke[];
extern u16 gScriptResult;
extern u8 gSpeciesNames[][11];
@@ -216,7 +216,7 @@ static void Task_StarterChoose2(u8 taskId)
GetStarterPokemon(gTasks[taskId].data[TD_STARTERSELECTION]),
gStarterChoose_PokeballCoords[selection][0],
gStarterChoose_PokeballCoords[selection][1]);
- gSprites[spriteId].affineAnims = gUnknown_083F778C;
+ gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_83F778C;
gSprites[spriteId].callback = StarterPokemonSpriteAnimCallback;
gTasks[taskId].data[TD_PKMN_SPRITE_ID] = spriteId;
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 00:09:59 +0000