diff --git a/common_syms/battle_tower.txt b/common_syms/battle_tower.txt new file mode 100644 index 000000000..dd198e229 --- /dev/null +++ b/common_syms/battle_tower.txt @@ -0,0 +1 @@ +gUnknown_03006298 diff --git a/common_syms/berry_blender.txt b/common_syms/berry_blender.txt new file mode 100644 index 000000000..1b15a33d6 --- /dev/null +++ b/common_syms/berry_blender.txt @@ -0,0 +1 @@ +gInGameOpponentsNo diff --git a/common_syms/overworld.txt b/common_syms/overworld.txt index a3b97a759..b92da84ec 100644 --- a/common_syms/overworld.txt +++ b/common_syms/overworld.txt @@ -1,3 +1,6 @@ +gBGTilemapBuffers1 +gBGTilemapBuffers2 +gBGTilemapBuffers3 gUnknown_03005DA8 gFieldCallback gFieldCallback2 diff --git a/common_syms/pokedex.txt b/common_syms/pokedex.txt new file mode 100644 index 000000000..c982c9d3a --- /dev/null +++ b/common_syms/pokedex.txt @@ -0,0 +1,2 @@ +gUnknown_030060B0 +gUnknown_030060B4 diff --git a/common_syms/start_menu.txt b/common_syms/start_menu.txt new file mode 100644 index 000000000..05beaf57c --- /dev/null +++ b/common_syms/start_menu.txt @@ -0,0 +1 @@ +gMenuCallback diff --git a/src/battle_factory.c b/src/battle_factory.c index 37abf6add..1d7fbafc9 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -13,8 +13,6 @@ #include "constants/trainers.h" #include "constants/moves.h" -extern u16 gUnknown_03006298[]; - extern const struct FacilityMon gBattleFrontierMons[]; extern const struct FacilityMon gSlateportBattleTentMons[]; extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; diff --git a/src/battle_tent.c b/src/battle_tent.c index 678222ff5..ebb639600 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -17,10 +17,6 @@ extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[]; extern const struct FacilityMon gSlateportBattleTentMons[]; extern const u16 gBattleFrontierHeldItems[]; -extern u16 gUnknown_03006298[]; - -extern void sub_81A4C30(void); - // This file's functions. static void sub_81B99D4(void); static void sub_81B9A28(void); diff --git a/src/battle_tower.c b/src/battle_tower.c index 000a03a5b..165b6bf64 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -28,8 +28,6 @@ #include "constants/moves.h" #include "constants/species.h" -extern u16 gUnknown_03006298[]; - extern void sub_81A4C30(void); extern const u8 *const *const gUnknown_085DD690[]; @@ -68,6 +66,9 @@ extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[]; EWRAM_DATA const struct BattleFrontierTrainer *gFacilityTrainers = NULL; EWRAM_DATA const struct FacilityMon *gFacilityTrainerMons = NULL; +// IWRAM common +u16 gUnknown_03006298[4]; + // This file's functions. static void sub_8161F94(void); static void sub_8162054(void); diff --git a/src/berry_blender.c b/src/berry_blender.c index fca544e03..7320e905f 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -33,6 +33,7 @@ #include "item_menu.h" #include "battle_records.h" #include "graphics.h" +#include "new_game.h" #define BLENDER_SCORE_BEST 0 #define BLENDER_SCORE_GOOD 1 @@ -132,8 +133,6 @@ struct BerryBlenderData extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern u8 gInGameOpponentsNo; -extern u8 gUnknown_020322D5; // text extern const u8 gText_SavingDontTurnOff2[]; @@ -195,18 +194,21 @@ static void sub_8083170(u16 a0, u16 a1); static void Blender_PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst); static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlenderStruct *a1); -// ewram +// EWRAM EWRAM_DATA static struct BerryBlenderData *sBerryBlenderData = NULL; EWRAM_DATA static s32 sUnknown_020322A8[5] = {0}; EWRAM_DATA static s32 sUnknown_020322BC[5] = {0}; EWRAM_DATA static u32 sUnknown_020322D0 = 0; -// iwram +// IWRAM bss IWRAM_DATA static s16 sUnknown_03000DE8[8]; IWRAM_DATA static s16 sUnknown_03000DF8[6]; IWRAM_DATA static s16 sUnknown_03000E04; IWRAM_DATA static s16 sUnknown_03000E06; +// IWRAM common +u8 gInGameOpponentsNo; + // rom static const u16 sBlenderCenterPal[] = INCBIN_U16("graphics/berry_blender/center.gbapal"); diff --git a/src/fossil_specials.c b/src/fossil_specials.c index 49db0f5b6..f562d83c2 100644 --- a/src/fossil_specials.c +++ b/src/fossil_specials.c @@ -17,29 +17,32 @@ #include "task.h" #include "window.h" -#define MIRAGE_TOWER_GFX_LENGTH (sizeof(gUnknown_08617274) + sizeof(gMirageTower_Gfx)) +#define MIRAGE_TOWER_GFX_LENGTH (32 + sizeof(gMirageTower_Gfx)) #define MIRAGE_TOWER_PALETTE_LENGTH 0x800 #define ROOT_FOSSIL_GFX_LENGTH sizeof(gRootFossil_Gfx) #define ROOT_FOSSIL_GFX_RANDOMIZER_LENGTH 0x100 -//struct -struct Struct8617DA4 { +struct Struct8617DA4 +{ u8 x; u8 y; u16 tileId; }; -struct Struct203CF10 { +struct Struct203CF10 +{ u8 *buffer; u8 curr_buffer_index; }; -struct DynamicSpriteFrameImage{ +struct DynamicSpriteFrameImage +{ u8 *data; u16 size; }; -struct Struct203CF0C { +struct Struct203CF0C +{ u8 *frameImageTiles; struct DynamicSpriteFrameImage *frameImage; u8 spriteId; @@ -52,10 +55,10 @@ static void sub_81BED50(u8 taskId); static void sub_81BEBF4(u8 taskId); static void sub_81BF028(u8 taskId); static void sub_81BF248(struct Sprite *); -/*static*/ void sub_81BF2B8(u8* a, u16 b, u8 c, u8 d, u8 e); +static void sub_81BF2B8(u8* a, u16 b, u8 c, u8 d, u8 e); // .rodata -static const u8 gUnknown_08617274[] = {00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00}; +static const u8 gUnknown_08617274[32] = {0}; static const u8 gMirageTower_Gfx[] = INCBIN_U8("graphics/misc/mirage_tower.4bpp"); static const u16 gUnknown_08617B94[] = INCBIN_U16("graphics/misc/mirage_tower.bin"); static const u16 gRootFossil_Pal[] = INCBIN_U16("graphics/misc/fossil.gbapal"); @@ -64,16 +67,16 @@ static const u8 gMirageTowerCrumbles_Gfx[] = INCBIN_U8("graphics/misc/mirage_tow static const u16 gMirageTowerCrumbles_Palette[] = INCBIN_U16("graphics/misc/mirage_tower_crumbles.gbapal"); const s16 gUnknown_08617D64[][3] = - { - { 0, 10, 65}, - { 17, 3, 50}, - {-12, 0, 75}, - { 10, 15, 90}, - { 7, 8, 65}, - {-18, 5, 75}, - { 22, -10, 55}, - {-24, -4, 65}, - }; +{ + { 0, 10, 65}, + { 17, 3, 50}, + {-12, 0, 75}, + { 10, 15, 90}, + { 7, 8, 65}, + {-18, 5, 75}, + { 22, -10, 55}, + {-24, -4, 65}, +}; const struct SpriteSheet gUnknown_08617D94[] = { @@ -82,26 +85,26 @@ const struct SpriteSheet gUnknown_08617D94[] = }; static const struct Struct8617DA4 gUnknown_08617DA4[] = - { - {0x12, 0x35, 0x251}, - {0x13, 0x35, 0x251}, - {0x14, 0x35, 0x251}, - {0x12, 0x36, 0x251}, - {0x13, 0x36, 0x251}, - {0x14, 0x36, 0x251}, - {0x12, 0x37, 0x251}, - {0x13, 0x37, 0x251}, - {0x14, 0x37, 0x251}, - {0x12, 0x38, 0x251}, - {0x13, 0x38, 0x251}, - {0x14, 0x38, 0x251}, - {0x12, 0x39, 0x259}, - {0x13, 0x39, 0x259}, - {0x14, 0x39, 0x259}, - {0x12, 0x3A, 0x121}, - {0x13, 0x3A, 0x121}, - {0x14, 0x3A, 0x121}, - }; +{ + {0x12, 0x35, 0x251}, + {0x13, 0x35, 0x251}, + {0x14, 0x35, 0x251}, + {0x12, 0x36, 0x251}, + {0x13, 0x36, 0x251}, + {0x14, 0x36, 0x251}, + {0x12, 0x37, 0x251}, + {0x13, 0x37, 0x251}, + {0x14, 0x37, 0x251}, + {0x12, 0x38, 0x251}, + {0x13, 0x38, 0x251}, + {0x14, 0x38, 0x251}, + {0x12, 0x39, 0x259}, + {0x13, 0x39, 0x259}, + {0x14, 0x39, 0x259}, + {0x12, 0x3A, 0x121}, + {0x13, 0x3A, 0x121}, + {0x14, 0x3A, 0x121}, +}; static const union AnimCmd gSpriteAnim_8617DEC[] = { @@ -131,67 +134,70 @@ static const union AnimCmd *const gSpriteAnimTable_8617DFC[] = gSpriteAnim_8617DEC, }; -static const struct SpriteTemplate gUnknown_08617E00 = { +static const struct SpriteTemplate gUnknown_08617E00 = +{ 0xFFFF, 0xFFFF, &gOamData_8617DF4, gSpriteAnimTable_8617DFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -// ewram -EWRAM_DATA u8* gUnknown_0203CF04 = NULL; -EWRAM_DATA u8* gUnknown_0203CF08 = NULL; -EWRAM_DATA struct Struct203CF0C *gUnknown_0203CF0C = NULL; -EWRAM_DATA struct Struct203CF10 *gUnknown_0203CF10 = NULL; -EWRAM_DATA u16 *gUnknown_0203CF14 = NULL; +// EWRAM +EWRAM_DATA static u8* sUnknown_0203CF04 = NULL; +EWRAM_DATA static u8* sUnknown_0203CF08 = NULL; +EWRAM_DATA static struct Struct203CF0C *sUnknown_0203CF0C = NULL; +EWRAM_DATA static struct Struct203CF10 *sUnknown_0203CF10 = NULL; +EWRAM_DATA static u16 *sUnknown_0203CF14 = NULL; -// iwram -IWRAM_DATA u16 gUnknown_030012A8[8] = {0, 0, 0, 0, 0, 0, 0, 0}; +// IWRAM bss +IWRAM_DATA u16 gUnknown_030012A8[8]; // text void sub_81BEB24(void) { u8 i; - for(i = 0; i < (sizeof(gUnknown_08617DA4)/sizeof(gUnknown_08617DA4[0])); i++) + for (i = 0; i < (sizeof(gUnknown_08617DA4)/sizeof(gUnknown_08617DA4[0])); i++) MapGridSetMetatileIdAt(gUnknown_08617DA4[i].x + 7, gUnknown_08617DA4[i].y + 7, gUnknown_08617DA4[i].tileId); DrawWholeMapView(); } void sub_81BEB54(void) { - CreateTask(sub_81BED50, 0x9); + CreateTask(sub_81BED50, 9); } void sub_81BEB68(void) { - CreateTask(sub_81BEBF4, 0x9); + CreateTask(sub_81BEBF4, 9); } void sub_81BEB7C(void) { - CreateTask(sub_81BF028, 0x9); + CreateTask(sub_81BF028, 9); } void sub_81BEB90(void) { - SetGpuReg(REG_OFFSET_BG0HOFS, gUnknown_0203CF14[0]); - SetGpuReg(REG_OFFSET_BG0VOFS, gUnknown_0203CF14[1]); + SetGpuReg(REG_OFFSET_BG0HOFS, sUnknown_0203CF14[0]); + SetGpuReg(REG_OFFSET_BG0VOFS, sUnknown_0203CF14[1]); } void sub_81BEBB4(u8 taskId) { - if(!(gTasks[taskId].data[0])) + if (!(gTasks[taskId].data[0])) { - gUnknown_0203CF14[0] = -gUnknown_0203CF14[0]; + sUnknown_0203CF14[0] = -sUnknown_0203CF14[0]; gTasks[taskId].data[0] = 2; sub_81BEB90(); } else + { gTasks[taskId].data[0]--; + } } static void sub_81BEBF4(u8 taskId) { u8 zero; - switch(gTasks[taskId].data[0]) + switch (gTasks[taskId].data[0]) { case 0: FreeAllWindowBuffers(); @@ -199,19 +205,19 @@ static void sub_81BEBF4(u8 taskId) gTasks[taskId].data[0]++; break; case 1: - gUnknown_0203CF04 = (u8 *)AllocZeroed(MIRAGE_TOWER_GFX_LENGTH); - gUnknown_0203CF08 = (u8 *)AllocZeroed(MIRAGE_TOWER_PALETTE_LENGTH); + sUnknown_0203CF04 = (u8 *)AllocZeroed(MIRAGE_TOWER_GFX_LENGTH); + sUnknown_0203CF08 = (u8 *)AllocZeroed(MIRAGE_TOWER_PALETTE_LENGTH); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); gTasks[taskId].data[0]++; break; case 2: - CpuSet(gUnknown_08617274, gUnknown_0203CF04, MIRAGE_TOWER_GFX_LENGTH / 2); - LoadBgTiles(0, gUnknown_0203CF04, MIRAGE_TOWER_GFX_LENGTH, 0); + CpuSet(gUnknown_08617274, sUnknown_0203CF04, MIRAGE_TOWER_GFX_LENGTH / 2); + LoadBgTiles(0, sUnknown_0203CF04, MIRAGE_TOWER_GFX_LENGTH, 0); gTasks[taskId].data[0]++; break; case 3: - SetBgTilemapBuffer(0, gUnknown_0203CF08); + SetBgTilemapBuffer(0, sUnknown_0203CF08); CopyToBgTilemapBufferRect_ChangePalette(0, &gUnknown_08617B94, 12, 29, 6, 12, 17); CopyBgTilemapBufferToVram(0); gTasks[taskId].data[0]++; @@ -225,10 +231,10 @@ static void sub_81BEBF4(u8 taskId) gTasks[taskId].data[0]++; break; case 6: - gUnknown_0203CF14 = (u16 *)Alloc(4); + sUnknown_0203CF14 = Alloc(4); zero = 0; - gUnknown_0203CF14[0] = 2; - gUnknown_0203CF14[1] = zero; + sUnknown_0203CF14[0] = 2; + sUnknown_0203CF14[1] = zero; CreateTask(sub_81BEBB4, 0xA); DestroyTask(taskId); EnableBothScriptContexts(); @@ -236,86 +242,76 @@ static void sub_81BEBF4(u8 taskId) } } -#ifdef NONMATCHING #define OUTER_BUFFER_LENGTH 0x60 #define INNER_BUFFER_LENGTH 0x30 static void sub_81BED50(u8 taskId) { u8 anotherTaskId, j; + u16 i; + u8 index; - - switch(gTasks[taskId].data[0]) + switch (gTasks[taskId].data[0]) { case 1: - gUnknown_0203CF10 = (struct Struct203CF10 *)AllocZeroed(OUTER_BUFFER_LENGTH * sizeof(struct Struct203CF10)); + sUnknown_0203CF10 = AllocZeroed(OUTER_BUFFER_LENGTH * sizeof(struct Struct203CF10)); break; case 3: + if (gTasks[taskId].data[3] <= (OUTER_BUFFER_LENGTH - 1)) { - u16 i; - u16 left; - u32 index, next; - - index = (u16)gTasks[taskId].data[3]; - if(gTasks[taskId].data[3] <= (OUTER_BUFFER_LENGTH - 1)) + if (gTasks[taskId].data[1] > 1) { - if(gTasks[taskId].data[1] > 1) + index = gTasks[taskId].data[3]; + sUnknown_0203CF10[index].buffer = (u8 *)Alloc(INNER_BUFFER_LENGTH); + for (i = 0; i <= (INNER_BUFFER_LENGTH - 1); i++) + sUnknown_0203CF10[index].buffer[i] = i; + for (i = 0; i <= (INNER_BUFFER_LENGTH - 1); i++) { - index = (u8)index; - gUnknown_0203CF10[index].buffer = (u8 *)Alloc(INNER_BUFFER_LENGTH); - for(i = 0; i <= (INNER_BUFFER_LENGTH - 1); i++) - gUnknown_0203CF10[index].buffer[i] = i; - for(i = 0; i <= (INNER_BUFFER_LENGTH - 1); i++) - { - u16 rand1, rand2, temp; + u16 rand1, rand2, temp; - rand1 = Random() % 0x30; - rand2 = Random() % 0x30; - temp = gUnknown_0203CF10[index].buffer[rand2]; - gUnknown_0203CF10[index].buffer[rand2] = gUnknown_0203CF10[index].buffer[rand1]; - gUnknown_0203CF10[index].buffer[rand1] = temp; - } - if(gTasks[taskId].data[3] <= (OUTER_BUFFER_LENGTH - 1)) - gTasks[taskId].data[3]++; - gTasks[taskId].data[1] = 0; + rand1 = Random() % 0x30; + rand2 = Random() % 0x30; + SWAP(sUnknown_0203CF10[index].buffer[rand2], sUnknown_0203CF10[index].buffer[rand1], temp); } - gTasks[taskId].data[1]++; + if (gTasks[taskId].data[3] <= (OUTER_BUFFER_LENGTH - 1)) + gTasks[taskId].data[3]++; + gTasks[taskId].data[1] = 0; } - index = (u8)gTasks[taskId].data[3]; - for(left = (u8)gTasks[taskId].data[2]; left < (u16)index; left = next) - { - j = 0; - next = left + 1; - while(!j) - { - sub_81BF2B8(gUnknown_0203CF04, ((((OUTER_BUFFER_LENGTH - 1) - left) * INNER_BUFFER_LENGTH) + gUnknown_0203CF10[left].buffer[(gUnknown_0203CF10[left].curr_buffer_index)++]), 0, INNER_BUFFER_LENGTH, 1); - j++; - } - if(gUnknown_0203CF10[left].curr_buffer_index > (INNER_BUFFER_LENGTH - 1)) - { - FREE_AND_SET_NULL(gUnknown_0203CF10[left].buffer); - gTasks[taskId].data[2]++; - if((left % 2) == 1) - gUnknown_0203CF14[1]--; - } - } - LoadBgTiles(0, gUnknown_0203CF04, MIRAGE_TOWER_GFX_LENGTH, 0); - if(gUnknown_0203CF10[OUTER_BUFFER_LENGTH - 1].curr_buffer_index > (INNER_BUFFER_LENGTH - 1)) - break; - return; + gTasks[taskId].data[1]++; } + index = gTasks[taskId].data[3]; + for (i = (u8)(gTasks[taskId].data[2]); i < index; i++) + { + for (j = 0; j < 1; j++) + { + sub_81BF2B8(sUnknown_0203CF04, + ((((OUTER_BUFFER_LENGTH - 1) - i) * INNER_BUFFER_LENGTH) + sUnknown_0203CF10[i].buffer[(sUnknown_0203CF10[i].curr_buffer_index)++]), + 0, INNER_BUFFER_LENGTH, 1); + } + if (sUnknown_0203CF10[i].curr_buffer_index > (INNER_BUFFER_LENGTH - 1)) + { + FREE_AND_SET_NULL(sUnknown_0203CF10[i].buffer); + gTasks[taskId].data[2]++; + if ((i % 2) == 1) + sUnknown_0203CF14[1]--; + } + } + LoadBgTiles(0, sUnknown_0203CF04, MIRAGE_TOWER_GFX_LENGTH, 0); + if (sUnknown_0203CF10[OUTER_BUFFER_LENGTH - 1].curr_buffer_index > (INNER_BUFFER_LENGTH - 1)) + break; + return; case 4: UnsetBgTilemapBuffer(0); anotherTaskId = FindTaskIdByFunc(sub_81BEBB4); - if(anotherTaskId != 0xFF) + if (anotherTaskId != 0xFF) DestroyTask(anotherTaskId); - gUnknown_0203CF14[1] = gUnknown_0203CF14[0] = 0; + sUnknown_0203CF14[1] = sUnknown_0203CF14[0] = 0; sub_81BEB90(); break; case 5: - FREE_AND_SET_NULL(gUnknown_0203CF14); - FREE_AND_SET_NULL(gUnknown_0203CF10); - FREE_AND_SET_NULL(gUnknown_0203CF04); - FREE_AND_SET_NULL(gUnknown_0203CF08); + FREE_AND_SET_NULL(sUnknown_0203CF14); + FREE_AND_SET_NULL(sUnknown_0203CF10); + FREE_AND_SET_NULL(sUnknown_0203CF04); + FREE_AND_SET_NULL(sUnknown_0203CF08); break; case 6: SetGpuRegBits(REG_OFFSET_BG2CNT, 0x2); @@ -334,423 +330,75 @@ static void sub_81BED50(u8 taskId) gTasks[taskId].data[0]++; } -#else -NAKED -static void sub_81BED50(u8 taskId) -{ - asm("\n\ - .syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x10\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r10, r0\n\ - ldr r1, =gTasks\n\ - lsls r0, 2\n\ - add r0, r10\n\ - lsls r0, 3\n\ - adds r0, r1\n\ - ldrh r0, [r0, 0x8]\n\ - subs r0, 0x1\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - adds r6, r1, 0\n\ - cmp r0, 0x7\n\ - bls _081BED7C\n\ - b _081BF002\n\ - _081BED7C:\n\ - lsls r0, 2\n\ - ldr r1, =_081BED90\n\ - adds r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ - .pool\n\ - .align 2, 0\n\ - _081BED90:\n\ - .4byte _081BEDB0\n\ - .4byte _081BF002\n\ - .4byte _081BEDC4\n\ - .4byte _081BEF64\n\ - .4byte _081BEF94\n\ - .4byte _081BEFD0\n\ - .4byte _081BEFF0\n\ - .4byte _081BEFF8\n\ - _081BEDB0:\n\ - ldr r4, =gUnknown_0203CF10\n\ - movs r0, 0xC0\n\ - lsls r0, 2\n\ - bl AllocZeroed\n\ - str r0, [r4]\n\ - b _081BF002\n\ - .pool\n\ - _081BEDC4:\n\ - mov r1, r10\n\ - lsls r0, r1, 2\n\ - adds r1, r0, r1\n\ - lsls r1, 3\n\ - adds r2, r1, r6\n\ - ldrh r3, [r2, 0xE]\n\ - movs r4, 0xE\n\ - ldrsh r1, [r2, r4]\n\ - str r0, [sp, 0x8]\n\ - cmp r1, 0x5F\n\ - bgt _081BEE8A\n\ - movs r1, 0xA\n\ - ldrsh r0, [r2, r1]\n\ - cmp r0, 0x1\n\ - ble _081BEE7C\n\ - lsls r0, r3, 24\n\ - lsrs r4, r0, 24\n\ - movs r0, 0x30\n\ - bl Alloc\n\ - ldr r3, =gUnknown_0203CF10\n\ - ldr r1, [r3]\n\ - lsls r2, r4, 3\n\ - adds r1, r2, r1\n\ - str r0, [r1]\n\ - movs r5, 0\n\ - adds r4, r2, 0\n\ - _081BEDFA:\n\ - ldr r0, [r3]\n\ - adds r0, r4, r0\n\ - ldr r0, [r0]\n\ - adds r0, r5\n\ - strb r5, [r0]\n\ - adds r0, r5, 0x1\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - cmp r5, 0x2F\n\ - bls _081BEDFA\n\ - movs r5, 0\n\ - ldr r7, =gUnknown_0203CF10\n\ - adds r6, r2, 0\n\ - _081BEE14:\n\ - bl Random\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - movs r1, 0x30\n\ - bl __umodsi3\n\ - adds r4, r0, 0\n\ - lsls r4, 16\n\ - lsrs r4, 16\n\ - bl Random\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - movs r1, 0x30\n\ - bl __umodsi3\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - ldr r1, [r7]\n\ - adds r1, r6, r1\n\ - ldr r1, [r1]\n\ - adds r0, r1, r0\n\ - ldrb r2, [r0]\n\ - adds r1, r4 \n\ - ldrb r1, [r1]\n\ - strb r1, [r0]\n\ - ldr r0, [r7]\n\ - adds r0, r6, r0\n\ - ldr r0, [r0]\n\ - adds r0, r4\n\ - strb r2, [r0]\n\ - adds r0, r5, 0x1\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - cmp r5, 0x2F\n\ - bls _081BEE14\n\ - ldr r0, =gTasks\n\ - ldr r1, [sp, 0x8]\n\ - add r1, r10\n\ - lsls r1, 3\n\ - adds r2, r1, r0\n\ - ldrh r3, [r2, 0xE]\n\ - movs r4, 0xE\n\ - ldrsh r1, [r2, r4]\n\ - adds r6, r0, 0\n\ - cmp r1, 0x5F\n\ - bgt _081BEE78\n\ - adds r0, r3, 0x1\n\ - strh r0, [r2, 0xE]\n\ - _081BEE78:\n\ - movs r0, 0\n\ - strh r0, [r2, 0xA]\n\ - _081BEE7C:\n\ - ldr r1, [sp, 0x8]\n\ - add r1, r10\n\ - lsls r1, 3\n\ - adds r1, r6\n\ - ldrh r0, [r1, 0xA]\n\ - adds r0, 0x1\n\ - strh r0, [r1, 0xA]\n\ - _081BEE8A:\n\ - ldr r0, [sp, 0x8]\n\ - add r0, r10\n\ - lsls r0, 3\n\ - adds r0, r6\n\ - ldrb r4, [r0, 0xE]\n\ - ldrb r5, [r0, 0xC]\n\ - lsls r0, r4, 16\n\ - cmp r5, r4\n\ - bcs _081BEF32\n\ - str r0, [sp, 0xC]\n\ - _081BEE9E:\n\ - movs r6, 0\n\ - adds r0, r5, 0x1\n\ - str r0, [sp, 0x4]\n\ - lsls r4, r5, 3\n\ - movs r2, 0x5F\n\ - subs r1, r2, r5\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 4\n\ - mov r9, r0\n\ - _081BEEB2:\n\ - ldr r0, =gUnknown_0203CF04\n\ - ldr r0, [r0]\n\ - ldr r7, =gUnknown_0203CF10\n\ - ldr r3, [r7]\n\ - adds r3, r4, r3\n\ - ldrb r2, [r3, 0x4]\n\ - adds r1, r2, 0x1\n\ - strb r1, [r3, 0x4]\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - ldr r1, [r3]\n\ - adds r1, r2\n\ - ldrb r1, [r1]\n\ - add r1, r9\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - movs r2, 0x1\n\ - mov r8, r2\n\ - str r2, [sp]\n\ - movs r2, 0\n\ - movs r3, 0x30\n\ - bl sub_81BF2B8\n\ - adds r0, r6, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - cmp r6, 0\n\ - beq _081BEEB2\n\ - ldr r0, [r7]\n\ - adds r1, r4, r0\n\ - ldrb r0, [r1, 0x4]\n\ - cmp r0, 0x2F\n\ - bls _081BEF24\n\ - ldr r0, [r1]\n\ - bl Free\n\ - ldr r0, [r7]\n\ - adds r0, r4, r0\n\ - movs r1, 0\n\ - str r1, [r0]\n\ - ldr r1, [sp, 0x8]\n\ - add r1, r10\n\ - lsls r1, 3\n\ - ldr r4, =gTasks\n\ - adds r1, r4\n\ - ldrh r0, [r1, 0xC]\n\ - adds r0, 0x1\n\ - strh r0, [r1, 0xC]\n\ - mov r0, r8\n\ - ands r5, r0\n\ - cmp r5, 0x1\n\ - bne _081BEF24\n\ - ldr r0, =gUnknown_0203CF14\n\ - ldr r1, [r0]\n\ - ldrh r0, [r1, 0x2]\n\ - subs r0, 0x1\n\ - strh r0, [r1, 0x2]\n\ - _081BEF24:\n\ - ldr r1, [sp, 0x4]\n\ - lsls r0, r1, 16\n\ - lsrs r5, r0, 16\n\ - ldr r2, [sp, 0xC]\n\ - lsrs r0, r2, 16\n\ - cmp r5, r0\n\ - bcc _081BEE9E\n\ - _081BEF32:\n\ - ldr r0, =gUnknown_0203CF04\n\ - ldr r1, [r0]\n\ - movs r2, 0x92\n\ - lsls r2, 4\n\ - movs r0, 0\n\ - movs r3, 0\n\ - bl LoadBgTiles\n\ - ldr r0, =gUnknown_0203CF10\n\ - ldr r0, [r0]\n\ - movs r4, 0xBE\n\ - lsls r4, 2\n\ - adds r0, r4\n\ - ldrb r0, [r0, 0x4]\n\ - cmp r0, 0x2F\n\ - bhi _081BF002\n\ - b _081BF014\n\ - .pool\n\ - _081BEF64:\n\ - movs r0, 0\n\ - bl UnsetBgTilemapBuffer\n\ - ldr r0, =sub_81BEBB4\n\ - bl FindTaskIdByFunc\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0xFF\n\ - beq _081BEF7C\n\ - bl DestroyTask\n\ - _081BEF7C:\n\ - ldr r0, =gUnknown_0203CF14\n\ - ldr r1, [r0]\n\ - movs r0, 0\n\ - strh r0, [r1]\n\ - strh r0, [r1, 0x2]\n\ - bl sub_81BEB90\n\ - b _081BF002\n\ - .pool\n\ - _081BEF94:\n\ - ldr r4, =gUnknown_0203CF14\n\ - ldr r0, [r4]\n\ - bl Free\n\ - movs r5, 0\n\ - str r5, [r4]\n\ - ldr r4, =gUnknown_0203CF10\n\ - ldr r0, [r4]\n\ - bl Free\n\ - str r5, [r4]\n\ - ldr r4, =gUnknown_0203CF04\n\ - ldr r0, [r4]\n\ - bl Free\n\ - str r5, [r4]\n\ - ldr r4, =gUnknown_0203CF08\n\ - ldr r0, [r4]\n\ - bl Free\n\ - str r5, [r4]\n\ - b _081BF002\n\ - .pool\n\ - _081BEFD0:\n\ - movs r0, 0xC\n\ - movs r1, 0x2\n\ - bl SetGpuRegBits\n\ - movs r0, 0x8\n\ - movs r1, 0\n\ - bl SetGpuRegBits\n\ - movs r0, 0\n\ - movs r1, 0x7\n\ - movs r2, 0\n\ - bl SetBgAttribute\n\ - bl sub_81971D0\n\ - b _081BF002\n\ - _081BEFF0:\n\ - movs r0, 0\n\ - bl ShowBg\n\ - b _081BF002\n\ - _081BEFF8:\n\ - mov r0, r10\n\ - bl DestroyTask\n\ - bl EnableBothScriptContexts\n\ - _081BF002:\n\ - ldr r0, =gTasks\n\ - mov r2, r10\n\ - lsls r1, r2, 2\n\ - add r1, r10\n\ - lsls r1, 3\n\ - adds r1, r0\n\ - ldrh r0, [r1, 0x8]\n\ - adds r0, 0x1\n\ - strh r0, [r1, 0x8]\n\ - _081BF014:\n\ - add sp, 0x10\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ - .syntax divided"); -} -#endif // NONMATCHING - static void sub_81BF028(u8 taskId) { u16 i; + u8 *buffer; - switch(gTasks[taskId].data[0]) + switch (gTasks[taskId].data[0]) { case 1: - gUnknown_0203CF0C = (struct Struct203CF0C *)AllocZeroed(sizeof(struct Struct203CF0C)); - gUnknown_0203CF0C->frameImageTiles = (u8 *)AllocZeroed(ROOT_FOSSIL_GFX_LENGTH); - gUnknown_0203CF0C->frameImage = (struct DynamicSpriteFrameImage *) AllocZeroed(sizeof(struct DynamicSpriteFrameImage)); - gUnknown_0203CF0C->unkC = (u16 *)AllocZeroed(ROOT_FOSSIL_GFX_RANDOMIZER_LENGTH * sizeof(u16)); - gUnknown_0203CF0C->unk10 = 0; + sUnknown_0203CF0C = AllocZeroed(sizeof(struct Struct203CF0C)); + sUnknown_0203CF0C->frameImageTiles = AllocZeroed(ROOT_FOSSIL_GFX_LENGTH); + sUnknown_0203CF0C->frameImage = AllocZeroed(sizeof(struct DynamicSpriteFrameImage)); + sUnknown_0203CF0C->unkC = AllocZeroed(ROOT_FOSSIL_GFX_RANDOMIZER_LENGTH * sizeof(u16)); + sUnknown_0203CF0C->unk10 = 0; break; case 2: - { - u8 *buffer; - buffer = gUnknown_0203CF0C->frameImageTiles; - for(i = 0; i < ROOT_FOSSIL_GFX_LENGTH; i++, buffer++) - *buffer = gRootFossil_Gfx[i]; - } + buffer = sUnknown_0203CF0C->frameImageTiles; + for (i = 0; i < ROOT_FOSSIL_GFX_LENGTH; i++, buffer++) + *buffer = gRootFossil_Gfx[i]; break; case 3: - gUnknown_0203CF0C->frameImage->data = gUnknown_0203CF0C->frameImageTiles; - gUnknown_0203CF0C->frameImage->size = ROOT_FOSSIL_GFX_LENGTH; + sUnknown_0203CF0C->frameImage->data = sUnknown_0203CF0C->frameImageTiles; + sUnknown_0203CF0C->frameImage->size = ROOT_FOSSIL_GFX_LENGTH; break; case 4: { - u8 spriteId, zero; struct SpriteTemplate fossilTemplate; fossilTemplate = gUnknown_08617E00; - fossilTemplate.images = (struct SpriteFrameImage *)(gUnknown_0203CF0C->frameImage); - spriteId = CreateSprite(&fossilTemplate, 128, -16, 1); - gUnknown_0203CF0C->spriteId = spriteId; - zero = 0; - gSprites[gUnknown_0203CF0C->spriteId].centerToCornerVecX = zero; - gSprites[gUnknown_0203CF0C->spriteId].data[0] = gSprites[gUnknown_0203CF0C->spriteId].pos1.x; - gSprites[gUnknown_0203CF0C->spriteId].data[1] = 1; + fossilTemplate.images = (struct SpriteFrameImage *)(sUnknown_0203CF0C->frameImage); + sUnknown_0203CF0C->spriteId = CreateSprite(&fossilTemplate, 128, -16, 1); + gSprites[sUnknown_0203CF0C->spriteId].centerToCornerVecX = 0; + gSprites[sUnknown_0203CF0C->spriteId].data[0] = gSprites[sUnknown_0203CF0C->spriteId].pos1.x; + gSprites[sUnknown_0203CF0C->spriteId].data[1] = 1; } case 5: - for(i = 0; i < ROOT_FOSSIL_GFX_RANDOMIZER_LENGTH; i++) - gUnknown_0203CF0C->unkC[i] = i; + for (i = 0; i < ROOT_FOSSIL_GFX_RANDOMIZER_LENGTH; i++) + sUnknown_0203CF0C->unkC[i] = i; break; case 6: + for (i = 0; i < (ROOT_FOSSIL_GFX_RANDOMIZER_LENGTH * sizeof(u16)); i++) { - u16 rand1, rand2, temp, j; - j = (ROOT_FOSSIL_GFX_RANDOMIZER_LENGTH * sizeof(u16)) - 1; - for(i = 0; i <= j; i++) - { - rand1 = Random() % 0x100; - rand2 = Random() % 0x100; - j = (ROOT_FOSSIL_GFX_RANDOMIZER_LENGTH * sizeof(u16)) - 1; - temp = gUnknown_0203CF0C->unkC[rand2]; - gUnknown_0203CF0C->unkC[rand2] = gUnknown_0203CF0C->unkC[rand1]; - gUnknown_0203CF0C->unkC[rand1] = temp; - } - gSprites[gUnknown_0203CF0C->spriteId].callback = sub_81BF248; - break; + u16 rand1, rand2, temp; + + rand1 = Random() % 0x100; + rand2 = Random() % 0x100; + SWAP(sUnknown_0203CF0C->unkC[rand2], sUnknown_0203CF0C->unkC[rand1], temp); } + gSprites[sUnknown_0203CF0C->spriteId].callback = sub_81BF248; + break; case 7: - if(gSprites[gUnknown_0203CF0C->spriteId].callback != SpriteCallbackDummy) + if (gSprites[sUnknown_0203CF0C->spriteId].callback != SpriteCallbackDummy) return; - DestroySprite(&gSprites[gUnknown_0203CF0C->spriteId]); - FREE_AND_SET_NULL(gUnknown_0203CF0C->unkC);; - FREE_AND_SET_NULL(gUnknown_0203CF0C->frameImage); - FREE_AND_SET_NULL(gUnknown_0203CF0C->frameImageTiles); - FREE_AND_SET_NULL(gUnknown_0203CF0C); + DestroySprite(&gSprites[sUnknown_0203CF0C->spriteId]); + FREE_AND_SET_NULL(sUnknown_0203CF0C->unkC);; + FREE_AND_SET_NULL(sUnknown_0203CF0C->frameImage); + FREE_AND_SET_NULL(sUnknown_0203CF0C->frameImageTiles); + FREE_AND_SET_NULL(sUnknown_0203CF0C); break; case 8: EnableBothScriptContexts(); + break; } - ++gTasks[taskId].data[0]; + + gTasks[taskId].data[0]++; } static void sub_81BF248(struct Sprite *sprite) { - if (gUnknown_0203CF0C->unk10 >= (ROOT_FOSSIL_GFX_RANDOMIZER_LENGTH)) + if (sUnknown_0203CF0C->unk10 >= (ROOT_FOSSIL_GFX_RANDOMIZER_LENGTH)) { sprite->callback = SpriteCallbackDummy; } @@ -759,7 +407,7 @@ static void sub_81BF248(struct Sprite *sprite) u8 i; for (i = 0; i < 2; i++) { - sub_81BF2B8(gUnknown_0203CF0C->frameImageTiles, gUnknown_0203CF0C->unkC[gUnknown_0203CF0C->unk10++], 0, 16, 0); + sub_81BF2B8(sUnknown_0203CF0C->frameImageTiles, sUnknown_0203CF0C->unkC[sUnknown_0203CF0C->unk10++], 0, 16, 0); } StartSpriteAnim(sprite, 0); } @@ -768,3 +416,37 @@ static void sub_81BF248(struct Sprite *sprite) sprite->pos1.y++; } } + +static void sub_81BF2B8(u8* a, u16 b, u8 c, u8 d, u8 e) +{ + u8 r5, r4, r0, r2, r1; + + r5 = b / d; + r4 = r5; + gUnknown_030012A8[0] = r5; + + r2 = b % d; + r0 = r2; + gUnknown_030012A8[1] = r2; + + r4 &= 7; + r2 &= 7; + gUnknown_030012A8[2] = r4; + gUnknown_030012A8[3] = r2; + + r0 /= 8; + r5 /= 8; + gUnknown_030012A8[4] = r0; + gUnknown_030012A8[5] = r5; + + d /= 8; + d *= 64; + gUnknown_030012A8[6] = (d * r5) + (r0 * 64); + + gUnknown_030012A8[7] = gUnknown_030012A8[6] + 9 * r4; + + r1 = (b & 1); + r1 ^= 1; + c = (c << (r1 << 2)) | (15 << ((r1 ^ 1) << 2)); + a[(e << 5) + r4] &= c; +} diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index 921c8e97c..4196bb34c 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -18,7 +18,6 @@ #include "pokemon_storage_system.h" extern void sub_811EFC0(u8); -extern void ValidateEReaderTrainer(void); extern ScrCmdFunc gMysteryEventScriptCmdTable[]; extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[]; diff --git a/src/new_game.c b/src/new_game.c index cdabd5ccc..18b128624 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -28,7 +28,6 @@ #include "apprentice.h" #include "frontier_util.h" -extern u8 gDifferentSaveFile; extern u16 gSaveFileStatus; extern u8 gUnknown_030060B0; @@ -61,6 +60,10 @@ static void ClearFrontierRecord(void); static void WarpToTruck(void); static void ResetMiniGamesResults(void); +// EWRAM vars +EWRAM_DATA bool8 gDifferentSaveFile = FALSE; +EWRAM_DATA bool8 gUnknown_020322D5 = FALSE; + // const rom data static const struct ContestWinner sContestWinnerPicDummy = { diff --git a/src/overworld.c b/src/overworld.c index 28d2d02ca..10f2ebd26 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -88,12 +88,6 @@ extern const struct MapHeader *const *const gMapGroups[]; extern const s32 gMaxFlashLevel; extern const u16 gUnknown_82EC7C4[]; -u16 gUnknown_03005DA8; -MainCallback gFieldCallback; -bool8 (*gFieldCallback2)(void); -u8 gUnknown_03005DB4; -u8 gFieldLinkPlayerCount; - // functions extern void HealPlayerParty(void); extern void move_tilemap_camera_to_upper_left_corner(void); @@ -256,6 +250,16 @@ IWRAM_DATA static u8 sUnknown_03000E18; IWRAM_DATA static u8 sUnknown_03000E19; IWRAM_DATA static u32 sUnusedVar; +// IWRAM common +u16 *gBGTilemapBuffers1; +u16 *gBGTilemapBuffers2; +u16 *gBGTilemapBuffers3; +u16 gUnknown_03005DA8; +void (*gFieldCallback)(void); +bool8 (*gFieldCallback2)(void); +u8 gUnknown_03005DB4; +u8 gFieldLinkPlayerCount; + // EWRAM vars EWRAM_DATA static u8 sUnknown_020322D8 = 0; EWRAM_DATA struct WarpData gLastUsedWarp = {0}; diff --git a/src/pokedex.c b/src/pokedex.c index 93ff06876..1405393c1 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -29,14 +29,17 @@ #include "constants/songs.h" #include "constants/species.h" +extern u8 gUnknown_030061EC; + +// EWRAM static EWRAM_DATA struct PokedexView *gUnknown_02039B4C = NULL; static EWRAM_DATA u16 gUnknown_02039B50 = 0; static EWRAM_DATA u8 gUnknown_02039B52 = 0; static EWRAM_DATA struct PokedexListItem *gUnknown_02039B54 = NULL; +// IWRAM common u8 gUnknown_030060B0; -MainCallback gUnknown_030060B4; -u8 gUnknown_030061EC; +void (*gUnknown_030060B4)(void); struct PokedexEntry { diff --git a/src/save.c b/src/save.c index 3ee98f4f7..4ae516fc9 100644 --- a/src/save.c +++ b/src/save.c @@ -94,6 +94,7 @@ u16 gSaveUnusedVar2; u16 gUnknown_03006294; EWRAM_DATA struct SaveSection gSaveDataBuffer = {0}; +EWRAM_DATA static u8 sUnusedVar = 0; void ClearSaveData(void) { diff --git a/src/start_menu.c b/src/start_menu.c index 976cbe2a6..455d26509 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -35,6 +35,7 @@ #include "field_player_avatar.h" #include "battle_pyramid_bag.h" #include "battle_pike.h" +#include "new_game.h" // Menu actions enum @@ -63,6 +64,10 @@ enum SAVE_ERROR }; +// IWRAM common +bool8 (*gMenuCallback)(void); + +// EWRAM EWRAM_DATA static u8 sSafariBallsWindowId = 0; EWRAM_DATA static u8 sBattlePyramidFloorWindowId = 0; EWRAM_DATA static u8 sStartMenuCursorPos = 0; @@ -76,7 +81,6 @@ EWRAM_DATA static bool8 sSavingComplete = FALSE; EWRAM_DATA static u8 sSaveInfoWindowId = 0; // Extern variables. -extern u8 gDifferentSaveFile; extern u8 gUnknown_03005DB4; // Extern functions in not decompiled files. diff --git a/src/string_util.c b/src/string_util.c index 3fbf79d87..8ce9a97ed 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -2,7 +2,11 @@ #include "string_util.h" #include "text.h" -EWRAM_DATA u8 gUnknownStringVar[16] = {0}; +EWRAM_DATA u8 gStringVar1[0x100] = {0}; +EWRAM_DATA u8 gStringVar2[0x100] = {0}; +EWRAM_DATA u8 gStringVar3[0x100] = {0}; +EWRAM_DATA u8 gStringVar4[0x3E8] = {0}; +EWRAM_DATA static u8 sUnknownStringVar[16] = {0}; static const u8 sDigits[] = __("0123456789ABCDEF"); @@ -421,7 +425,7 @@ u8 *StringBraille(u8 *dest, const u8 *src) static const u8 *ExpandPlaceholder_UnknownStringVar(void) { - return gUnknownStringVar; + return sUnknownStringVar; } static const u8 *ExpandPlaceholder_PlayerName(void)