mirror of
https://github.com/pret/pokepinballrs.git
synced 2026-03-21 17:24:13 -05:00
* checkpoint * checkpoint 2 * checkpoint 3 * checkpoint 4 * checkpoint 5 * carve 86aa4a8, aa20c, aa208 * carve through ACCA0 * through 086ADA6E
This commit is contained in:
parent
d4b22a7fd6
commit
c555ddb059
49
data/rom_1.s
49
data/rom_1.s
|
|
@ -818,13 +818,31 @@ gUnknown_081B45A4:: @ 0x081B45A4
|
|||
.incbin "baserom.gba", 0x1B45A4, 0x1E0
|
||||
|
||||
gUnknown_081B4784:: @ 0x081B4784
|
||||
.incbin "baserom.gba", 0x1B4784, 0x4000
|
||||
.incbin "baserom.gba", 0x1B4784, 0x1000
|
||||
|
||||
gUnknown_081B5784:: @ 0x081B5784
|
||||
.incbin "baserom.gba", 0x1B5784, 0x1000
|
||||
|
||||
gUnknown_081B6784:: @ 0x081B6784
|
||||
.incbin "baserom.gba", 0x1B6784, 0x1000
|
||||
|
||||
gUnknown_081B7784:: @ 0x081B7784
|
||||
.incbin "baserom.gba", 0x1B7784, 0x1000
|
||||
|
||||
gUnknown_081B8784:: @ 0x081B8784
|
||||
.incbin "baserom.gba", 0x1B8784, 0x200
|
||||
|
||||
gUnknown_081B8984:: @ 0x081B8984
|
||||
.incbin "baserom.gba", 0x1B8984, 0x4000
|
||||
.incbin "baserom.gba", 0x1B8984, 0x1000
|
||||
|
||||
gUnknown_081B9984:: @ 0x081B9984
|
||||
.incbin "baserom.gba", 0x1B9984, 0x1000
|
||||
|
||||
gUnknown_081BA984:: @ 0x081BA984
|
||||
.incbin "baserom.gba", 0x1BA984, 0x1000
|
||||
|
||||
gUnknown_081BB984:: @ 0x081BB984
|
||||
.incbin "baserom.gba", 0x1BB984, 0x1000
|
||||
|
||||
gUnknown_081BC984:: @ 0x081BC984
|
||||
.incbin "baserom.gba", 0x1BC984, 0x120
|
||||
|
|
@ -1540,7 +1558,16 @@ gUnknown_08514F6C:: @ 0x08514F6C
|
|||
.incbin "baserom.gba", 0x514F6C, 0x1E0
|
||||
|
||||
gUnknown_0851514C:: @ 0x0851514C
|
||||
.incbin "baserom.gba", 0x51514C, 0x4620
|
||||
.incbin "baserom.gba", 0x51514C, 0x4420
|
||||
|
||||
gUnknown_0851956C:: @ 0x0851956C
|
||||
.incbin "baserom.gba", 0x51956C, 0x20
|
||||
|
||||
gUnknown_0851958C:: @ 0x0851958C
|
||||
.incbin "baserom.gba", 0x51958C, 0x20
|
||||
|
||||
gUnknown_085195AC:: @ 0x085195AC
|
||||
.incbin "baserom.gba", 0x5195AC, 0x1C0
|
||||
|
||||
gUnknown_0851976C:: @ 0x0851976C
|
||||
.incbin "baserom.gba", 0x51976C, 0x4420
|
||||
|
|
@ -1552,10 +1579,22 @@ gUnknown_08521FAC:: @ 0x08521FAC
|
|||
.incbin "baserom.gba", 0x521FAC, 0x20
|
||||
|
||||
gUnknown_08521FCC:: @ 0x08521FCC
|
||||
.incbin "baserom.gba", 0x521FCC, 0x3E0
|
||||
.incbin "baserom.gba", 0x521FCC, 0x1E0
|
||||
|
||||
gUnknown_085221AC:: @ 0x085221AC
|
||||
.incbin "baserom.gba", 0x5221AC, 0x200
|
||||
|
||||
gUnknown_085223AC:: @ 0x085223AC
|
||||
.incbin "baserom.gba", 0x5223AC, 0x4A20
|
||||
.incbin "baserom.gba", 0x5223AC, 0x4420
|
||||
|
||||
gUnknown_085267CC:: @ 0x085267CC
|
||||
.incbin "baserom.gba", 0x5267CC, 0x200
|
||||
|
||||
gUnknown_085269CC:: @ 0x085269CC
|
||||
.incbin "baserom.gba", 0x5269CC, 0x200
|
||||
|
||||
gUnknown_08526BCC:: @ 0x08526BCC
|
||||
.incbin "baserom.gba", 0x526BCC, 0x200
|
||||
|
||||
gSapphireBoardZigzagoonFx_Gfx:: @ 0x08526DCC
|
||||
.incbin "graphics/stage/sapphire/zigzagoon_fx.4bpp";
|
||||
|
|
|
|||
1753
data/rom_2.s
1753
data/rom_2.s
File diff suppressed because it is too large
Load Diff
|
|
@ -316,8 +316,8 @@ extern u16 gDexInfoWindowEmptyRowTiles[];
|
|||
extern u16 gUnknown_0202A590[];
|
||||
extern u16 gUnknown_08086B40[];
|
||||
extern u16 gUnknown_083722E8[0x4000];
|
||||
extern s16 gUnknown_086A61BC[];
|
||||
extern s16 gUnknown_086A77A8[][10][2];
|
||||
extern s16 gDexAnimationIx[];
|
||||
extern s16 gTitleRevealJingle[][10][2];
|
||||
extern u8 gUnknown_0201B124;
|
||||
|
||||
extern const struct PokemonSpecies gSpeciesInfo[];
|
||||
|
|
@ -349,19 +349,14 @@ struct unkStruct_8079730
|
|||
};
|
||||
extern const struct unkStruct_8079730 gUnknown_08079730[][8];
|
||||
|
||||
struct UnkStruct_086A7768 {
|
||||
s16 unk0;
|
||||
s16 unk2;
|
||||
};
|
||||
|
||||
extern struct UnkStruct_086A7768 gUnknown_086A7768[0x8];
|
||||
extern struct Vector16 gUnknown_086A7768[0x8];
|
||||
extern s16 gUnknown_086A7788[0x8];
|
||||
extern s16 gUnknown_0202ADA0[];
|
||||
extern s32 gUnknown_0202BEF0;
|
||||
extern const struct SpriteSet *const gUnknown_086A769C[];
|
||||
extern struct SpriteGroup gMain_spriteGroups_40[];
|
||||
extern struct SpriteGroup gMain_spriteGroups_48;
|
||||
extern struct UnkStruct_086A7768 gUnknown_086A7798[0x4];
|
||||
extern struct Vector16 gUnknown_086A7798[0x4];
|
||||
extern s32 gUnknown_0201C188;
|
||||
|
||||
extern const struct SpriteSet *const gUnknown_086A795C[];
|
||||
|
|
|
|||
28
src/intro.c
28
src/intro.c
|
|
@ -84,10 +84,10 @@ struct UnkStruct_0201A450
|
|||
}; // 0x10 size in memory
|
||||
extern struct UnkStruct_0201A450 gUnknown_0201A450[6];
|
||||
|
||||
extern struct UnkStruct_086A7768 gUnknown_086A7768[0x8];
|
||||
extern struct UnkStruct_086A7768 gUnknown_086A7798[0x4];
|
||||
extern struct UnkStruct_086A7768 gUnknown_086A79FC[];
|
||||
extern struct UnkStruct_086A7768 gUnknown_086A7B7C[0x4];
|
||||
extern struct Vector16 gUnknown_086A7768[0x8];
|
||||
extern struct Vector16 gUnknown_086A7798[0x4];
|
||||
extern struct Vector16 gUnknown_086A79FC[];
|
||||
extern struct Vector16 gUnknown_086A7B7C[0x4];
|
||||
|
||||
struct UnkStruct_086A7AC0 {
|
||||
s8 unk0;
|
||||
|
|
@ -299,9 +299,9 @@ void sub_978C(void)
|
|||
gUnknown_0201A450[0].unk8++;
|
||||
}
|
||||
|
||||
if (gUnknown_0202BF10 >= gUnknown_086A77A8[gUnknown_0202C5A8][gUnknown_0202A578][1])
|
||||
if (gUnknown_0202BF10 >= gTitleRevealJingle[gUnknown_0202C5A8][gUnknown_0202A578][1])
|
||||
{
|
||||
m4aSongNumStart(gUnknown_086A77A8[gUnknown_0202C5A8][gUnknown_0202A578][0]);
|
||||
m4aSongNumStart(gTitleRevealJingle[gUnknown_0202C5A8][gUnknown_0202A578][0]);
|
||||
gUnknown_0202A578++;
|
||||
}
|
||||
}
|
||||
|
|
@ -408,7 +408,7 @@ void sub_999C(void)
|
|||
|
||||
gMain.bgOffsets[0].xOffset = gUnknown_0202ADA0[0];
|
||||
gMain.bgOffsets[0].yOffset = gUnknown_0202ADA0[1];
|
||||
if (++gUnknown_0202ADA0[5] > gUnknown_086A7768[gUnknown_0202ADA0[4]].unk2)
|
||||
if (++gUnknown_0202ADA0[5] > gUnknown_086A7768[gUnknown_0202ADA0[4]].y)
|
||||
{
|
||||
CopyBgTilesRect(&gUnknown_0201C1C0[gUnknown_086A7788[gUnknown_0202ADA0[4]]], (void *)0x60036E0, 8, 8);
|
||||
if (++gUnknown_0202ADA0[4] > 3)
|
||||
|
|
@ -444,7 +444,7 @@ void sub_9AB8(void)
|
|||
gUnknown_0202ADA0[0x1]--;
|
||||
}
|
||||
|
||||
if (++gUnknown_0202ADA0[5] > gUnknown_086A7768[gUnknown_0202ADA0[4]].unk2)
|
||||
if (++gUnknown_0202ADA0[5] > gUnknown_086A7768[gUnknown_0202ADA0[4]].y)
|
||||
{
|
||||
if (gUnknown_0202ADA0[4] < 7)
|
||||
CopyBgTilesRect(&gUnknown_0201C1C0[gUnknown_086A7788[gUnknown_0202ADA0[0x4]]], (void *)0x60036e0, 8, 8);
|
||||
|
|
@ -561,8 +561,8 @@ void sub_9D70(void)
|
|||
for (i = 0; i < 4; i++)
|
||||
{
|
||||
puVar2 = &puVar4->oam[i];
|
||||
gOamBuffer[puVar2->oamId].x = gUnknown_086A7798[i].unk0 * gUnknown_02019C30 / 0x100 + puVar4->baseX;
|
||||
gOamBuffer[puVar2->oamId].y = gUnknown_086A7798[i].unk2 * gUnknown_0201C188 / 0x100 + puVar4->baseY;
|
||||
gOamBuffer[puVar2->oamId].x = gUnknown_086A7798[i].x * gUnknown_02019C30 / 0x100 + puVar4->baseX;
|
||||
gOamBuffer[puVar2->oamId].y = gUnknown_086A7798[i].y * gUnknown_0201C188 / 0x100 + puVar4->baseY;
|
||||
|
||||
gOamBuffer[puVar2->oamId].affineMode = 1;
|
||||
gOamBuffer[puVar2->oamId].matrixNum = 0;
|
||||
|
|
@ -1177,7 +1177,7 @@ void sub_AE74(void)
|
|||
gUnknown_0202ADA0[0x2]++;
|
||||
gUnknown_0202ADA0[0x5]++;
|
||||
|
||||
if (gUnknown_0202ADA0[0x5] > gUnknown_086A79FC[gUnknown_0202ADA0[4]].unk2)
|
||||
if (gUnknown_0202ADA0[0x5] > gUnknown_086A79FC[gUnknown_0202ADA0[4]].y)
|
||||
{
|
||||
gUnknown_0202ADA0[4]++;
|
||||
CopyBgTilesRect(&gUnknown_03000000[gUnknown_086A7A1C[gUnknown_0202ADA0[4]]], (void *) 0x6002EE0, 8, 8);
|
||||
|
|
@ -1200,7 +1200,7 @@ void sub_AE74(void)
|
|||
|
||||
void sub_AF80(void)
|
||||
{
|
||||
if (++gUnknown_0202ADA0[0x5] > gUnknown_086A79FC[gUnknown_0202ADA0[0x4]].unk2)
|
||||
if (++gUnknown_0202ADA0[0x5] > gUnknown_086A79FC[gUnknown_0202ADA0[0x4]].y)
|
||||
{
|
||||
if (gUnknown_0202ADA0[0x04] < 7)
|
||||
{
|
||||
|
|
@ -1817,8 +1817,8 @@ void sub_C0D8(void)
|
|||
{
|
||||
oamData = &spriteGroup->oam[i];
|
||||
gOamBuffer[oamData->oamId].priority = 1;
|
||||
gOamBuffer[oamData->oamId].x = gUnknown_086A7B7C[i].unk0 * gUnknown_0202C5E4 / 0x100 + spriteGroup->baseX;
|
||||
gOamBuffer[oamData->oamId].y = gUnknown_086A7B7C[i].unk2 * gUnknown_0202ADD8 / 0x100 + spriteGroup->baseY;
|
||||
gOamBuffer[oamData->oamId].x = gUnknown_086A7B7C[i].x * gUnknown_0202C5E4 / 0x100 + spriteGroup->baseX;
|
||||
gOamBuffer[oamData->oamId].y = gUnknown_086A7B7C[i].y * gUnknown_0202ADD8 / 0x100 + spriteGroup->baseY;
|
||||
gOamBuffer[oamData->oamId].affineMode = 1;
|
||||
gOamBuffer[oamData->oamId].matrixNum = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ void Pokedex_State5_45A4(void)
|
|||
{
|
||||
if (gPokedexFlags[gPokedexSelectedMon] == SPECIES_CAUGHT)
|
||||
{
|
||||
if (gUnknown_086A61BC[gPokedexSelectedMon] == -1)
|
||||
if (gDexAnimationIx[gPokedexSelectedMon] == -1)
|
||||
{
|
||||
gUnknown_0202A588 = 0;
|
||||
gUnknown_0202A55C = 1;
|
||||
|
|
@ -495,7 +495,7 @@ void Pokedex_State5_45A4(void)
|
|||
}
|
||||
else
|
||||
{
|
||||
if (gUnknown_086A61BC[gPokedexSelectedMon] < 100)
|
||||
if (gDexAnimationIx[gPokedexSelectedMon] < 100)
|
||||
{
|
||||
gUnknown_0202A588 = 0;
|
||||
gUnknown_0202A55C = 0;
|
||||
|
|
@ -921,7 +921,7 @@ void sub_5064(void)
|
|||
{
|
||||
if (gPokedexFlags[gPokedexSelectedMon] == SPECIES_CAUGHT)
|
||||
{
|
||||
if (gUnknown_086A61BC[gPokedexSelectedMon] == -1)
|
||||
if (gDexAnimationIx[gPokedexSelectedMon] == -1)
|
||||
{
|
||||
gUnknown_0202A588 = 0;
|
||||
gUnknown_0202A55C = 1;
|
||||
|
|
@ -930,7 +930,7 @@ void sub_5064(void)
|
|||
gUnknown_0201A440 = 0;
|
||||
gUnknown_0202BF0C = 0;
|
||||
}
|
||||
else if (gUnknown_086A61BC[gPokedexSelectedMon] < 100)
|
||||
else if (gDexAnimationIx[gPokedexSelectedMon] < 100)
|
||||
{
|
||||
gUnknown_0202A588 = 0;
|
||||
gUnknown_0202A55C = 0;
|
||||
|
|
@ -956,9 +956,9 @@ void sub_5064(void)
|
|||
|
||||
u8 sub_5134(void)
|
||||
{
|
||||
if (gPokedexFlags[gPokedexSelectedMon] == SPECIES_CAUGHT && gUnknown_086A61BC[gPokedexSelectedMon] != -1)
|
||||
if (gPokedexFlags[gPokedexSelectedMon] == SPECIES_CAUGHT && gDexAnimationIx[gPokedexSelectedMon] != -1)
|
||||
{
|
||||
if (gUnknown_086A61BC[gPokedexSelectedMon] < 100)
|
||||
if (gDexAnimationIx[gPokedexSelectedMon] < 100)
|
||||
return 1;
|
||||
|
||||
return 2;
|
||||
|
|
@ -2393,7 +2393,7 @@ void sub_8974(s16 species)
|
|||
s16 remainder;
|
||||
s16 var1;
|
||||
|
||||
var0 = gUnknown_086A61BC[species];
|
||||
var0 = gDexAnimationIx[species];
|
||||
if (var0 == -1)
|
||||
return;
|
||||
|
||||
|
|
@ -2419,7 +2419,7 @@ void sub_8974(s16 species)
|
|||
|
||||
s16 sub_8A78(s16 species)
|
||||
{
|
||||
if (gPokedexFlags[species] == 4 && gUnknown_086A61BC[species] != -1)
|
||||
if (gPokedexFlags[species] == 4 && gDexAnimationIx[species] != -1)
|
||||
gUnknown_0202A588 = 1;
|
||||
else
|
||||
gUnknown_0202A588 = 0;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ extern const u16 gUnknown_081B0FE4[][0x30];
|
|||
extern const u8 gUnknown_081C0064[];
|
||||
extern const u8 gUnknown_0844AA0C[][0x480];
|
||||
extern const u8 gUnknown_084C156C[];
|
||||
extern const s16 gUnknown_086ACF38[36];
|
||||
extern const s16 gUnknown_086ACF38[34];
|
||||
extern const u8 gUnknown_086ACF80[];
|
||||
extern const s8 gUnknown_086ACFF4[];
|
||||
extern u16 gUnknown_086AD180[][7];
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user