Document intro graphics/data

graphics/intro/game_freak/sparkles.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 32
+0 0 74
+0 0 115
+24 24 123
+49 49 139
+82 82 156
+106 106 172
+139 139 189
+164 164 205
+197 197 222
+222 222 238
+255 255 255
+0 0 0
+0 0 0

graphics/intro/unk_840270C.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-24 41 74
-0 0 0
-139 123 16
-189 172 16
-131 164 65
-148 230 49
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-222 222 222
-24 41 74
-82 82 82
-180 180 180
-255 255 255

graphics/intro/unk_8402D34.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 255 255
-115 197 106
-41 164 8
-82 180 65
-139 222 131
-98 197 82
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-16 139 98
-16 115 98
-24 90 90
-32 74 90
-32 65 82

graphics/intro/unk_84048CC.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 255
-255 255 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-238 246 246
-222 230 230
-180 189 197
-148 156 172
-106 123 139
-74 90 115
-41 57 90
-0 0 0

graphics/intro/unk_8405B08.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-131 238 115
-82 189 74
-57 164 57
-115 213 98
-16 123 16
-164 255 131
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 148 0
-164 222 98

graphics/intro/unk_8409A1C.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-164 238 139
-57 148 57
-131 213 115
-156 230 156
-131 205 148
-106 180 131
-65 139 98
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-255 0 0

graphics/intro/unk_840B834.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-238 246 189
-0 0 0
-0 0 0
-115 213 255
-156 222 255
-205 238 255
-255 255 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/intro/unk_840B854.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 222 205
-255 255 255
-222 222 222
-123 123 123
-156 222 255
-189 230 255
-222 238 255
-255 255 255
-255 180 123
-238 98 74
-205 57 32
-197 131 180
-164 98 148
-131 65 123
-90 57 90
-16 16 16

graphics_file_rules.mk

@@ -537,14 +537,20 @@ graphics/misc/emoticons.4bpp: %.4bpp: %.png
 $(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 55
 
-$(INTROGFXDIR)/unk_8402D54.4bpp: %.4bpp: %.png
+$(INTROGFXDIR)/scene_1/grass.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 397
 
-$(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png
+$(INTROGFXDIR)/scene_2/plants.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 17
+
+$(INTROGFXDIR)/scene_2/nidorino_close.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 170
 
-$(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png
+$(INTROGFXDIR)/scene_2/gengar_close.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 17
+	$(GFX) $< $@ -num_tiles 114
+
+$(INTROGFXDIR)/scene_3/gengar_anim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 348
 
 $(BATTLETERRAINGFXDIR)/building/terrain.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 77

include/intro.h

@@ -1,7 +1,7 @@
 #ifndef GUARD_INTRO_H
 #define GUARD_INTRO_H
 
-void CB2_CopyrightScreen(void);
+void CB2_InitCopyrightScreenAfterTitleScreen(void);
-void c2_copyright_1(void);
+void CB2_InitCopyrightScreenAfterBootup(void);
 
 #endif //GUARD_INTRO_H

include/random.h

@@ -15,8 +15,9 @@ u16 Random2(void);
 
 // 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 RAND_MULT 1103515245
-#define ISO_RANDOMIZE2(val)(1103515245 * (val) + 12345)
+#define ISO_RANDOMIZE1(val)(RAND_MULT * (val) + 24691)
+#define ISO_RANDOMIZE2(val)(RAND_MULT * (val) + 12345)
 
 //Sets the initial seed value of the pseudorandom number generator
 void SeedRng(u16 seed);

src/main.c

@@ -206,7 +206,7 @@ static void InitMainCallbacks(void)
     gMain.vblankCounter1 = 0;
     gMain.vblankCounter2 = 0;
     gMain.callback1 = NULL;
-    SetMainCallback2(c2_copyright_1);
+    SetMainCallback2(CB2_InitCopyrightScreenAfterBootup);
     gSaveBlock2Ptr = &gSaveBlock2;
     gSaveBlock1Ptr = &gSaveBlock1;
     gSaveBlock2.encryptionKey = 0;

src/pokemon_special_anim_scene.c

@@ -8,6 +8,7 @@
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "pokemon_special_anim_internal.h"
+#include "random.h"
 #include "strings.h"
 #include "text_window.h"
 #include "trig.h"
@@ -1303,7 +1304,7 @@ static void Task_UseItem_OutwardSpiralDots(u8 taskId)
 static u16 PSAScene_RandomFromTask(u8 taskId)
 {
     u32 state = GetWordTaskArg(taskId, tOff_RngState);
-    state = state * 1103515245 + 24691;
+    state = ISO_RANDOMIZE1(state);
     SetWordTaskArg(taskId, tOff_RngState, state);
     return state >> 16;
 }
@@ -1441,8 +1442,7 @@ static void CreateLevelUpVerticalSprite(u8 taskId, s16 *data)
     {
         gSprites[spriteId].oam.priority = tPriority;
         gSprites[spriteId].tsYsubpixel = 0;
-        // similar to the LCRNG in random.c, but seeding from data[2]
+        gSprites[spriteId].tsSpeed = (ISO_RANDOMIZE1(tMadeSprCt) & 0x3F) + 0x20;
-        gSprites[spriteId].tsSpeed = ((tMadeSprCt * 1103515245 + 24691) & 0x3F) + 0x20;
         gSprites[spriteId].tsTaskId = taskId;
         tActiveSprCt++;
     }

src/title_screen.c

@@ -9,6 +9,7 @@
 #include "intro.h"
 #include "load_save.h"
 #include "new_game.h"
+#include "random.h"
 #include "save.h"
 #include "main_menu.h"
 #include "clear_save_data_screen.h"
@@ -662,7 +663,7 @@ static void SetTitleScreenScene_Restart(s16 * data)
     case 4:
         HelpSystem_Disable();
         DestroyTask(FindTaskIdByFunc(Task_TitleScreenMain));
-        SetMainCallback2(CB2_CopyrightScreen);
+        SetMainCallback2(CB2_InitCopyrightScreenAfterTitleScreen);
         break;
     }
 }
@@ -1121,7 +1122,7 @@ static u16 TitleScreen_rand(u8 taskId, u8 field)
     u32 rngval;
 
     rngval = GetWordTaskArg(taskId, field);
-    rngval = rngval * 1103515245 + 24691;
+    rngval = ISO_RANDOMIZE1(rngval);
     SetWordTaskArg(taskId, field, rngval);
     return rngval >> 16;
 }

src/wild_encounter.c

@@ -3,6 +3,7 @@
 #include "wild_encounter.h"
 #include "event_data.h"
 #include "fieldmap.h"
+#include "random.h"
 #include "roamer.h"
 #include "field_player_avatar.h"
 #include "battle_setup.h"
@@ -668,8 +669,7 @@ void SeedWildEncounterRng(u16 seed)
 
 static u16 WildEncounterRandom(void)
 {
-    sWildEncounterData.rngState *= 1103515245;
+    sWildEncounterData.rngState = ISO_RANDOMIZE2(sWildEncounterData.rngState);
-    sWildEncounterData.rngState += 12345;
     return sWildEncounterData.rngState >> 16;
 }