Sync pokemon jump documentation

graphics_file_rules.mk

@@ -97,7 +97,7 @@ $(FONTGFXDIR)/font9_jap.fwjpnfont: $(FONTGFXDIR)/font9_jap.png
 graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
 	$(GFX) $< $@ -num_colors 224
 
-graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png
+graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 63
 
 $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
@@ -482,7 +482,7 @@ $(FAMECHECKERGFXDIR)/bg.4bpp: %.4bpp: %.png
 graphics/seagallop/water.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 41
 
-$(MISCGFXDIR)/unk_846B008.4bpp: %.4bpp: %.png
+graphics/link/321start.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
 $(TEXTWINDOWGFXDIR)/unk_8470B0C.4bpp: %.4bpp: %.png

include/bg.h

@@ -39,6 +39,13 @@ enum
     BG_ATTR_BASETILE = 10
 };
 
+// Modes for ChangeBgX / ChangeBgY
+enum {
+    BG_COORD_SET,
+    BG_COORD_ADD,
+    BG_COORD_SUB,
+};
+
 enum AdjustBgMosaicMode
 {
     BG_MOSAIC_SET,

include/constants/pokemon.h

@@ -225,6 +225,10 @@
 #define EVO_MODE_ITEM_USE   2
 #define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve
 
+#define MON_PIC_WIDTH 64
+#define MON_PIC_HEIGHT 64
+#define MON_PIC_SIZE (MON_PIC_WIDTH * MON_PIC_HEIGHT / 2)
+
 // used by ShouldIgnoreDeoxysForm
 #define DEOXYS_CHECK_BATTLE_SPRITE      1
 #define DEOXYS_CHECK_TRADE_MAIN         3

include/link.h

@@ -58,6 +58,7 @@
 #define LINKCMD_0x5FFF             0x5FFF
 #define LINKCMD_0x6666             0x6666
 #define LINKCMD_0x7777             0x7777
+#define LINKCMD_COUNTDOWN          0x7FFF
 #define LINKCMD_CONT_BLOCK         0x8888
 #define LINKCMD_0xAAAA             0xAAAA
 #define LINKCMD_0xAAAB             0xAAAB

include/link_rfu.h

@@ -6,6 +6,8 @@
 #include "link.h"
 #include "AgbRfu_LinkManager.h"
 
+#define RFUCMD_MASK               0xFF00
+
 #define RFUCMD_SEND_PACKET        0x2F00
 #define RFUCMD_READY_CLOSE_LINK   0x5f00
 #define RFUCMD_READY_EXIT_STANDBY 0x6600

include/pokemon_jump.h

@@ -3,7 +3,7 @@
 
 #include "main.h"
 
-void ResetPokeJumpResults(void);
+void ResetPokemonJumpRecords(void);
 bool32 IsSpeciesAllowedInPokemonJump(u16 species);
 void StartPokemonJump(u16 species, MainCallback callback);
 

include/random.h

@@ -13,6 +13,11 @@ u16 Random2(void);
 //Returns a 32-bit pseudorandom number
 #define Random32() (Random() | (Random() << 16))
 
+// The number 1103515245 comes from the example implementation of rand and srand
+// in the ISO C standard.
+#define ISO_RANDOMIZE1(val)(1103515245 * (val) + 24691)
+#define ISO_RANDOMIZE2(val)(1103515245 * (val) + 12345)
+
 //Sets the initial seed value of the pseudorandom number generator
 void SeedRng(u16 seed);
 void SeedRng2(u16 seed);

include/task.h

@@ -5,6 +5,7 @@
 
 #define HEAD_SENTINEL 0xFE
 #define TAIL_SENTINEL 0xFF
+#define TASK_NONE TAIL_SENTINEL
 
 #define NUM_TASKS 16
 #define NUM_TASK_DATA 16

include/window.h

@@ -41,6 +41,8 @@ struct WindowTemplate
     0,                              \
 }
 
+#define WINDOW_NONE 0xFF
+
 struct Window
 {
     struct WindowTemplate window;

src/new_game.c

@@ -155,6 +155,6 @@ static void ResetMiniGamesResults(void)
 {
     CpuFill16(0, &gSaveBlock2Ptr->berryCrush, sizeof(struct BerryCrush));
     SetBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount, 0);
-    ResetPokeJumpResults();
+    ResetPokemonJumpRecords();
     CpuFill16(0, &gSaveBlock2Ptr->berryPick, sizeof(struct BerryPickingResults));
 }

src/random.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "random.h"
 
 // The number 1103515245 comes from the example implementation
 // of rand and srand in the ISO C standard.
@@ -7,7 +8,7 @@ u32 gRngValue;
 
 u16 Random(void)
 {
-    gRngValue = 1103515245 * gRngValue + 24691;
+    gRngValue = ISO_RANDOMIZE1(gRngValue);
     return gRngValue >> 16;
 }