dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
PikalaxALT
2020-02-19 14:22:26 -05:00
parent 9d44bc0bda
commit c0b6148640
6 changed files with 178 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/pokemon_jump.h
+1 -68
View File
@@ -44,7 +44,7 @@ struct PokemonJump2
u16 unk1C[5]; u16 unk1C[5];
u8 txtBuff[2][0x40]; u8 txtBuff[2][0x40];
u8 strBuff[0x100]; u8 strBuff[0x100];
u16 tilemapBuffer[(0x81a8 - 0x1a6) / 2]; // 0x1A6 u16 tilemapBuffer[0x4000]; // Bug: way larger than it should be
struct Sprite *unk81A8[MAX_RFU_PLAYERS]; struct Sprite *unk81A8[MAX_RFU_PLAYERS];
struct Sprite *unk81BC[MAX_RFU_PLAYERS]; struct Sprite *unk81BC[MAX_RFU_PLAYERS];
struct Sprite *unk81D0[8]; struct Sprite *unk81D0[8];
@@ -61,73 +61,6 @@ struct PokemonJump1Sub
u32 unk8; u32 unk8;
}; };
struct PokemonJump1
{
MainCallback returnCallback;
u8 unk4;
u8 unk5;
u8 unk6;
u8 unk7;
u16 unk8;
u16 unkA;
u16 unkC;
u16 unkE;
int unk10;
u32 unk14;
u32 unk18;
int unk1C;
u32 unk20;
u32 unk24;
u32 unk28;
int unk2C;
u32 unk30;
u16 unk34;
u16 unk36;
u8 filler38[0x2];
u16 unk3A;
u16 unk3C;
u16 unk3E;
u16 unk40;
u16 unk42;
u8 unk44;
u8 unk45;
u8 unk46;
u8 isLeader;
u8 unk48;
u8 unk49;
u16 unk4A;
u8 unk4C;
u8 unk4D;
u16 unk4E;
u8 unk50;
u8 unk51;
u8 filler52[0x2];
int unk54;
int unk58;
int unk5C;
int unk60;
int unk64;
int unk68;
int unk6C;
struct PokemonJump1Sub unk70;
u8 unk7C[MAX_RFU_PLAYERS];
u8 unk81[MAX_RFU_PLAYERS];
u8 unk86[MAX_RFU_PLAYERS];
u8 unk8B[MAX_RFU_PLAYERS];
u16 unk90[MAX_RFU_PLAYERS];
u16 unk9A[MAX_RFU_PLAYERS];
struct PokemonJump2 unkA4;
struct PokemonJump1_MonInfo unk82A8[MAX_RFU_PLAYERS];
struct PokemonJump1_82E4 unk82E4[MAX_RFU_PLAYERS];
struct PokemonJump1_82E4 *unk83AC;
};
struct PokemonJumpMons
{
u16 species;
u16 unk2;
};
void ResetPokeJumpResults(void); void ResetPokeJumpResults(void);
bool32 IsSpeciesAllowedInPokemonJump(u16 species); bool32 IsSpeciesAllowedInPokemonJump(u16 species);
void StartPokemonJump(u16 species, MainCallback callback); void StartPokemonJump(u16 species, MainCallback callback);
src/pokemon_jump_2.c
+74 -9
View File
@@ -11,6 +11,67 @@
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/species.h" #include "constants/species.h"
struct PokemonJump1
{
MainCallback returnCallback;
u8 unk4;
u8 unk5;
u8 unk6;
u8 unk7;
u16 unk8;
u16 unkA;
u16 unkC;
u16 unkE;
int unk10;
u32 unk14;
u32 unk18;
int unk1C;
u32 unk20;
u32 unk24;
u32 unk28;
int unk2C;
u32 unk30;
u16 unk34;
u16 unk36;
u8 filler38[0x2];
u16 unk3A;
u16 unk3C;
u16 unk3E;
u16 unk40;
u16 unk42;
u8 unk44;
u8 unk45;
u8 unk46;
u8 isLeader;
u8 unk48;
u8 unk49;
u16 unk4A;
u8 unk4C;
u8 unk4D;
u16 unk4E;
u8 unk50;
u8 unk51;
u8 filler52[0x2];
int unk54;
int unk58;
int unk5C;
int unk60;
int unk64;
int unk68;
int unk6C;
struct PokemonJump1Sub unk70;
u8 unk7C[MAX_RFU_PLAYERS];
u8 unk81[MAX_RFU_PLAYERS];
u8 unk86[MAX_RFU_PLAYERS];
u8 unk8B[MAX_RFU_PLAYERS];
u16 unk90[MAX_RFU_PLAYERS];
u16 unk9A[MAX_RFU_PLAYERS];
struct PokemonJump2 unkA4;
struct PokemonJump1_MonInfo unk82A8[MAX_RFU_PLAYERS];
struct PokemonJump1_82E4 unk82E4[MAX_RFU_PLAYERS];
struct PokemonJump1_82E4 *unk83AC;
};
static void sub_8147B60(struct PokemonJump1 *); static void sub_8147B60(struct PokemonJump1 *);
static void sub_8147B94(struct PokemonJump1 *); static void sub_8147B94(struct PokemonJump1 *);
static void sub_8147C20(void); static void sub_8147C20(void);
@@ -86,7 +147,11 @@ static u16 sub_8149978(u16 item, u16 quantity);
EWRAM_DATA static struct PokemonJump1 *gUnknown_203F3D4 = NULL; EWRAM_DATA static struct PokemonJump1 *gUnknown_203F3D4 = NULL;
static const struct PokemonJumpMons gPkmnJumpSpecies[] = static const struct PokemonJumpMons
{
u16 species;
u16 unk2;
} sPkmnJumpSpecies[] =
{ {
{ .species = SPECIES_BULBASAUR, .unk2 = 2, }, { .species = SPECIES_BULBASAUR, .unk2 = 2, },
{ .species = SPECIES_CHARMANDER, .unk2 = 1, }, { .species = SPECIES_CHARMANDER, .unk2 = 1, },
@@ -197,7 +262,7 @@ void StartPokemonJump(u16 partyIndex, MainCallback callback)
if (gReceivedRemoteLinkPlayers) if (gReceivedRemoteLinkPlayers)
{ {
gUnknown_203F3D4 = Alloc(sizeof(*gUnknown_203F3D4)); gUnknown_203F3D4 = Alloc(sizeof(*gUnknown_203F3D4));
if (gUnknown_203F3D4) if (gUnknown_203F3D4 != NULL)
{ {
ResetTasks(); ResetTasks();
taskId = CreateTask(sub_8147DA0, 1); taskId = CreateTask(sub_8147DA0, 1);
@@ -207,7 +272,7 @@ void StartPokemonJump(u16 partyIndex, MainCallback callback)
gUnknown_203F3D4->unk6 = GetMultiplayerId(); gUnknown_203F3D4->unk6 = GetMultiplayerId();
sub_8147D2C(&gUnknown_203F3D4->unk82A8[gUnknown_203F3D4->unk6], &gPlayerParty[partyIndex]); sub_8147D2C(&gUnknown_203F3D4->unk82A8[gUnknown_203F3D4->unk6], &gPlayerParty[partyIndex]);
sub_8147B60(gUnknown_203F3D4); sub_8147B60(gUnknown_203F3D4);
SetWordTaskArg(taskId, 2, (u32)gUnknown_203F3D4); SetWordTaskArg(taskId, 2, (uintptr_t)gUnknown_203F3D4);
SetMainCallback2(sub_8147D6C); SetMainCallback2(sub_8147D6C);
return; return;
} }
@@ -280,7 +345,7 @@ static void sub_8147C20(void)
for (i = 0; i < MAX_RFU_PLAYERS; i++) for (i = 0; i < MAX_RFU_PLAYERS; i++)
{ {
index = GetPokemonJumpSpeciesIdx(gUnknown_203F3D4->unk82A8[i].species); index = GetPokemonJumpSpeciesIdx(gUnknown_203F3D4->unk82A8[i].species);
gUnknown_203F3D4->unk82E4[i].unkC = gPkmnJumpSpecies[index].unk2; gUnknown_203F3D4->unk82E4[i].unkC = sPkmnJumpSpecies[index].unk2;
} }
gUnknown_203F3D4->unk83AC = &gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6]; gUnknown_203F3D4->unk83AC = &gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6];
@@ -305,9 +370,9 @@ static void sub_8147C98(void)
static s16 GetPokemonJumpSpeciesIdx(u16 species) static s16 GetPokemonJumpSpeciesIdx(u16 species)
{ {
u32 i; u32 i;
for (i = 0; i < ARRAY_COUNT(gPkmnJumpSpecies); i++) for (i = 0; i < NELEMS(sPkmnJumpSpecies); i++)
{ {
if (gPkmnJumpSpecies[i].species == species) if (sPkmnJumpSpecies[i].species == species)
return i; return i;
} }
@@ -1327,7 +1392,7 @@ static void sub_8148E80(u8 taskId)
static void sub_8148F5C(TaskFunc func, u8 taskPriority) static void sub_8148F5C(TaskFunc func, u8 taskPriority)
{ {
u8 taskId = CreateTask(func, taskPriority); u8 taskId = CreateTask(func, taskPriority);
SetWordTaskArg(taskId, 14, (u32)gUnknown_203F3D4); SetWordTaskArg(taskId, 14, (uintptr_t)gUnknown_203F3D4);
} }
static void sub_8148F7C(void) static void sub_8148F7C(void)
@@ -1422,7 +1487,7 @@ static void sub_8149078(void)
if (!(gUnknown_203F3D4->unk50 & 8)) if (!(gUnknown_203F3D4->unk50 & 8))
{ {
gUnknown_203F3D4->unk28 = gUnknown_846B694[gUnknown_203F3D4->unk50] + (gUnknown_203F3D4->unk51 * 7); gUnknown_203F3D4->unk28 = gUnknown_846B694[gUnknown_203F3D4->unk50] + (gUnknown_203F3D4->unk51 * 7);
gUnknown_203F3D4->unk4E = gUnknown_846B6A4[sub_8149194() % ARRAY_COUNT(gUnknown_846B6A4)] + 2; gUnknown_203F3D4->unk4E = gUnknown_846B6A4[sub_8149194() % NELEMS(gUnknown_846B6A4)] + 2;
gUnknown_203F3D4->unk50++; gUnknown_203F3D4->unk50++;
} }
else else
@@ -1894,7 +1959,7 @@ static void sub_8149900(u16 arg0, u16 *arg1, u16 *arg2)
static u16 sub_8149910(void) static u16 sub_8149910(void)
{ {
u16 index = Random() % ARRAY_COUNT(gUnknown_846B764); u16 index = Random() % NELEMS(gUnknown_846B764);
return gUnknown_846B764[index]; return gUnknown_846B764[index];
} }
src/pokemon_jump_3.c
+5 -5
View File
@@ -13,11 +13,11 @@ struct MonInfoPacket
void sub_8149A6C(struct PokemonJump1_MonInfo *arg0) void sub_8149A6C(struct PokemonJump1_MonInfo *arg0)
{ {
struct MonInfoPacket packet; struct MonInfoPacket packet;
packet.id = 1, packet.id = 1;
packet.species = arg0->species, packet.species = arg0->species;
packet.otId = arg0->otId, packet.otId = arg0->otId;
packet.personality = arg0->personality, packet.personality = arg0->personality;
RfuPrepareSend0x2f00(&packet); RfuPrepareSend0x2f00(&packet);
} }
bool32 sub_8149A90(int multiplayerId, struct PokemonJump1_MonInfo *arg0) bool32 sub_8149A90(int multiplayerId, struct PokemonJump1_MonInfo *arg0)
src/pokemon_jump_4.c
+30 -30
View File
@@ -48,7 +48,7 @@ void sub_8149CEC(struct PokemonJump2 *arg0)
sub_8149D34(gUnknown_203F3D8); sub_8149D34(gUnknown_203F3D8);
taskId = CreateTask(sub_8149DA4, 3); taskId = CreateTask(sub_8149DA4, 3);
gUnknown_203F3D8->unk6 = taskId; gUnknown_203F3D8->unk6 = taskId;
SetWordTaskArg(gUnknown_203F3D8->unk6, 2, (u32) gUnknown_203F3D8); SetWordTaskArg(gUnknown_203F3D8->unk6, 2, (uintptr_t)gUnknown_203F3D8);
sub_8149D80(sub_8149DC8); sub_8149D80(sub_8149DC8);
} }
@@ -66,19 +66,19 @@ static void sub_8149D34(struct PokemonJump2 *arg0)
} }
// Gfx // Gfx
static const u16 gPkmnJumpPal3[] = INCBIN_U16("graphics/link_games/pkmnjump_pal3.gbapal"); static const u16 sPkmnJumpPal3[] = INCBIN_U16("graphics/link_games/pkmnjump_pal3.gbapal");
static const u16 gPkmnJumpBgPal[] = INCBIN_U16("graphics/link_games/pkmnjump_bg.gbapal"); static const u16 sPkmnJumpBgPal[] = INCBIN_U16("graphics/link_games/pkmnjump_bg.gbapal");
static const u32 gPkmnJumpBgGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_bg.4bpp.lz"); static const u32 sPkmnJumpBgGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_bg.4bpp.lz");
static const u32 gPkmnJumpBgTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_bg.bin.lz"); static const u32 sPkmnJumpBgTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_bg.bin.lz");
static const u16 gPkmnJumpVenusaurPal[] = INCBIN_U16("graphics/link_games/pkmnjump_venusaur.gbapal"); static const u16 sPkmnJumpVenusaurPal[] = INCBIN_U16("graphics/link_games/pkmnjump_venusaur.gbapal");
static const u32 gPkmnJumpVenusaurGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_venusaur.4bpp.lz"); static const u32 sPkmnJumpVenusaurGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_venusaur.4bpp.lz");
static const u32 gPkmnJumpVenusaurTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_venusaur.bin.lz"); static const u32 sPkmnJumpVenusaurTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_venusaur.bin.lz");
static const u16 gPkmnJumpResultsPal[] = INCBIN_U16("graphics/link_games/pkmnjump_results.gbapal"); static const u16 sPkmnJumpResultsPal[] = INCBIN_U16("graphics/link_games/pkmnjump_results.gbapal");
static const u32 gPkmnJumpResultsGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_results.4bpp.lz"); static const u32 sPkmnJumpResultsGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_results.4bpp.lz");
static const u32 gPkmnJumpResultsTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_results.bin.lz"); static const u32 sPkmnJumpResultsTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_results.bin.lz");
static const struct BgTemplate gUnknown_846D8D4[] = static const struct BgTemplate gUnknown_846D8D4[] =
{ {
@@ -179,7 +179,7 @@ bool32 sub_8149D68(void)
static void sub_8149D80(void (*func)(void)) static void sub_8149D80(void (*func)(void))
{ {
SetWordTaskArg(gUnknown_203F3D8->unk6, 0, (u32) func); SetWordTaskArg(gUnknown_203F3D8->unk6, 0, (uintptr_t)func);
gUnknown_203F3D8->unk4 = 0; gUnknown_203F3D8->unk4 = 0;
gUnknown_203F3D8->unk0 = 0; gUnknown_203F3D8->unk0 = 0;
} }
@@ -206,16 +206,16 @@ static void sub_8149DC8(void)
ResetTempTileDataBuffers(); ResetTempTileDataBuffers();
sub_814AD6C(gUnknown_203F3D8); sub_814AD6C(gUnknown_203F3D8);
sub_814A9C8(); sub_814A9C8();
LoadPalette(gPkmnJumpBgPal, 0, 0x20); LoadPalette(sPkmnJumpBgPal, 0, 0x20);
DecompressAndCopyTileDataToVram(3, gPkmnJumpBgGfx, 0, 0, 0); DecompressAndCopyTileDataToVram(3, sPkmnJumpBgGfx, 0, 0, 0);
DecompressAndCopyTileDataToVram(3, gPkmnJumpBgTilemap, 0, 0, 1); DecompressAndCopyTileDataToVram(3, sPkmnJumpBgTilemap, 0, 0, 1);
LoadPalette(gPkmnJumpVenusaurPal, 0x30, 0x20); LoadPalette(sPkmnJumpVenusaurPal, 0x30, 0x20);
DecompressAndCopyTileDataToVram(2, gPkmnJumpVenusaurGfx, 0, 0, 0); DecompressAndCopyTileDataToVram(2, sPkmnJumpVenusaurGfx, 0, 0, 0);
DecompressAndCopyTileDataToVram(2, gPkmnJumpVenusaurTilemap, 0, 0, 1); DecompressAndCopyTileDataToVram(2, sPkmnJumpVenusaurTilemap, 0, 0, 1);
LoadPalette(gPkmnJumpResultsPal, 0x10, 0x20); LoadPalette(sPkmnJumpResultsPal, 0x10, 0x20);
DecompressAndCopyTileDataToVram(1, gPkmnJumpResultsGfx, 0, 0, 0); DecompressAndCopyTileDataToVram(1, sPkmnJumpResultsGfx, 0, 0, 0);
DecompressAndCopyTileDataToVram(1, gPkmnJumpResultsTilemap, 0, 0, 1); DecompressAndCopyTileDataToVram(1, sPkmnJumpResultsTilemap, 0, 0, 1);
LoadPalette(gPkmnJumpPal3, 0x20, 0x20); LoadPalette(sPkmnJumpPal3, 0x20, 0x20);
SetBgTilemapBuffer(0, gUnknown_203F3D8->tilemapBuffer); SetBgTilemapBuffer(0, gUnknown_203F3D8->tilemapBuffer);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
sub_814A84C(); sub_814A84C();
@@ -501,7 +501,7 @@ bool32 sub_814A408(void)
return TRUE; return TRUE;
} }
const u8 gUnknown_846D94C[] = _("IES"); static const u8 sPluralTxt[] = _("IES");
void sub_814A468(u16 itemId, u16 quantity) void sub_814A468(u16 itemId, u16 quantity)
{ {
@@ -516,7 +516,7 @@ void sub_814A468(u16 itemId, u16 quantity)
{ {
endi--; endi--;
endi[gUnknown_203F3D8->txtBuff[0]] = EOS; endi[gUnknown_203F3D8->txtBuff[0]] = EOS;
StringAppend(gUnknown_203F3D8->txtBuff[0], gUnknown_846D94C); StringAppend(gUnknown_203F3D8->txtBuff[0], sPluralTxt);
} }
} }
} }
@@ -645,7 +645,7 @@ static u32 sub_814A754(u32 left, u32 top, u32 width, u32 height)
window.baseBlock = 0x43; window.baseBlock = 0x43;
windowId = AddWindow(&window); windowId = AddWindow(&window);
FillWindowPixelBuffer(windowId, 0x11); FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
return windowId; return windowId;
} }
@@ -671,8 +671,8 @@ static void sub_814A84C(void)
PutWindowTilemap(0); PutWindowTilemap(0);
PutWindowTilemap(1); PutWindowTilemap(1);
FillWindowPixelBuffer(0, 0); FillWindowPixelBuffer(0, PIXEL_FILL(0));
FillWindowPixelBuffer(1, 0); FillWindowPixelBuffer(1, PIXEL_FILL(0));
AddTextPrinterParameterized3(0, 0, 0, 2, color, 0, gText_SpacePoints2); AddTextPrinterParameterized3(0, 0, 0, 2, color, 0, gText_SpacePoints2);
AddTextPrinterParameterized3(1, 0, 0, 2, color, 0, gText_SpaceTimes3); AddTextPrinterParameterized3(1, 0, 0, 2, color, 0, gText_SpaceTimes3);
} }
@@ -687,7 +687,7 @@ static const u16 gUnknown_846D978[] = {0x06, 0x08, 0x0b, 0x06, 0x10, 0x08};
static const u16 gUnknown_846D984[] = {0x02, 0x06, 0x06, 0x08, 0x10, 0x08, 0x14, 0x06}; static const u16 gUnknown_846D984[] = {0x02, 0x06, 0x06, 0x08, 0x10, 0x08, 0x14, 0x06};
static const u16 gUnknown_846D994[] = {0x02, 0x06, 0x06, 0x08, 0x0b, 0x06, 0x10, 0x08, 0x14, 0x06}; static const u16 gUnknown_846D994[] = {0x02, 0x06, 0x06, 0x08, 0x0b, 0x06, 0x10, 0x08, 0x14, 0x06};
static const u16 *const gUnknown_082FE234[] = static const u16 *const gUnknown_846D9A8[] =
{ {
gUnknown_846D970, gUnknown_846D970,
gUnknown_846D978, gUnknown_846D978,
@@ -827,7 +827,7 @@ static void sub_814AADC(void)
{ {
struct WindowTemplate window; struct WindowTemplate window;
int i, playersCount = sub_81499A4(); int i, playersCount = sub_81499A4();
const u16 *winCoords = gUnknown_082FE234[playersCount - 2]; const u16 *winCoords = gUnknown_846D9A8[playersCount - 2];
window.bg = 0; window.bg = 0;
window.width = 8; window.width = 8;
@@ -853,7 +853,7 @@ static void sub_814AB98(int multiplayerId, u8 clr1, u8 clr2, u8 clr3)
u32 x; u32 x;
u8 colors[3] = {clr1, clr2, clr3}; u8 colors[3] = {clr1, clr2, clr3};
FillWindowPixelBuffer(gUnknown_203F3D8->unk1C[multiplayerId], 0); FillWindowPixelBuffer(gUnknown_203F3D8->unk1C[multiplayerId], PIXEL_FILL(0));
x = 64 - GetStringWidth(0, sub_81499E0(multiplayerId), -1); x = 64 - GetStringWidth(0, sub_81499E0(multiplayerId), -1);
x /= 2; x /= 2;
AddTextPrinterParameterized3(gUnknown_203F3D8->unk1C[multiplayerId], 0, x, 2, colors, -1, sub_81499E0(multiplayerId)); AddTextPrinterParameterized3(gUnknown_203F3D8->unk1C[multiplayerId], 0, x, 2, colors, -1, sub_81499E0(multiplayerId));
src/pokemon_jump_5.c
+67 -67
View File
@@ -12,33 +12,33 @@ static void sub_814B038(struct Sprite *sprite);
static void sub_814B100(struct Sprite *sprite); static void sub_814B100(struct Sprite *sprite);
static void sub_814B1CC(struct Sprite *sprite); static void sub_814B1CC(struct Sprite *sprite);
static const u16 gPkmnJumpPal1[] = INCBIN_U16("graphics/link_games/pkmnjump_pal1.gbapal"); static const u16 sPkmnJumpPal1[] = INCBIN_U16("graphics/link_games/pkmnjump_pal1.gbapal");
static const u16 gPkmnJumpPal2[] = INCBIN_U16("graphics/link_games/pkmnjump_pal2.gbapal"); static const u16 sPkmnJumpPal2[] = INCBIN_U16("graphics/link_games/pkmnjump_pal2.gbapal");
static const u32 gPkmnJumpRopeGfx1[] = INCBIN_U32("graphics/link_games/pkmnjump_rope1.4bpp.lz"); static const u32 sPkmnJumpRopeGfx1[] = INCBIN_U32("graphics/link_games/pkmnjump_rope1.4bpp.lz");
static const u32 gPkmnJumpRopeGfx2[] = INCBIN_U32("graphics/link_games/pkmnjump_rope2.4bpp.lz"); static const u32 sPkmnJumpRopeGfx2[] = INCBIN_U32("graphics/link_games/pkmnjump_rope2.4bpp.lz");
static const u32 gPkmnJumpRopeGfx3[] = INCBIN_U32("graphics/link_games/pkmnjump_rope3.4bpp.lz"); static const u32 sPkmnJumpRopeGfx3[] = INCBIN_U32("graphics/link_games/pkmnjump_rope3.4bpp.lz");
static const u32 gPkmnJumpRopeGfx4[] = INCBIN_U32("graphics/link_games/pkmnjump_rope4.4bpp.lz"); static const u32 sPkmnJumpRopeGfx4[] = INCBIN_U32("graphics/link_games/pkmnjump_rope4.4bpp.lz");
static const u32 gPkmnJumpStarGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_star.4bpp.lz"); static const u32 sPkmnJumpStarGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_star.4bpp.lz");
static const struct CompressedSpriteSheet gUnknown_846E0B0[] = static const struct CompressedSpriteSheet gUnknown_846E0B0[] =
{ {
{gPkmnJumpRopeGfx1, 0x600, 5}, {sPkmnJumpRopeGfx1, 0x600, 5},
{gPkmnJumpRopeGfx2, 0x0c00, 6}, {sPkmnJumpRopeGfx2, 0x0c00, 6},
{gPkmnJumpRopeGfx3, 0x0600, 7}, {sPkmnJumpRopeGfx3, 0x0600, 7},
{gPkmnJumpRopeGfx4, 0x0600, 8}, {sPkmnJumpRopeGfx4, 0x0600, 8},
{gPkmnJumpStarGfx, 0x0200, 10}, {sPkmnJumpStarGfx, 0x0200, 10},
}; };
static const struct SpritePalette gUnknown_846E0D8[] = static const struct SpritePalette gUnknown_846E0D8[] =
{ {
{gPkmnJumpPal1, 5}, {sPkmnJumpPal1, 5},
{gPkmnJumpPal2, 6}, {sPkmnJumpPal2, 6},
}; };
// Forward declarations. // Forward declarations.
static const struct OamData gUnknown_846E170; static const struct OamData sOamData_846E170;
static const struct SpriteTemplate gUnknown_846E220; static const struct SpriteTemplate gUnknown_846E220;
static const struct SpriteTemplate gUnknown_846E238; static const struct SpriteTemplate gUnknown_846E238;
static const struct SpriteTemplate gUnknown_846E250; static const struct SpriteTemplate gUnknown_846E250;
@@ -48,7 +48,7 @@ static const struct SpriteTemplate gUnknown_846E0E8 =
{ {
.tileTag = 0, .tileTag = 0,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_846E170, .oam = &sOamData_846E170,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@@ -73,7 +73,7 @@ static const struct SpriteTemplate *const gUnknown_846E160[] =
&gUnknown_846E268, &gUnknown_846E268,
}; };
static const struct OamData gUnknown_846E170 = static const struct OamData sOamData_846E170 =
{ {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
@@ -90,7 +90,7 @@ static const struct OamData gUnknown_846E170 =
.affineParam = 0 .affineParam = 0
}; };
static const struct OamData gUnknown_846E178 = static const struct OamData sOamData_846E178 =
{ {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
@@ -107,7 +107,7 @@ static const struct OamData gUnknown_846E178 =
.affineParam = 0 .affineParam = 0
}; };
static const struct OamData gUnknown_846E180 = static const struct OamData sOamData_846E180 =
{ {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
@@ -124,7 +124,7 @@ static const struct OamData gUnknown_846E180 =
.affineParam = 0 .affineParam = 0
}; };
static const struct OamData gUnknown_846E188 = static const struct OamData sOamData_846E188 =
{ {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
@@ -141,104 +141,104 @@ static const struct OamData gUnknown_846E188 =
.affineParam = 0 .affineParam = 0
}; };
static const union AnimCmd sSpriteAnim_82FBEE8[] = static const union AnimCmd sSpriteAnim_846E190[] =
{ {
ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(0, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBEF0[] = static const union AnimCmd sSpriteAnim_846E198[] =
{ {
ANIMCMD_FRAME(8, 1), ANIMCMD_FRAME(8, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBEF8[] = static const union AnimCmd sSpriteAnim_846E1A0[] =
{ {
ANIMCMD_FRAME(16, 1), ANIMCMD_FRAME(16, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBF00[] = static const union AnimCmd sSpriteAnim_846E1A8[] =
{ {
ANIMCMD_FRAME(24, 1), ANIMCMD_FRAME(24, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBF08[] = static const union AnimCmd sSpriteAnim_846E1B0[] =
{ {
ANIMCMD_FRAME(32, 1), ANIMCMD_FRAME(32, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBF10[] = static const union AnimCmd sSpriteAnim_846E1B8[] =
{ {
ANIMCMD_FRAME(40, 1), ANIMCMD_FRAME(40, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBF18[] = static const union AnimCmd sSpriteAnim_846E1C0[] =
{ {
ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(0, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBF20[] = static const union AnimCmd sSpriteAnim_846E1C8[] =
{ {
ANIMCMD_FRAME(16, 1), ANIMCMD_FRAME(16, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBF28[] = static const union AnimCmd sSpriteAnim_846E1D0[] =
{ {
ANIMCMD_FRAME(32, 1), ANIMCMD_FRAME(32, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBF30[] = static const union AnimCmd sSpriteAnim_846E1D8[] =
{ {
ANIMCMD_FRAME(48, 1), ANIMCMD_FRAME(48, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBF38[] = static const union AnimCmd sSpriteAnim_846E1E0[] =
{ {
ANIMCMD_FRAME(64, 1), ANIMCMD_FRAME(64, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBF40[] = static const union AnimCmd sSpriteAnim_846E1E8[] =
{ {
ANIMCMD_FRAME(80, 1), ANIMCMD_FRAME(80, 1),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd *const sSpriteAnimTable_82FBF48[] = static const union AnimCmd *const sSpriteAnimTable_846E1F0[] =
{ {
sSpriteAnim_82FBEE8, sSpriteAnim_846E190,
sSpriteAnim_82FBEF0, sSpriteAnim_846E198,
sSpriteAnim_82FBEF8, sSpriteAnim_846E1A0,
sSpriteAnim_82FBF00, sSpriteAnim_846E1A8,
sSpriteAnim_82FBF08, sSpriteAnim_846E1B0,
sSpriteAnim_82FBF10 sSpriteAnim_846E1B8
}; };
static const union AnimCmd *const sSpriteAnimTable_82FBF60[] = static const union AnimCmd *const sSpriteAnimTable_846E208[] =
{ {
sSpriteAnim_82FBF18, sSpriteAnim_846E1C0,
sSpriteAnim_82FBF20, sSpriteAnim_846E1C8,
sSpriteAnim_82FBF28, sSpriteAnim_846E1D0,
sSpriteAnim_82FBF30, sSpriteAnim_846E1D8,
sSpriteAnim_82FBF38, sSpriteAnim_846E1E0,
sSpriteAnim_82FBF40 sSpriteAnim_846E1E8
}; };
static const struct SpriteTemplate gUnknown_846E220 = static const struct SpriteTemplate gUnknown_846E220 =
{ {
.tileTag = 5, .tileTag = 5,
.paletteTag = 5, .paletteTag = 5,
.oam = &gUnknown_846E178, .oam = &sOamData_846E178,
.anims = sSpriteAnimTable_82FBF48, .anims = sSpriteAnimTable_846E1F0,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
@@ -248,8 +248,8 @@ static const struct SpriteTemplate gUnknown_846E238 =
{ {
.tileTag = 6, .tileTag = 6,
.paletteTag = 5, .paletteTag = 5,
.oam = &gUnknown_846E180, .oam = &sOamData_846E180,
.anims = sSpriteAnimTable_82FBF60, .anims = sSpriteAnimTable_846E208,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
@@ -259,8 +259,8 @@ static const struct SpriteTemplate gUnknown_846E250 =
{ {
.tileTag = 7, .tileTag = 7,
.paletteTag = 5, .paletteTag = 5,
.oam = &gUnknown_846E188, .oam = &sOamData_846E188,
.anims = sSpriteAnimTable_82FBF48, .anims = sSpriteAnimTable_846E1F0,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
@@ -270,14 +270,14 @@ static const struct SpriteTemplate gUnknown_846E268 =
{ {
.tileTag = 8, .tileTag = 8,
.paletteTag = 5, .paletteTag = 5,
.oam = &gUnknown_846E188, .oam = &sOamData_846E188,
.anims = sSpriteAnimTable_82FBF48, .anims = sSpriteAnimTable_846E1F0,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
}; };
static const struct OamData sOamData_82FBFD8 = static const struct OamData sOamData_846E280 =
{ {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
@@ -294,13 +294,13 @@ static const struct OamData sOamData_82FBFD8 =
.affineParam = 0 .affineParam = 0
}; };
static const union AnimCmd sSpriteAnim_82FBFE0[] = static const union AnimCmd sSpriteAnim_846E288[] =
{ {
ANIMCMD_FRAME(0, 0), ANIMCMD_FRAME(0, 0),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_82FBFE8[] = static const union AnimCmd sSpriteAnim_846E290[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(4, 4), ANIMCMD_FRAME(4, 4),
@@ -311,18 +311,18 @@ static const union AnimCmd sSpriteAnim_82FBFE8[] =
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd *const sSpriteAnimTable_82FC004[] = static const union AnimCmd *const sSpriteAnimTable_846E2AC[] =
{ {
sSpriteAnim_82FBFE0, sSpriteAnim_846E288,
sSpriteAnim_82FBFE8 sSpriteAnim_846E290
}; };
static const struct SpriteTemplate gUnknown_846E2B4 = static const struct SpriteTemplate gUnknown_846E2B4 =
{ {
.tileTag = 10, .tileTag = 10,
.paletteTag = 5, .paletteTag = 5,
.oam = &sOamData_82FBFD8, .oam = &sOamData_846E280,
.anims = sSpriteAnimTable_82FC004, .anims = sSpriteAnimTable_846E2AC,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
@@ -405,7 +405,7 @@ void sub_814AF0C(struct PokemonJump2 *arg0, int multiplayerId)
{ {
sub_814ADB4(arg0->unk81BC[multiplayerId]); sub_814ADB4(arg0->unk81BC[multiplayerId]);
arg0->unk81BC[multiplayerId]->data[7] = arg0->unk81A8[multiplayerId] - gSprites; arg0->unk81BC[multiplayerId]->data[7] = arg0->unk81A8[multiplayerId] - gSprites;
arg0->unk81BC[multiplayerId]->invisible = 0; arg0->unk81BC[multiplayerId]->invisible = FALSE;
arg0->unk81BC[multiplayerId]->pos1.y = 96; arg0->unk81BC[multiplayerId]->pos1.y = 96;
arg0->unk81BC[multiplayerId]->callback = sub_814AF74; arg0->unk81BC[multiplayerId]->callback = sub_814AF74;
StartSpriteAnim(arg0->unk81BC[multiplayerId], 1); StartSpriteAnim(arg0->unk81BC[multiplayerId], 1);
@@ -418,7 +418,7 @@ static void sub_814AF74(struct Sprite *sprite)
case 0: case 0:
if (sprite->animEnded) if (sprite->animEnded)
{ {
sprite->invisible = 1; sprite->invisible = TRUE;
sprite->callback = SpriteCallbackDummy; sprite->callback = SpriteCallbackDummy;
} }
break; break;
@@ -434,7 +434,7 @@ static void sub_814AF74(struct Sprite *sprite)
case 2: case 2:
if (++sprite->data[1] >= 48) if (++sprite->data[1] >= 48)
{ {
sprite->invisible = 1; sprite->invisible = TRUE;
sprite->callback = SpriteCallbackDummy; sprite->callback = SpriteCallbackDummy;
} }
break; break;
@@ -486,7 +486,7 @@ void sub_814B0A8(struct PokemonJump2 *arg0)
{ {
if (arg0->unk81A8[i]->callback == sub_814B100) if (arg0->unk81A8[i]->callback == sub_814B100)
{ {
arg0->unk81A8[i]->invisible = 0; arg0->unk81A8[i]->invisible = FALSE;
arg0->unk81A8[i]->callback = SpriteCallbackDummy; arg0->unk81A8[i]->callback = SpriteCallbackDummy;
arg0->unk81A8[i]->subpriority = 10; arg0->unk81A8[i]->subpriority = 10;
} }
@@ -560,7 +560,7 @@ void sub_814B240(struct PokemonJump2 *arg0, s16 x, s16 y, u8 multiplayerId)
u8 spriteId = CreateSprite(&gUnknown_846E2B4, x, y, 1); u8 spriteId = CreateSprite(&gUnknown_846E2B4, x, y, 1);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gSprites[spriteId].invisible = 1; gSprites[spriteId].invisible = TRUE;
arg0->unk81BC[multiplayerId] = &gSprites[spriteId]; arg0->unk81BC[multiplayerId] = &gSprites[spriteId];
} }
} }
src/pokemon_jump_6.c
+1 -1
View File
@@ -85,7 +85,7 @@ static void Task_ShowPokemonJumpRecords(u8 taskId)
data[0]++; data[0]++;
break; break;
case 2: case 2:
if (gMain.newKeys & (A_BUTTON | B_BUTTON)) if (JOY_NEW(A_BUTTON | B_BUTTON))
{ {
rbox_fill_rectangle(data[1]); rbox_fill_rectangle(data[1]);
CopyWindowToVram(data[1], 1); CopyWindowToVram(data[1], 1);