Merge branch 'master' of github.com:pret/pokefirered into various_documentation
This commit is contained in:
PikalaxALT
@@ -8,7 +8,7 @@
|
||||
#include "money.h"
|
||||
#include "strings.h"
|
||||
|
||||
static const u16 sBagWindowPalF[] = INCBIN_U16("data/bag/bag_window_pal.gbapal");
|
||||
static const u16 sBagWindowPalF[] = INCBIN_U16("graphics/item_menu/bag_window_pal.gbapal");
|
||||
|
||||
static const u8 sTextColors[][3] = {
|
||||
{0, 1, 2},
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
extern u8 gGlyphInfo[];
|
||||
|
||||
static const u8 gUnknown_846FB08[] = {1, 2, 4};
|
||||
static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
|
||||
static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("graphics/fonts/font6.fwjpnfont");
|
||||
|
||||
static void DecompressGlyphFont6(u16);
|
||||
|
||||
|
||||
+27
-27
@@ -337,24 +337,24 @@ static const struct WindowTemplate sWindowTemplates_Pikachu[] = {
|
||||
}, DUMMY_WIN_TEMPLATE
|
||||
};
|
||||
|
||||
static const u16 sPalette_OneBlackThenAllWhite[] = INCBIN_U16("data/credits/unk_840C630.gbapal");
|
||||
static const u32 sAffineCircleGfx[] = INCBIN_U32("data/credits/unk_840C650.8bpp.lz");
|
||||
static const u32 sAffineCircleMap[] = INCBIN_U32("data/credits/unk_840CA54.bin.lz");
|
||||
static const u32 sWindow1Map_Charizard[] = INCBIN_U32("data/credits/unk_840CB8C.bin.lz");
|
||||
static const u32 sWindow2Map_Charizard[] = INCBIN_U32("data/credits/unk_840D228.bin.lz");
|
||||
static const u32 sUnusedTilemap[] = INCBIN_U32("data/credits/unk_840DC0C.bin.lz");
|
||||
static const u32 sWindow1Map_Venusaur[] = INCBIN_U32("data/credits/unk_840E158.bin.lz");
|
||||
static const u32 sWindow2Map_Venusaur[] = INCBIN_U32("data/credits/unk_840E904.bin.lz");
|
||||
static const u32 sWindow1Map_Blastoise[] = INCBIN_U32("data/credits/unk_840F240.bin.lz");
|
||||
static const u32 sWindow2Map_Blastoise[] = INCBIN_U32("data/credits/unk_840F944.bin.lz");
|
||||
static const u32 sWindow1Map_Pikachu[] = INCBIN_U32("data/credits/unk_8410198.bin.lz");
|
||||
static const u32 sWindow2Map_Pikachu[] = INCBIN_U32("data/credits/unk_84105B4.bin.lz");
|
||||
static const u16 sPalette_OneBlackThenAllWhite[] = INCBIN_U16("graphics/credits/unk_840C630.gbapal");
|
||||
static const u32 sAffineCircleGfx[] = INCBIN_U32("graphics/credits/unk_840C650.8bpp.lz");
|
||||
static const u32 sAffineCircleMap[] = INCBIN_U32("graphics/credits/unk_840CA54.bin.lz");
|
||||
static const u32 sWindow1Map_Charizard[] = INCBIN_U32("graphics/credits/unk_840CB8C.bin.lz");
|
||||
static const u32 sWindow2Map_Charizard[] = INCBIN_U32("graphics/credits/unk_840D228.bin.lz");
|
||||
static const u32 sUnusedTilemap[] = INCBIN_U32("graphics/credits/unk_840DC0C.bin.lz");
|
||||
static const u32 sWindow1Map_Venusaur[] = INCBIN_U32("graphics/credits/unk_840E158.bin.lz");
|
||||
static const u32 sWindow2Map_Venusaur[] = INCBIN_U32("graphics/credits/unk_840E904.bin.lz");
|
||||
static const u32 sWindow1Map_Blastoise[] = INCBIN_U32("graphics/credits/unk_840F240.bin.lz");
|
||||
static const u32 sWindow2Map_Blastoise[] = INCBIN_U32("graphics/credits/unk_840F944.bin.lz");
|
||||
static const u32 sWindow1Map_Pikachu[] = INCBIN_U32("graphics/credits/unk_8410198.bin.lz");
|
||||
static const u32 sWindow2Map_Pikachu[] = INCBIN_U32("graphics/credits/unk_84105B4.bin.lz");
|
||||
|
||||
static const u32 filler_8410AFC = 0xF0;
|
||||
|
||||
static const u16 sTheEndGfxPal[] = INCBIN_U16("data/credits/unk_8410B20.gbapal");
|
||||
static const u8 sTheEndGfxTiles[] = INCBIN_U8("data/credits/unk_8410B20.4bpp.lz");
|
||||
static const u8 sTheEndGfxMap[] = INCBIN_U8("data/credits/unk_8410B20.bin.lz");
|
||||
static const u16 sTheEndGfxPal[] = INCBIN_U16("graphics/credits/unk_8410B20.gbapal");
|
||||
static const u8 sTheEndGfxTiles[] = INCBIN_U8("graphics/credits/unk_8410B20.4bpp.lz");
|
||||
static const u8 sTheEndGfxMap[] = INCBIN_U8("graphics/credits/unk_8410B20.bin.lz");
|
||||
|
||||
static const struct CompressedGraphicsHeader sCopyrightOrTheEndGfxHeaders[] = {
|
||||
{
|
||||
@@ -458,18 +458,18 @@ static const struct WindowTemplate sCreditsWindowTemplate = {
|
||||
.baseBlock = 0x008
|
||||
};
|
||||
|
||||
static const u16 sMalePlayerSpritePal[] = INCBIN_U16("data/credits/unk_8410E10.gbapal");
|
||||
static const u32 sMalePlayerSpriteGfx[] = INCBIN_U32("data/credits/unk_8410E30.4bpp.lz");
|
||||
static const u16 sFemalePlayerSpritePal[] = INCBIN_U16("data/credits/unk_8411BF8.gbapal");
|
||||
static const u32 sFemalePlayerSpriteGfx[] = INCBIN_U32("data/credits/unk_8411C18.4bpp.lz");
|
||||
static const u16 sRivalSpritePal[] = INCBIN_U16("data/credits/unk_84129A0.gbapal");
|
||||
static const u32 sRivalSpriteGfx[] = INCBIN_U32("data/credits/unk_84129C0.4bpp.lz");
|
||||
static const u16 sGroundSpritePal_Grass[] = INCBIN_U16("data/credits/unk_8413318.gbapal");
|
||||
static const u32 sGroundSpriteGfx_Grass[] = INCBIN_U32("data/credits/unk_8413338.4bpp.lz");
|
||||
static const u16 sGroundSpritePal_Dirt[] = INCBIN_U16("data/credits/unk_8413854.gbapal");
|
||||
static const u32 sGroundSpriteGfx_Dirt[] = INCBIN_U32("data/credits/unk_8413874.4bpp.lz");
|
||||
static const u16 sGroundSpritePal_City[] = INCBIN_U16("data/credits/unk_8413D98.gbapal");
|
||||
static const u32 sGroundSpriteGfx_City[] = INCBIN_U32("data/credits/unk_8413DB8.4bpp.lz");
|
||||
static const u16 sMalePlayerSpritePal[] = INCBIN_U16("graphics/credits/unk_8410E10.gbapal");
|
||||
static const u32 sMalePlayerSpriteGfx[] = INCBIN_U32("graphics/credits/unk_8410E30.4bpp.lz");
|
||||
static const u16 sFemalePlayerSpritePal[] = INCBIN_U16("graphics/credits/unk_8411BF8.gbapal");
|
||||
static const u32 sFemalePlayerSpriteGfx[] = INCBIN_U32("graphics/credits/unk_8411C18.4bpp.lz");
|
||||
static const u16 sRivalSpritePal[] = INCBIN_U16("graphics/credits/unk_84129A0.gbapal");
|
||||
static const u32 sRivalSpriteGfx[] = INCBIN_U32("graphics/credits/unk_84129C0.4bpp.lz");
|
||||
static const u16 sGroundSpritePal_Grass[] = INCBIN_U16("graphics/credits/unk_8413318.gbapal");
|
||||
static const u32 sGroundSpriteGfx_Grass[] = INCBIN_U32("graphics/credits/unk_8413338.4bpp.lz");
|
||||
static const u16 sGroundSpritePal_Dirt[] = INCBIN_U16("graphics/credits/unk_8413854.gbapal");
|
||||
static const u32 sGroundSpriteGfx_Dirt[] = INCBIN_U32("graphics/credits/unk_8413874.4bpp.lz");
|
||||
static const u16 sGroundSpritePal_City[] = INCBIN_U16("graphics/credits/unk_8413D98.gbapal");
|
||||
static const u32 sGroundSpriteGfx_City[] = INCBIN_U32("graphics/credits/unk_8413DB8.4bpp.lz");
|
||||
|
||||
static const u16 sPlayerRivalSpriteParams[][3] = {
|
||||
{ 0, 3, 1 },
|
||||
|
||||
+16
-16
@@ -125,22 +125,22 @@ static void Task_FCOpenOrCloseInfoBox(u8 taskId);
|
||||
static void UpdateInfoBoxTilemap(u8 bg, s16 state);
|
||||
static void PlaceListMenuCursor(bool8 isActive);
|
||||
|
||||
static const u16 sFameCheckerTilemap[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin");
|
||||
static const u8 sQuestionMarkSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp");
|
||||
static const u8 sSpinningPokeballSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845cf00.4bpp");
|
||||
static const u16 sSpinningPokeballSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845d0e0.gbapal");
|
||||
static const u8 sSelectorCursorSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845d100.4bpp");
|
||||
static const u16 sSelectorCursorSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845d500.gbapal");
|
||||
static const u8 sFujiSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845d520.4bpp");
|
||||
static const u16 sFujiSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845dd20.gbapal");
|
||||
static const u8 sBillSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845dd40.4bpp");
|
||||
static const u16 sBillSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845e540.gbapal");
|
||||
static const u8 sDaisySpriteGfx[] = INCBIN_U8("data/fame_checker/img_845e560.4bpp");
|
||||
static const u16 sDaisySpritePalette[] = INCBIN_U16("data/fame_checker/pal_845ed60.gbapal");
|
||||
static const u8 sOakSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ed80.4bpp");
|
||||
static const u16 sOakSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal");
|
||||
static const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); // unused?
|
||||
static const u16 sSilhouettePalette[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal");
|
||||
static const u16 sFameCheckerTilemap[] = INCBIN_U16("graphics/fame_checker/tilemap1.bin");
|
||||
static const u8 sQuestionMarkSpriteGfx[] = INCBIN_U8("graphics/fame_checker/question_mark.4bpp");
|
||||
static const u8 sSpinningPokeballSpriteGfx[] = INCBIN_U8("graphics/fame_checker/spinning_pokeball.4bpp");
|
||||
static const u16 sSpinningPokeballSpritePalette[] = INCBIN_U16("graphics/fame_checker/spinning_pokeball.gbapal");
|
||||
static const u8 sSelectorCursorSpriteGfx[] = INCBIN_U8("graphics/fame_checker/cursor.4bpp");
|
||||
static const u16 sSelectorCursorSpritePalette[] = INCBIN_U16("graphics/fame_checker/cursor.gbapal");
|
||||
static const u8 sFujiSpriteGfx[] = INCBIN_U8("graphics/fame_checker/mr_fuji.4bpp");
|
||||
static const u16 sFujiSpritePalette[] = INCBIN_U16("graphics/fame_checker/mr_fuji.gbapal");
|
||||
static const u8 sBillSpriteGfx[] = INCBIN_U8("graphics/fame_checker/bill.4bpp");
|
||||
static const u16 sBillSpritePalette[] = INCBIN_U16("graphics/fame_checker/bill.gbapal");
|
||||
static const u8 sDaisySpriteGfx[] = INCBIN_U8("graphics/fame_checker/daisy.4bpp");
|
||||
static const u16 sDaisySpritePalette[] = INCBIN_U16("graphics/fame_checker/daisy.gbapal");
|
||||
static const u8 sOakSpriteGfx[] = INCBIN_U8("graphics/fame_checker/prof_oak.4bpp");
|
||||
static const u16 sOakSpritePalette[] = INCBIN_U16("graphics/fame_checker/prof_oak.gbapal");
|
||||
static const u16 sUnkPalette[] = INCBIN_U16("graphics/fame_checker/unk.gbapal"); // unused?
|
||||
static const u16 sSilhouettePalette[] = INCBIN_U16("graphics/fame_checker/silhouette.gbapal");
|
||||
|
||||
static const u8 sTextColor_White[3] = {0, 1, 2};
|
||||
static const u8 sTextColor_DkGrey[3] = {0, 2, 3};
|
||||
|
||||
+32
-32
@@ -2075,30 +2075,30 @@ void DaisyMassageServices(void)
|
||||
}
|
||||
|
||||
static const u16 sEliteFourLightingPalettes[][16] = {
|
||||
INCBIN_U16("data/field_specials/unk_83F5F50.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F5F70.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F5F90.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F5FB0.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F5FD0.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F5FF0.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6010.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6030.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6050.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6070.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6090.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F60B0.gbapal")
|
||||
INCBIN_U16("graphics/field_specials/unk_83F5F50.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F5F70.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F5F90.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F5FB0.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F5FD0.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F5FF0.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6010.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6030.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6050.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6070.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6090.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F60B0.gbapal")
|
||||
};
|
||||
|
||||
static const u16 sChampionRoomLightingPalettes[][16] = {
|
||||
INCBIN_U16("data/field_specials/unk_83F60D0.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F60F0.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6110.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6130.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6150.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6170.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6190.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F61B0.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F61D0.gbapal")
|
||||
INCBIN_U16("graphics/field_specials/unk_83F60D0.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F60F0.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6110.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6130.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6150.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6170.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6190.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F61B0.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F61D0.gbapal")
|
||||
};
|
||||
|
||||
static const u8 sEliteFourLightingTimers[] = {
|
||||
@@ -2317,17 +2317,17 @@ void CutMoveOpenDottedHoleDoor(void)
|
||||
}
|
||||
|
||||
static const u16 sDeoxysObjectPals[][16] = {
|
||||
INCBIN_U16("data/field_specials/unk_83F6206.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6226.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6246.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6266.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6286.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F62A6.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F62C6.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F62E6.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6306.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6326.gbapal"),
|
||||
INCBIN_U16("data/field_specials/unk_83F6346.gbapal")
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6206.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6226.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6246.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6266.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6286.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F62A6.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F62C6.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F62E6.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6306.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6326.gbapal"),
|
||||
INCBIN_U16("graphics/field_specials/unk_83F6346.gbapal")
|
||||
};
|
||||
|
||||
static const u8 sDeoxysCoords[][2] = {
|
||||
|
||||
+4
-4
@@ -1265,10 +1265,10 @@ const u16 gUnknown_8E9E9DC[] = INCBIN_U16("graphics/unused/unused_DDCEE4.bin");
|
||||
const u16 gUnknown_8E9E9FC[] = INCBIN_U16("graphics/trade/unknown_DDCF04.bin");
|
||||
const u16 gTradeMenuMonBox_Tilemap[] = INCBIN_U16("graphics/trade/menu_mon_box.bin");
|
||||
|
||||
const u16 gFameCheckerBgPals[] = INCBIN_U16("data/graphics/fame_checker_bg.gbapal");
|
||||
const u16 gFameCheckerBgTiles[] = INCBIN_U16("data/graphics/fame_checker_bg.4bpp");
|
||||
const u16 gFameCheckerBg3Tilemap[] = INCBIN_U16("data/graphics/fame_checker_tilemap3.bin");
|
||||
const u16 gFameCheckerBg2Tilemap[] = INCBIN_U16("data/graphics/fame_checker_tilemap2.bin");
|
||||
const u16 gFameCheckerBgPals[] = INCBIN_U16("graphics/fame_checker/bg.gbapal");
|
||||
const u16 gFameCheckerBgTiles[] = INCBIN_U16("graphics/fame_checker/bg.4bpp");
|
||||
const u16 gFameCheckerBg3Tilemap[] = INCBIN_U16("graphics/fame_checker/tilemap3.bin");
|
||||
const u16 gFameCheckerBg2Tilemap[] = INCBIN_U16("graphics/fame_checker/tilemap2.bin");
|
||||
|
||||
const u16 gLinkMiscMenu_Pal[] = INCBIN_U16("graphics/interface/union_room_chat.gbapal");
|
||||
const u32 gLinkMiscMenu_Gfx[] = INCBIN_U32("graphics/interface/union_room_chat.4bpp.lz");
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
static EWRAM_DATA u8 sHelpMessageWindowId = 0;
|
||||
|
||||
const u16 gUnknown_84566A8[] = INCBIN_U16("data/graphics/unknown_84566a8.bin");
|
||||
const u16 gUnknown_84566A8[] = INCBIN_U16("graphics/unknown/unknown_84566a8.bin");
|
||||
|
||||
static const struct WindowTemplate sHelpMessageWindowTemplate = {
|
||||
.bg = 0,
|
||||
|
||||
+1
-1
@@ -36,7 +36,7 @@ static void SpriteCallback_DestroyStar(struct Sprite * sprite);
|
||||
|
||||
#define ARROW_TILE_TAG 2000
|
||||
|
||||
static const u16 sArrowAndStarSpriteTiles[] = INCBIN_U16("data/itemfinder/spr_tiles.4bpp");
|
||||
static const u16 sArrowAndStarSpriteTiles[] = INCBIN_U16("graphics/itemfinder/spr_tiles.4bpp");
|
||||
|
||||
static const union AnimCmd sArrowAnim0[] = {
|
||||
ANIMCMD_FRAME( 0, 10),
|
||||
|
||||
+2
-2
@@ -127,8 +127,8 @@ static const struct WindowTemplate sWindowTemplate[] = {
|
||||
[MAIN_MENU_WINDOW_COUNT] = DUMMY_WIN_TEMPLATE
|
||||
};
|
||||
|
||||
static const u16 sBgPal00[] = INCBIN_U16("data/main_menu/unk_8234648.gbapal");
|
||||
static const u16 sBgPal15[] = INCBIN_U16("data/main_menu/unk_8234668.gbapal");
|
||||
static const u16 sBgPal00[] = INCBIN_U16("graphics/main_menu/unk_8234648.gbapal");
|
||||
static const u16 sBgPal15[] = INCBIN_U16("graphics/main_menu/unk_8234668.gbapal");
|
||||
|
||||
static const u8 sTextColor1[] = { 10, 11, 12 };
|
||||
|
||||
|
||||
+147
-147
@@ -21,294 +21,294 @@ static EWRAM_DATA bool8 sAllocedBg0TilemapBuffer = FALSE;
|
||||
|
||||
static void Task_RunMapPreviewScreenForest(u8 taskId);
|
||||
|
||||
static const u8 gViridianForestMapPreviewPalette[] = INCBIN_U8("data/map_preview/viridian_forest_pal.gbapal");
|
||||
static const u8 gViridianForestMapPreviewTiles[] = INCBIN_U8("data/map_preview/viridian_forest_tiles.4bpp.lz");
|
||||
static const u8 gViridianForestMapPreviewTilemap[] = INCBIN_U8("data/map_preview/viridian_forest_tilemap.bin");
|
||||
static const u8 gRockTunnelMapPreviewPalette[] = INCBIN_U8("data/map_preview/rock_tunnel_pal.gbapal");
|
||||
static const u8 gRockTunnelMapPreviewTiles[] = INCBIN_U8("data/map_preview/rock_tunnel_tiles.4bpp.lz");
|
||||
static const u8 gRockTunnelMapPreviewTilemap[] = INCBIN_U8("data/map_preview/rock_tunnel_tilemap.bin");
|
||||
static const u8 gRocketHideoutMapPreviewPalette[] = INCBIN_U8("data/map_preview/rocket_hideout_pal.gbapal");
|
||||
static const u8 gRocketHideoutMapPreviewTiles[] = INCBIN_U8("data/map_preview/rocket_hideout_tiles.4bpp.lz");
|
||||
static const u8 gRocketHideoutMapPreviewTilemap[] = INCBIN_U8("data/map_preview/rocket_hideout_tilemap.bin");
|
||||
static const u8 gPowerPlantMapPreviewPalette[] = INCBIN_U8("data/map_preview/power_plant_pal.gbapal");
|
||||
static const u8 gPowerPlantMapPreviewTiles[] = INCBIN_U8("data/map_preview/power_plant_tiles.4bpp.lz");
|
||||
static const u8 gPowerPlantMapPreviewTilemap[] = INCBIN_U8("data/map_preview/power_plant_tilemap.bin");
|
||||
static const u8 gPokemonMansionMapPreviewPalette[] = INCBIN_U8("data/map_preview/pokemon_mansion_pal.gbapal");
|
||||
static const u8 gPokemonMansionMapPreviewTiles[] = INCBIN_U8("data/map_preview/pokemon_mansion_tiles.4bpp.lz");
|
||||
static const u8 gPokemonMansionMapPreviewTilemap[] = INCBIN_U8("data/map_preview/pokemon_mansion_tilemap.bin");
|
||||
static const u8 gPokemonTowerMapPreviewPalette[] = INCBIN_U8("data/map_preview/pokemon_tower_pal.gbapal");
|
||||
static const u8 gPokemonTowerMapPreviewTiles[] = INCBIN_U8("data/map_preview/pokemon_tower_tiles.4bpp.lz");
|
||||
static const u8 gPokemonTowerMapPreviewTilemap[] = INCBIN_U8("data/map_preview/pokemon_tower_tilemap.bin");
|
||||
static const u8 gSilphCoMapPreviewPalette[] = INCBIN_U8("data/map_preview/silph_co_pal.gbapal");
|
||||
static const u8 gSilphCoMapPreviewTiles[] = INCBIN_U8("data/map_preview/silph_co_tiles.4bpp.lz");
|
||||
static const u8 gSilphCoMapPreviewTilemap[] = INCBIN_U8("data/map_preview/silph_co_tilemap.bin");
|
||||
static const u8 gMtMoonMapPreviewPalette[] = INCBIN_U8("data/map_preview/mt_moon_pal.gbapal");
|
||||
static const u8 gMtMoonMapPreviewTiles[] = INCBIN_U8("data/map_preview/mt_moon_tiles.4bpp.lz");
|
||||
static const u8 gMtMoonMapPreviewTilemap[] = INCBIN_U8("data/map_preview/mt_moon_tilemap.bin");
|
||||
static const u8 gSeafoamIslandsMapPreviewPalette[] = INCBIN_U8("data/map_preview/seafoam_islands_pal.gbapal");
|
||||
static const u8 gSeafoamIslandsMapPreviewTiles[] = INCBIN_U8("data/map_preview/seafoam_islands_tiles.4bpp.lz");
|
||||
static const u8 gSeafoamIslandsMapPreviewTilemap[] = INCBIN_U8("data/map_preview/seafoam_islands_tilemap.bin");
|
||||
static const u8 gRocketWarehouseMapPreviewPalette[] = INCBIN_U8("data/map_preview/rocket_warehouse_pal.gbapal");
|
||||
static const u8 gRocketWarehouseMapPreviewTiles[] = INCBIN_U8("data/map_preview/rocket_warehouse_tiles.4bpp.lz");
|
||||
static const u8 gRocketWarehouseMapPreviewTilemap[] = INCBIN_U8("data/map_preview/rocket_warehouse_tilemap.bin");
|
||||
static const u8 gKantoVictoryRoadMapPreviewPalette[] = INCBIN_U8("data/map_preview/kanto_victory_road_pal.gbapal");
|
||||
static const u8 gKantoVictoryRoadMapPreviewTiles[] = INCBIN_U8("data/map_preview/kanto_victory_road_tiles.4bpp.lz");
|
||||
static const u8 gKantoVictoryRoadMapPreviewTilemap[] = INCBIN_U8("data/map_preview/kanto_victory_road_tilemap.bin");
|
||||
static const u8 gMtEmberMapPreviewPalette[] = INCBIN_U8("data/map_preview/mt_ember_pal.gbapal");
|
||||
static const u8 gMtEmberMapPreviewTiles[] = INCBIN_U8("data/map_preview/mt_ember_tiles.4bpp.lz");
|
||||
static const u8 gMtEmberMapPreviewTilemap[] = INCBIN_U8("data/map_preview/mt_ember_tilemap.bin");
|
||||
static const u8 gKantoSafariZoneMapPreviewPalette[] = INCBIN_U8("data/map_preview/kanto_safari_zone_pal.gbapal");
|
||||
static const u8 gKantoSafariZoneMapPreviewTiles[] = INCBIN_U8("data/map_preview/kanto_safari_zone_tiles.4bpp.lz");
|
||||
static const u8 gKantoSafariZoneMapPreviewTilemap[] = INCBIN_U8("data/map_preview/kanto_safari_zone_tilemap.bin");
|
||||
static const u8 gMoneanChamberMapPreviewPalette[] = INCBIN_U8("data/map_preview/monean_chamber_pal.gbapal");
|
||||
static const u8 gMoneanChamberMapPreviewTiles[] = INCBIN_U8("data/map_preview/monean_chamber_tiles.4bpp.lz");
|
||||
static const u8 gMoneanChamberMapPreviewTilemap[] = INCBIN_U8("data/map_preview/monean_chamber_tilemap.bin");
|
||||
static const u8 gDottedHoleMapPreviewPalette[] = INCBIN_U8("data/map_preview/dotted_hole_pal.gbapal");
|
||||
static const u8 gDottedHoleMapPreviewTiles[] = INCBIN_U8("data/map_preview/dotted_hole_tiles.4bpp.lz");
|
||||
static const u8 gDottedHoleMapPreviewTilemap[] = INCBIN_U8("data/map_preview/dotted_hole_tilemap.bin");
|
||||
static const u8 gCeruleanCaveMapPreviewPalette[] = INCBIN_U8("data/map_preview/cerulean_cave_pal.gbapal");
|
||||
static const u8 gCeruleanCaveMapPreviewTiles[] = INCBIN_U8("data/map_preview/cerulean_cave_tiles.4bpp.lz");
|
||||
static const u8 gCeruleanCaveMapPreviewTilemap[] = INCBIN_U8("data/map_preview/cerulean_cave_tilemap.bin");
|
||||
static const u8 gDiglettsCaveMapPreviewPalette[] = INCBIN_U8("data/map_preview/digletts_cave_pal.gbapal");
|
||||
static const u8 gDiglettsCaveMapPreviewTiles[] = INCBIN_U8("data/map_preview/digletts_cave_tiles.4bpp.lz");
|
||||
static const u8 gDiglettsCaveMapPreviewTilemap[] = INCBIN_U8("data/map_preview/digletts_cave_tilemap.bin");
|
||||
static const u8 gLostCaveMapPreviewPalette[] = INCBIN_U8("data/map_preview/lost_cave_pal.gbapal");
|
||||
static const u8 gLostCaveMapPreviewTiles[] = INCBIN_U8("data/map_preview/lost_cave_tiles.4bpp.lz");
|
||||
static const u8 gLostCaveMapPreviewTilemap[] = INCBIN_U8("data/map_preview/lost_cave_tilemap.bin");
|
||||
static const u8 gBerryForestMapPreviewPalette[] = INCBIN_U8("data/map_preview/berry_forest_pal.gbapal");
|
||||
static const u8 gBerryForestMapPreviewTiles[] = INCBIN_U8("data/map_preview/berry_forest_tiles.4bpp.lz");
|
||||
static const u8 gBerryForestMapPreviewTilemap[] = INCBIN_U8("data/map_preview/berry_forest_tilemap.bin");
|
||||
static const u8 gIcefallCaveMapPreviewPalette[] = INCBIN_U8("data/map_preview/icefall_cave_pal.gbapal");
|
||||
static const u8 gIcefallCaveMapPreviewTiles[] = INCBIN_U8("data/map_preview/icefall_cave_tiles.4bpp.lz");
|
||||
static const u8 gIcefallCaveMapPreviewTilemap[] = INCBIN_U8("data/map_preview/icefall_cave_tilemap.bin");
|
||||
static const u8 gAlteringCaveMapPreviewPalette[] = INCBIN_U8("data/map_preview/altering_cave_pal.gbapal");
|
||||
static const u8 gAlteringCaveMapPreviewTiles[] = INCBIN_U8("data/map_preview/altering_cave_tiles.4bpp.lz");
|
||||
static const u8 gAlteringCaveMapPreviewTilemap[] = INCBIN_U8("data/map_preview/altering_cave_tilemap.bin");
|
||||
static const u8 sViridianForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/viridian_forest_pal.gbapal");
|
||||
static const u8 sViridianForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/viridian_forest_tiles.4bpp.lz");
|
||||
static const u8 sViridianForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/viridian_forest_tilemap.bin");
|
||||
static const u8 sRockTunnelMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rock_tunnel_pal.gbapal");
|
||||
static const u8 sRockTunnelMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rock_tunnel_tiles.4bpp.lz");
|
||||
static const u8 sRockTunnelMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rock_tunnel_tilemap.bin");
|
||||
static const u8 sRocketHideoutMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_hideout_pal.gbapal");
|
||||
static const u8 sRocketHideoutMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_hideout_tiles.4bpp.lz");
|
||||
static const u8 sRocketHideoutMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_hideout_tilemap.bin");
|
||||
static const u8 sPowerPlantMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/power_plant_pal.gbapal");
|
||||
static const u8 sPowerPlantMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/power_plant_tiles.4bpp.lz");
|
||||
static const u8 sPowerPlantMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/power_plant_tilemap.bin");
|
||||
static const u8 sPokemonMansionMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_pal.gbapal");
|
||||
static const u8 sPokemonMansionMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_tiles.4bpp.lz");
|
||||
static const u8 sPokemonMansionMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_mansion_tilemap.bin");
|
||||
static const u8 sPokemonTowerMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_tower_pal.gbapal");
|
||||
static const u8 sPokemonTowerMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_tower_tiles.4bpp.lz");
|
||||
static const u8 sPokemonTowerMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_tower_tilemap.bin");
|
||||
static const u8 sSilphCoMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/silph_co_pal.gbapal");
|
||||
static const u8 sSilphCoMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/silph_co_tiles.4bpp.lz");
|
||||
static const u8 sSilphCoMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/silph_co_tilemap.bin");
|
||||
static const u8 sMtMoonMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_moon_pal.gbapal");
|
||||
static const u8 sMtMoonMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_moon_tiles.4bpp.lz");
|
||||
static const u8 sMtMoonMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_moon_tilemap.bin");
|
||||
static const u8 sSeafoamIslandsMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/seafoam_islands_pal.gbapal");
|
||||
static const u8 sSeafoamIslandsMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/seafoam_islands_tiles.4bpp.lz");
|
||||
static const u8 sSeafoamIslandsMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/seafoam_islands_tilemap.bin");
|
||||
static const u8 sRocketWarehouseMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_pal.gbapal");
|
||||
static const u8 sRocketWarehouseMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_tiles.4bpp.lz");
|
||||
static const u8 sRocketWarehouseMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_warehouse_tilemap.bin");
|
||||
static const u8 sKantoVictoryRoadMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_pal.gbapal");
|
||||
static const u8 sKantoVictoryRoadMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_tiles.4bpp.lz");
|
||||
static const u8 sKantoVictoryRoadMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/kanto_victory_road_tilemap.bin");
|
||||
static const u8 sMtEmberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_ember_pal.gbapal");
|
||||
static const u8 sMtEmberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_ember_tiles.4bpp.lz");
|
||||
static const u8 sMtEmberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_ember_tilemap.bin");
|
||||
static const u8 sKantoSafariZoneMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_pal.gbapal");
|
||||
static const u8 sKantoSafariZoneMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_tiles.4bpp.lz");
|
||||
static const u8 sKantoSafariZoneMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/kanto_safari_zone_tilemap.bin");
|
||||
static const u8 sMoneanChamberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/monean_chamber_pal.gbapal");
|
||||
static const u8 sMoneanChamberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/monean_chamber_tiles.4bpp.lz");
|
||||
static const u8 sMoneanChamberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/monean_chamber_tilemap.bin");
|
||||
static const u8 sDottedHoleMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/dotted_hole_pal.gbapal");
|
||||
static const u8 sDottedHoleMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/dotted_hole_tiles.4bpp.lz");
|
||||
static const u8 sDottedHoleMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/dotted_hole_tilemap.bin");
|
||||
static const u8 sCeruleanCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/cerulean_cave_pal.gbapal");
|
||||
static const u8 sCeruleanCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/cerulean_cave_tiles.4bpp.lz");
|
||||
static const u8 sCeruleanCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/cerulean_cave_tilemap.bin");
|
||||
static const u8 sDiglettsCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/digletts_cave_pal.gbapal");
|
||||
static const u8 sDiglettsCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/digletts_cave_tiles.4bpp.lz");
|
||||
static const u8 sDiglettsCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/digletts_cave_tilemap.bin");
|
||||
static const u8 sLostCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/lost_cave_pal.gbapal");
|
||||
static const u8 sLostCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/lost_cave_tiles.4bpp.lz");
|
||||
static const u8 sLostCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/lost_cave_tilemap.bin");
|
||||
static const u8 sBerryForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/berry_forest_pal.gbapal");
|
||||
static const u8 sBerryForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/berry_forest_tiles.4bpp.lz");
|
||||
static const u8 sBerryForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/berry_forest_tilemap.bin");
|
||||
static const u8 sIcefallCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/icefall_cave_pal.gbapal");
|
||||
static const u8 sIcefallCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/icefall_cave_tiles.4bpp.lz");
|
||||
static const u8 sIcefallCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/icefall_cave_tilemap.bin");
|
||||
static const u8 sAlteringCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/altering_cave_pal.gbapal");
|
||||
static const u8 sAlteringCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/altering_cave_tiles.4bpp.lz");
|
||||
static const u8 sAlteringCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/altering_cave_tilemap.bin");
|
||||
|
||||
static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
|
||||
[MPS_VIRIDIAN_FOREST] = {
|
||||
.mapsec = MAPSEC_VIRIDIAN_FOREST,
|
||||
.type = MPS_TYPE_FOREST,
|
||||
.flagId = FLAG_WORLD_MAP_VIRIDIAN_FOREST,
|
||||
.tilesptr = gViridianForestMapPreviewTiles,
|
||||
.tilemapptr = gViridianForestMapPreviewTilemap,
|
||||
.palptr = gViridianForestMapPreviewPalette
|
||||
.tilesptr = sViridianForestMapPreviewTiles,
|
||||
.tilemapptr = sViridianForestMapPreviewTilemap,
|
||||
.palptr = sViridianForestMapPreviewPalette
|
||||
},
|
||||
[MPS_MT_MOON] = {
|
||||
.mapsec = MAPSEC_MT_MOON,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_MT_MOON_1F,
|
||||
.tilesptr = gMtMoonMapPreviewTiles,
|
||||
.tilemapptr = gMtMoonMapPreviewTilemap,
|
||||
.palptr = gMtMoonMapPreviewPalette
|
||||
.tilesptr = sMtMoonMapPreviewTiles,
|
||||
.tilemapptr = sMtMoonMapPreviewTilemap,
|
||||
.palptr = sMtMoonMapPreviewPalette
|
||||
},
|
||||
[MPS_DIGLETTS_CAVE] = {
|
||||
.mapsec = MAPSEC_DIGLETTS_CAVE,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F,
|
||||
.tilesptr = gDiglettsCaveMapPreviewTiles,
|
||||
.tilemapptr = gDiglettsCaveMapPreviewTilemap,
|
||||
.palptr = gDiglettsCaveMapPreviewPalette
|
||||
.tilesptr = sDiglettsCaveMapPreviewTiles,
|
||||
.tilemapptr = sDiglettsCaveMapPreviewTilemap,
|
||||
.palptr = sDiglettsCaveMapPreviewPalette
|
||||
},
|
||||
[MPS_ROCK_TUNNEL] = {
|
||||
.mapsec = MAPSEC_ROCK_TUNNEL,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_ROCK_TUNNEL_1F,
|
||||
.tilesptr = gRockTunnelMapPreviewTiles,
|
||||
.tilemapptr = gRockTunnelMapPreviewTilemap,
|
||||
.palptr = gRockTunnelMapPreviewPalette
|
||||
.tilesptr = sRockTunnelMapPreviewTiles,
|
||||
.tilemapptr = sRockTunnelMapPreviewTilemap,
|
||||
.palptr = sRockTunnelMapPreviewPalette
|
||||
},
|
||||
[MPS_POKEMON_TOWER] = {
|
||||
.mapsec = MAPSEC_POKEMON_TOWER,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_POKEMON_TOWER_1F,
|
||||
.tilesptr = gPokemonTowerMapPreviewTiles,
|
||||
.tilemapptr = gPokemonTowerMapPreviewTilemap,
|
||||
.palptr = gPokemonTowerMapPreviewPalette
|
||||
.tilesptr = sPokemonTowerMapPreviewTiles,
|
||||
.tilemapptr = sPokemonTowerMapPreviewTilemap,
|
||||
.palptr = sPokemonTowerMapPreviewPalette
|
||||
},
|
||||
[MPS_SAFARI_ZONE] = {
|
||||
.mapsec = MAPSEC_KANTO_SAFARI_ZONE,
|
||||
.type = MPS_TYPE_FOREST,
|
||||
.flagId = FLAG_WORLD_MAP_SAFARI_ZONE_CENTER,
|
||||
.tilesptr = gKantoSafariZoneMapPreviewTiles,
|
||||
.tilemapptr = gKantoSafariZoneMapPreviewTilemap,
|
||||
.palptr = gKantoSafariZoneMapPreviewPalette
|
||||
.tilesptr = sKantoSafariZoneMapPreviewTiles,
|
||||
.tilemapptr = sKantoSafariZoneMapPreviewTilemap,
|
||||
.palptr = sKantoSafariZoneMapPreviewPalette
|
||||
},
|
||||
[MPS_SEAFOAM_ISLANDS] = {
|
||||
.mapsec = MAPSEC_SEAFOAM_ISLANDS,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F,
|
||||
.tilesptr = gSeafoamIslandsMapPreviewTiles,
|
||||
.tilemapptr = gSeafoamIslandsMapPreviewTilemap,
|
||||
.palptr = gSeafoamIslandsMapPreviewPalette
|
||||
.tilesptr = sSeafoamIslandsMapPreviewTiles,
|
||||
.tilemapptr = sSeafoamIslandsMapPreviewTilemap,
|
||||
.palptr = sSeafoamIslandsMapPreviewPalette
|
||||
},
|
||||
[MPS_POKEMON_MANSION] = {
|
||||
.mapsec = MAPSEC_POKEMON_MANSION,
|
||||
.type = MPS_TYPE_FOREST,
|
||||
.flagId = FLAG_WORLD_MAP_POKEMON_MANSION_1F,
|
||||
.tilesptr = gPokemonMansionMapPreviewTiles,
|
||||
.tilemapptr = gPokemonMansionMapPreviewTilemap,
|
||||
.palptr = gPokemonMansionMapPreviewPalette
|
||||
.tilesptr = sPokemonMansionMapPreviewTiles,
|
||||
.tilemapptr = sPokemonMansionMapPreviewTilemap,
|
||||
.palptr = sPokemonMansionMapPreviewPalette
|
||||
},
|
||||
[MPS_ROCKET_HIDEOUT] = {
|
||||
.mapsec = MAPSEC_ROCKET_HIDEOUT,
|
||||
.type = MPS_TYPE_FOREST,
|
||||
.flagId = FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F,
|
||||
.tilesptr = gRocketHideoutMapPreviewTiles,
|
||||
.tilemapptr = gRocketHideoutMapPreviewTilemap,
|
||||
.palptr = gRocketHideoutMapPreviewPalette
|
||||
.tilesptr = sRocketHideoutMapPreviewTiles,
|
||||
.tilemapptr = sRocketHideoutMapPreviewTilemap,
|
||||
.palptr = sRocketHideoutMapPreviewPalette
|
||||
},
|
||||
[MPS_SILPH_CO] = {
|
||||
.mapsec = MAPSEC_SILPH_CO,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SILPH_CO_1F,
|
||||
.tilesptr = gSilphCoMapPreviewTiles,
|
||||
.tilemapptr = gSilphCoMapPreviewTilemap,
|
||||
.palptr = gSilphCoMapPreviewPalette
|
||||
.tilesptr = sSilphCoMapPreviewTiles,
|
||||
.tilemapptr = sSilphCoMapPreviewTilemap,
|
||||
.palptr = sSilphCoMapPreviewPalette
|
||||
},
|
||||
[MPS_VICTORY_ROAD] = {
|
||||
.mapsec = MAPSEC_KANTO_VICTORY_ROAD,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_VICTORY_ROAD_1F,
|
||||
.tilesptr = gKantoVictoryRoadMapPreviewTiles,
|
||||
.tilemapptr = gKantoVictoryRoadMapPreviewTilemap,
|
||||
.palptr = gKantoVictoryRoadMapPreviewPalette
|
||||
.tilesptr = sKantoVictoryRoadMapPreviewTiles,
|
||||
.tilemapptr = sKantoVictoryRoadMapPreviewTilemap,
|
||||
.palptr = sKantoVictoryRoadMapPreviewPalette
|
||||
},
|
||||
[MPS_CERULEAN_CAVE] = {
|
||||
.mapsec = MAPSEC_CERULEAN_CAVE,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_CERULEAN_CAVE_1F,
|
||||
.tilesptr = gCeruleanCaveMapPreviewTiles,
|
||||
.tilemapptr = gCeruleanCaveMapPreviewTilemap,
|
||||
.palptr = gCeruleanCaveMapPreviewPalette
|
||||
.tilesptr = sCeruleanCaveMapPreviewTiles,
|
||||
.tilemapptr = sCeruleanCaveMapPreviewTilemap,
|
||||
.palptr = sCeruleanCaveMapPreviewPalette
|
||||
},
|
||||
[MPS_POWER_PLANT] = {
|
||||
.mapsec = MAPSEC_POWER_PLANT,
|
||||
.type = MPS_TYPE_FOREST,
|
||||
.flagId = FLAG_WORLD_MAP_POWER_PLANT,
|
||||
.tilesptr = gPowerPlantMapPreviewTiles,
|
||||
.tilemapptr = gPowerPlantMapPreviewTilemap,
|
||||
.palptr = gPowerPlantMapPreviewPalette
|
||||
.tilesptr = sPowerPlantMapPreviewTiles,
|
||||
.tilemapptr = sPowerPlantMapPreviewTilemap,
|
||||
.palptr = sPowerPlantMapPreviewPalette
|
||||
},
|
||||
[MPS_MT_EMBER] = {
|
||||
.mapsec = MAPSEC_MT_EMBER,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_MT_EMBER_EXTERIOR,
|
||||
.tilesptr = gMtEmberMapPreviewTiles,
|
||||
.tilemapptr = gMtEmberMapPreviewTilemap,
|
||||
.palptr = gMtEmberMapPreviewPalette
|
||||
.tilesptr = sMtEmberMapPreviewTiles,
|
||||
.tilemapptr = sMtEmberMapPreviewTilemap,
|
||||
.palptr = sMtEmberMapPreviewPalette
|
||||
},
|
||||
[MPS_ROCKET_WAREHOUSE] = {
|
||||
.mapsec = MAPSEC_ROCKET_WAREHOUSE,
|
||||
.type = MPS_TYPE_FOREST,
|
||||
.flagId = FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST,
|
||||
.tilesptr = gRocketWarehouseMapPreviewTiles,
|
||||
.tilemapptr = gRocketWarehouseMapPreviewTilemap,
|
||||
.palptr = gRocketWarehouseMapPreviewPalette
|
||||
.tilesptr = sRocketWarehouseMapPreviewTiles,
|
||||
.tilemapptr = sRocketWarehouseMapPreviewTilemap,
|
||||
.palptr = sRocketWarehouseMapPreviewPalette
|
||||
},
|
||||
[MPS_MONEAN_CHAMBER] = {
|
||||
.mapsec = MAPSEC_MONEAN_CHAMBER,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
|
||||
.tilesptr = gMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = gMoneanChamberMapPreviewTilemap,
|
||||
.palptr = gMoneanChamberMapPreviewPalette
|
||||
.tilesptr = sMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = sMoneanChamberMapPreviewTilemap,
|
||||
.palptr = sMoneanChamberMapPreviewPalette
|
||||
},
|
||||
[MPS_DOTTED_HOLE] = {
|
||||
.mapsec = MAPSEC_DOTTED_HOLE,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F,
|
||||
.tilesptr = gDottedHoleMapPreviewTiles,
|
||||
.tilemapptr = gDottedHoleMapPreviewTilemap,
|
||||
.palptr = gDottedHoleMapPreviewPalette
|
||||
.tilesptr = sDottedHoleMapPreviewTiles,
|
||||
.tilemapptr = sDottedHoleMapPreviewTilemap,
|
||||
.palptr = sDottedHoleMapPreviewPalette
|
||||
},
|
||||
[MPS_BERRY_FOREST] = {
|
||||
.mapsec = MAPSEC_BERRY_FOREST,
|
||||
.type = MPS_TYPE_FOREST,
|
||||
.flagId = FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST,
|
||||
.tilesptr = gBerryForestMapPreviewTiles,
|
||||
.tilemapptr = gBerryForestMapPreviewTilemap,
|
||||
.palptr = gBerryForestMapPreviewPalette
|
||||
.tilesptr = sBerryForestMapPreviewTiles,
|
||||
.tilemapptr = sBerryForestMapPreviewTilemap,
|
||||
.palptr = sBerryForestMapPreviewPalette
|
||||
},
|
||||
[MPS_ICEFALL_CAVE] = {
|
||||
.mapsec = MAPSEC_ICEFALL_CAVE,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE,
|
||||
.tilesptr = gIcefallCaveMapPreviewTiles,
|
||||
.tilemapptr = gIcefallCaveMapPreviewTilemap,
|
||||
.palptr = gIcefallCaveMapPreviewPalette
|
||||
.tilesptr = sIcefallCaveMapPreviewTiles,
|
||||
.tilemapptr = sIcefallCaveMapPreviewTilemap,
|
||||
.palptr = sIcefallCaveMapPreviewPalette
|
||||
},
|
||||
[MPS_LOST_CAVE] = {
|
||||
.mapsec = MAPSEC_LOST_CAVE,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE,
|
||||
.tilesptr = gLostCaveMapPreviewTiles,
|
||||
.tilemapptr = gLostCaveMapPreviewTilemap,
|
||||
.palptr = gLostCaveMapPreviewPalette
|
||||
.tilesptr = sLostCaveMapPreviewTiles,
|
||||
.tilemapptr = sLostCaveMapPreviewTilemap,
|
||||
.palptr = sLostCaveMapPreviewPalette
|
||||
},
|
||||
[MPS_ALTERING_CAVE] = {
|
||||
.mapsec = MAPSEC_ALTERING_CAVE,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE,
|
||||
.tilesptr = gAlteringCaveMapPreviewTiles,
|
||||
.tilemapptr = gAlteringCaveMapPreviewTilemap,
|
||||
.palptr = gAlteringCaveMapPreviewPalette
|
||||
.tilesptr = sAlteringCaveMapPreviewTiles,
|
||||
.tilemapptr = sAlteringCaveMapPreviewTilemap,
|
||||
.palptr = sAlteringCaveMapPreviewPalette
|
||||
},
|
||||
[MPS_PATTERN_BUSH] = {
|
||||
.mapsec = MAPSEC_PATTERN_BUSH,
|
||||
.type = MPS_TYPE_FOREST,
|
||||
.flagId = FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH,
|
||||
.tilesptr = gViridianForestMapPreviewTiles,
|
||||
.tilemapptr = gViridianForestMapPreviewTilemap,
|
||||
.palptr = gViridianForestMapPreviewPalette
|
||||
.tilesptr = sViridianForestMapPreviewTiles,
|
||||
.tilemapptr = sViridianForestMapPreviewTilemap,
|
||||
.palptr = sViridianForestMapPreviewPalette
|
||||
},
|
||||
[MPS_LIPTOO_CHAMBER] = {
|
||||
.mapsec = MAPSEC_LIPTOO_CHAMBER,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
|
||||
.tilesptr = gMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = gMoneanChamberMapPreviewTilemap,
|
||||
.palptr = gMoneanChamberMapPreviewPalette
|
||||
.tilesptr = sMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = sMoneanChamberMapPreviewTilemap,
|
||||
.palptr = sMoneanChamberMapPreviewPalette
|
||||
},
|
||||
[MPS_WEEPTH_CHAMBER] = {
|
||||
.mapsec = MAPSEC_WEEPTH_CHAMBER,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
|
||||
.tilesptr = gMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = gMoneanChamberMapPreviewTilemap,
|
||||
.palptr = gMoneanChamberMapPreviewPalette
|
||||
.tilesptr = sMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = sMoneanChamberMapPreviewTilemap,
|
||||
.palptr = sMoneanChamberMapPreviewPalette
|
||||
},
|
||||
[MPS_TDILFORD_CHAMBER] = {
|
||||
.mapsec = MAPSEC_DILFORD_CHAMBER,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
|
||||
.tilesptr = gMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = gMoneanChamberMapPreviewTilemap,
|
||||
.palptr = gMoneanChamberMapPreviewPalette
|
||||
.tilesptr = sMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = sMoneanChamberMapPreviewTilemap,
|
||||
.palptr = sMoneanChamberMapPreviewPalette
|
||||
},
|
||||
[MPS_SCUFIB_CHAMBER] = {
|
||||
.mapsec = MAPSEC_SCUFIB_CHAMBER,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
|
||||
.tilesptr = gMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = gMoneanChamberMapPreviewTilemap,
|
||||
.palptr = gMoneanChamberMapPreviewPalette
|
||||
.tilesptr = sMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = sMoneanChamberMapPreviewTilemap,
|
||||
.palptr = sMoneanChamberMapPreviewPalette
|
||||
},
|
||||
[MPS_RIXY_CHAMBER] = {
|
||||
.mapsec = MAPSEC_RIXY_CHAMBER,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
|
||||
.tilesptr = gMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = gMoneanChamberMapPreviewTilemap,
|
||||
.palptr = gMoneanChamberMapPreviewPalette
|
||||
.tilesptr = sMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = sMoneanChamberMapPreviewTilemap,
|
||||
.palptr = sMoneanChamberMapPreviewPalette
|
||||
},
|
||||
[MPS_VIAPOIS_CHAMBER] = {
|
||||
.mapsec = MAPSEC_VIAPOIS_CHAMBER,
|
||||
.type = MPS_TYPE_CAVE,
|
||||
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
|
||||
.tilesptr = gMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = gMoneanChamberMapPreviewTilemap,
|
||||
.palptr = gMoneanChamberMapPreviewPalette
|
||||
.tilesptr = sMoneanChamberMapPreviewTiles,
|
||||
.tilemapptr = sMoneanChamberMapPreviewTilemap,
|
||||
.palptr = sMoneanChamberMapPreviewPalette
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
+39
-39
@@ -80,47 +80,47 @@ static const struct WindowTemplate sWindowTemplates[] = {
|
||||
.baseBlock = 0x130}
|
||||
};
|
||||
|
||||
static const u16 gCard0Pal[] = INCBIN_U16("data/graphics/mevent/pal_46708C.gbapal");
|
||||
const u16 gCard1Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670AC.gbapal");
|
||||
const u16 gCard2Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670CC.gbapal");
|
||||
const u16 gCard3Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670EC.gbapal");
|
||||
const u16 gCard4Pal[] = INCBIN_U16("data/graphics/mevent/pal_46710C.gbapal");
|
||||
const u16 gCard5Pal[] = INCBIN_U16("data/graphics/mevent/pal_46712C.gbapal");
|
||||
static const u16 gCard6Pal[] = INCBIN_U16("data/graphics/mevent/pal_46714C.gbapal");
|
||||
static const u16 gCard7Pal[] = INCBIN_U16("data/graphics/mevent/pal_46716C.gbapal");
|
||||
static const u8 sCard0Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46718C.4bpp.lz");
|
||||
static const u8 sCard0Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467288.bin.lz");
|
||||
static const u8 sCard1Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46737C.4bpp.lz");
|
||||
static const u8 sCard1Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467470.bin.lz");
|
||||
static const u8 sCard2Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467558.4bpp.lz");
|
||||
static const u8 sCard2Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46762C.bin.lz");
|
||||
static const u8 sCard6Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467700.4bpp.lz");
|
||||
static const u8 sCard6Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467934.bin.lz");
|
||||
static const u8 sCard7Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467A7C.4bpp.lz");
|
||||
static const u8 sCard7Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467CAC.bin.lz");
|
||||
static const u16 gUnknown_8467DF4[] = INCBIN_U16("data/graphics/mevent/pal_467DF4.gbapal");
|
||||
static const u16 gUnknown_8467E14[] = INCBIN_U16("data/graphics/mevent/pal_467E14.gbapal");
|
||||
static const u16 gUnknown_8467E34[] = INCBIN_U16("data/graphics/mevent/pal_467E34.gbapal");
|
||||
static const u16 gUnknown_8467E54[] = INCBIN_U16("data/graphics/mevent/pal_467E54.gbapal");
|
||||
static const u16 gUnknown_8467E74[] = INCBIN_U16("data/graphics/mevent/pal_467E74.gbapal");
|
||||
static const u16 gUnknown_8467E94[] = INCBIN_U16("data/graphics/mevent/pal_467E94.gbapal");
|
||||
static const u16 gUnknown_8467EB4[] = INCBIN_U16("data/graphics/mevent/pal_467EB4.gbapal");
|
||||
static const u16 gUnknown_8467ED4[] = INCBIN_U16("data/graphics/mevent/pal_467ED4.gbapal");
|
||||
static const u32 gUnknown_8467EF4[] = INCBIN_U32("data/graphics/mevent/gfx_467EF4.4bpp.lz");
|
||||
static const u16 sCard0Pal[] = INCBIN_U16("graphics/mevent/pal_46708C.gbapal");
|
||||
const u16 gCard1Pal[] = INCBIN_U16("graphics/mevent/pal_4670AC.gbapal");
|
||||
const u16 gCard2Pal[] = INCBIN_U16("graphics/mevent/pal_4670CC.gbapal");
|
||||
const u16 gCard3Pal[] = INCBIN_U16("graphics/mevent/pal_4670EC.gbapal");
|
||||
const u16 gCard4Pal[] = INCBIN_U16("graphics/mevent/pal_46710C.gbapal");
|
||||
const u16 gCard5Pal[] = INCBIN_U16("graphics/mevent/pal_46712C.gbapal");
|
||||
static const u16 sCard6Pal[] = INCBIN_U16("graphics/mevent/pal_46714C.gbapal");
|
||||
static const u16 sCard7Pal[] = INCBIN_U16("graphics/mevent/pal_46716C.gbapal");
|
||||
static const u8 sCard0Gfx[] = INCBIN_U8("graphics/mevent/gfx_46718C.4bpp.lz");
|
||||
static const u8 sCard0Map[] = INCBIN_U8("graphics/mevent/tilemap_467288.bin.lz");
|
||||
static const u8 sCard1Gfx[] = INCBIN_U8("graphics/mevent/gfx_46737C.4bpp.lz");
|
||||
static const u8 sCard1Map[] = INCBIN_U8("graphics/mevent/tilemap_467470.bin.lz");
|
||||
static const u8 sCard2Gfx[] = INCBIN_U8("graphics/mevent/gfx_467558.4bpp.lz");
|
||||
static const u8 sCard2Map[] = INCBIN_U8("graphics/mevent/tilemap_46762C.bin.lz");
|
||||
static const u8 sCard6Gfx[] = INCBIN_U8("graphics/mevent/gfx_467700.4bpp.lz");
|
||||
static const u8 sCard6Map[] = INCBIN_U8("graphics/mevent/tilemap_467934.bin.lz");
|
||||
static const u8 sCard7Gfx[] = INCBIN_U8("graphics/mevent/gfx_467A7C.4bpp.lz");
|
||||
static const u8 sCard7Map[] = INCBIN_U8("graphics/mevent/tilemap_467CAC.bin.lz");
|
||||
static const u16 sUnknown_8467DF4[] = INCBIN_U16("graphics/mevent/pal_467DF4.gbapal");
|
||||
static const u16 sUnknown_8467E14[] = INCBIN_U16("graphics/mevent/pal_467E14.gbapal");
|
||||
static const u16 sUnknown_8467E34[] = INCBIN_U16("graphics/mevent/pal_467E34.gbapal");
|
||||
static const u16 sUnknown_8467E54[] = INCBIN_U16("graphics/mevent/pal_467E54.gbapal");
|
||||
static const u16 sUnknown_8467E74[] = INCBIN_U16("graphics/mevent/pal_467E74.gbapal");
|
||||
static const u16 sUnknown_8467E94[] = INCBIN_U16("graphics/mevent/pal_467E94.gbapal");
|
||||
static const u16 sUnknown_8467EB4[] = INCBIN_U16("graphics/mevent/pal_467EB4.gbapal");
|
||||
static const u16 sUnknown_8467ED4[] = INCBIN_U16("graphics/mevent/pal_467ED4.gbapal");
|
||||
static const u32 sUnknown_8467EF4[] = INCBIN_U32("graphics/mevent/gfx_467EF4.4bpp.lz");
|
||||
|
||||
static const struct CompressedSpriteSheet sShadowSpriteSheet = {
|
||||
gUnknown_8467EF4, 0x100, 0x8000
|
||||
sUnknown_8467EF4, 0x100, 0x8000
|
||||
};
|
||||
|
||||
static const struct SpritePalette sShadowSpritePalettes[] = {
|
||||
{gUnknown_8467DF4, 0x8000},
|
||||
{gUnknown_8467E14, 0x8000},
|
||||
{gUnknown_8467E34, 0x8000},
|
||||
{gUnknown_8467E54, 0x8000},
|
||||
{gUnknown_8467E74, 0x8000},
|
||||
{gUnknown_8467E94, 0x8000},
|
||||
{gUnknown_8467EB4, 0x8000},
|
||||
{gUnknown_8467ED4, 0x8000}
|
||||
{sUnknown_8467DF4, 0x8000},
|
||||
{sUnknown_8467E14, 0x8000},
|
||||
{sUnknown_8467E34, 0x8000},
|
||||
{sUnknown_8467E54, 0x8000},
|
||||
{sUnknown_8467E74, 0x8000},
|
||||
{sUnknown_8467E94, 0x8000},
|
||||
{sUnknown_8467EB4, 0x8000},
|
||||
{sUnknown_8467ED4, 0x8000}
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate sShadowSpriteTemplate = {
|
||||
@@ -128,14 +128,14 @@ static const struct SpriteTemplate sShadowSpriteTemplate = {
|
||||
};
|
||||
|
||||
static const struct UnkStruct_8467FB8 sCardGfxPtrs[8] = {
|
||||
{1, 0, 0, 0, sCard0Gfx, sCard0Map, gCard0Pal},
|
||||
{1, 0, 0, 0, sCard0Gfx, sCard0Map, sCard0Pal},
|
||||
{1, 0, 0, 1, sCard1Gfx, sCard1Map, gCard1Pal},
|
||||
{1, 0, 0, 2, sCard2Gfx, sCard2Map, gCard2Pal},
|
||||
{1, 0, 0, 3, sCard2Gfx, sCard2Map, gCard3Pal},
|
||||
{1, 0, 0, 4, sCard2Gfx, sCard2Map, gCard4Pal},
|
||||
{1, 0, 0, 5, sCard2Gfx, sCard2Map, gCard5Pal},
|
||||
{1, 0, 0, 6, sCard6Gfx, sCard6Map, gCard6Pal},
|
||||
{1, 0, 0, 7, sCard7Gfx, sCard7Map, gCard7Pal}
|
||||
{1, 0, 0, 6, sCard6Gfx, sCard6Map, sCard6Pal},
|
||||
{1, 0, 0, 7, sCard7Gfx, sCard7Map, sCard7Pal}
|
||||
};
|
||||
|
||||
bool32 InitWonderCardResources(struct MEWonderCardData * card, struct MEventBuffer_3430_Sub * b3430sub)
|
||||
|
||||
+13
-13
@@ -47,19 +47,19 @@ static const struct ScrollArrowsTemplate sScrollArrowsTemplate = {
|
||||
0x0000, 0x0002, 0x1000, 0x1000, 0x0,
|
||||
};
|
||||
|
||||
static const u16 sNews1Pal[] = INCBIN_U16("data/graphics/mevent/pal_468060.gbapal");
|
||||
static const u16 sNews6Pal[] = INCBIN_U16("data/graphics/mevent/pal_468080.gbapal");
|
||||
static const u16 sNews7Pal[] = INCBIN_U16("data/graphics/mevent/pal_4680A0.gbapal");
|
||||
static const u8 sNews0Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_4680C0.4bpp.lz");
|
||||
static const u8 sNews0Map[] = INCBIN_U8("data/graphics/mevent/tilemap_468140.bin.lz");
|
||||
static const u8 sNews1Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46821C.4bpp.lz");
|
||||
static const u8 sNews1Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46824C.bin.lz");
|
||||
static const u8 sNews2Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46830C.4bpp.lz");
|
||||
static const u8 sNews2Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46837C.bin.lz");
|
||||
static const u8 sNews6Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_468448.4bpp.lz");
|
||||
static const u8 sNews6Map[] = INCBIN_U8("data/graphics/mevent/tilemap_4684D8.bin.lz");
|
||||
static const u8 sNews7Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_4685B4.4bpp.lz");
|
||||
static const u8 sNews7Map[] = INCBIN_U8("data/graphics/mevent/tilemap_468644.bin.lz");
|
||||
static const u16 sNews1Pal[] = INCBIN_U16("graphics/mevent/pal_468060.gbapal");
|
||||
static const u16 sNews6Pal[] = INCBIN_U16("graphics/mevent/pal_468080.gbapal");
|
||||
static const u16 sNews7Pal[] = INCBIN_U16("graphics/mevent/pal_4680A0.gbapal");
|
||||
static const u8 sNews0Gfx[] = INCBIN_U8("graphics/mevent/gfx_4680C0.4bpp.lz");
|
||||
static const u8 sNews0Map[] = INCBIN_U8("graphics/mevent/tilemap_468140.bin.lz");
|
||||
static const u8 sNews1Gfx[] = INCBIN_U8("graphics/mevent/gfx_46821C.4bpp.lz");
|
||||
static const u8 sNews1Map[] = INCBIN_U8("graphics/mevent/tilemap_46824C.bin.lz");
|
||||
static const u8 sNews2Gfx[] = INCBIN_U8("graphics/mevent/gfx_46830C.4bpp.lz");
|
||||
static const u8 sNews2Map[] = INCBIN_U8("graphics/mevent/tilemap_46837C.bin.lz");
|
||||
static const u8 sNews6Gfx[] = INCBIN_U8("graphics/mevent/gfx_468448.4bpp.lz");
|
||||
static const u8 sNews6Map[] = INCBIN_U8("graphics/mevent/tilemap_4684D8.bin.lz");
|
||||
static const u8 sNews7Gfx[] = INCBIN_U8("graphics/mevent/gfx_4685B4.4bpp.lz");
|
||||
static const u8 sNews7Map[] = INCBIN_U8("graphics/mevent/tilemap_468644.bin.lz");
|
||||
|
||||
static const struct UnkStruct_8467FB8 sBgSpecs[] = {
|
||||
{1, 0, 0, 0, sNews0Gfx, sNews0Map, sNews1Pal},
|
||||
|
||||
@@ -211,8 +211,8 @@ static void SpriteCB_Start(struct Sprite * sprite)
|
||||
}
|
||||
}
|
||||
|
||||
static const u16 sSpritePal_321Start[] = INCBIN_U16("data/graphics/unk_847a348.gbapal");
|
||||
static const u16 sSpriteSheet_321Start[] = INCBIN_U16("data/graphics/unk_847a348.4bpp.lz");
|
||||
static const u16 sSpritePal_321Start[] = INCBIN_U16("graphics/link_games/unk_847a348.gbapal");
|
||||
static const u16 sSpriteSheet_321Start[] = INCBIN_U16("graphics/link_games/unk_847a348.4bpp.lz");
|
||||
|
||||
static void Load321StartGfx(u16 tilesTag, u16 palTag)
|
||||
{
|
||||
|
||||
+21
-21
@@ -109,27 +109,27 @@ extern const u8 gText_ABUTTONNext_BBUTTONBack[];
|
||||
extern const u8 gText_Boy[];
|
||||
extern const u8 gText_Girl[];
|
||||
|
||||
ALIGNED(4) static const u16 sHelpDocsPalette[] = INCBIN_U16("data/oak_speech/help_docs_palette.gbapal");
|
||||
static const u32 sOakSpeechGfx_GameStartHelpUI[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_game_start_help_u_i.4bpp.lz");
|
||||
static const u32 sNewGameAdventureIntroTilemap[] = INCBIN_U32("data/oak_speech/new_game_adventure_intro_tilemap.bin.lz");
|
||||
static const u32 sOakSpeechGfx_SolidColors[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_solid_colors.4bpp.lz");
|
||||
static const u32 sOakSpeech_BackgroundTilemap[] = INCBIN_U32("data/oak_speech/oak_speech_background_tilemap.bin.lz");
|
||||
static const u16 sHelpDocsPage2Tilemap[] = INCBIN_U16("data/oak_speech/help_docs_page2_tilemap.bin");
|
||||
static const u16 sHelpDocsPage3Tilemap[] = INCBIN_U16("data/oak_speech/help_docs_page3_tilemap.bin");
|
||||
static const u16 sOakSpeechGfx_LeafPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_leaf_pal.gbapal");
|
||||
static const u32 sOakSpeechGfx_LeafPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_leaf_pic.8bpp.lz");
|
||||
static const u16 sOakSpeechGfx_RedPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_red_pal.gbapal");
|
||||
static const u32 sOakSpeechGfx_RedPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_red_pic.8bpp.lz");
|
||||
static const u16 sOakSpeechGfx_OakPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_oak_pal.gbapal");
|
||||
static const u32 sOakSpeechGfx_OakPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_oak_pic.8bpp.lz");
|
||||
static const u16 sOakSpeechGfx_RivalPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_rival_pal.gbapal");
|
||||
static const u32 sOakSpeechGfx_RivalPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_rival_pic.8bpp.lz");
|
||||
static const u16 sOakSpeech_GrassPlatformPalette[] = INCBIN_U16("data/oak_speech/oak_speech_grass_platform_palette.gbapal");
|
||||
static const u16 sOakSpeech_PikaPalette[] = INCBIN_U16("data/oak_speech/oak_speech_pika_palette.gbapal");
|
||||
static const u32 sOakSpeechGfx_GrassPlatform[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_grass_platform.4bpp.lz");
|
||||
static const u32 sOakSpeechGfx_Pika1[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_pika1.4bpp.lz");
|
||||
static const u32 sOakSpeechGfx_Pika2[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_pika2.4bpp.lz");
|
||||
static const u32 sOakSpeechGfx_PikaEyes[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_pika_eyes.4bpp.lz");
|
||||
ALIGNED(4) static const u16 sHelpDocsPalette[] = INCBIN_U16("graphics/oak_speech/help_docs_palette.gbapal");
|
||||
static const u32 sOakSpeechGfx_GameStartHelpUI[] = INCBIN_U32("graphics/oak_speech/game_start_help_ui.4bpp.lz");
|
||||
static const u32 sNewGameAdventureIntroTilemap[] = INCBIN_U32("graphics/oak_speech/new_game_adventure_intro_tilemap.bin.lz");
|
||||
static const u32 sOakSpeechGfx_SolidColors[] = INCBIN_U32("graphics/oak_speech/solid_colors.4bpp.lz");
|
||||
static const u32 sOakSpeech_BackgroundTilemap[] = INCBIN_U32("graphics/oak_speech/background_tilemap.bin.lz");
|
||||
static const u16 sHelpDocsPage2Tilemap[] = INCBIN_U16("graphics/oak_speech/help_docs_page2_tilemap.bin");
|
||||
static const u16 sHelpDocsPage3Tilemap[] = INCBIN_U16("graphics/oak_speech/help_docs_page3_tilemap.bin");
|
||||
static const u16 sOakSpeechGfx_LeafPal[] = INCBIN_U16("graphics/oak_speech/leaf_pal.gbapal");
|
||||
static const u32 sOakSpeechGfx_LeafPic[] = INCBIN_U32("graphics/oak_speech/leaf_pic.8bpp.lz");
|
||||
static const u16 sOakSpeechGfx_RedPal[] = INCBIN_U16("graphics/oak_speech/red_pal.gbapal");
|
||||
static const u32 sOakSpeechGfx_RedPic[] = INCBIN_U32("graphics/oak_speech/red_pic.8bpp.lz");
|
||||
static const u16 sOakSpeechGfx_OakPal[] = INCBIN_U16("graphics/oak_speech/oak_pal.gbapal");
|
||||
static const u32 sOakSpeechGfx_OakPic[] = INCBIN_U32("graphics/oak_speech/oak_pic.8bpp.lz");
|
||||
static const u16 sOakSpeechGfx_RivalPal[] = INCBIN_U16("graphics/oak_speech/rival_pal.gbapal");
|
||||
static const u32 sOakSpeechGfx_RivalPic[] = INCBIN_U32("graphics/oak_speech/rival_pic.8bpp.lz");
|
||||
static const u16 sOakSpeech_GrassPlatformPalette[] = INCBIN_U16("graphics/oak_speech/grass_platform_palette.gbapal");
|
||||
static const u16 sOakSpeech_PikaPalette[] = INCBIN_U16("graphics/oak_speech/pika_palette.gbapal");
|
||||
static const u32 sOakSpeechGfx_GrassPlatform[] = INCBIN_U32("graphics/oak_speech/grass_platform.4bpp.lz");
|
||||
static const u32 sOakSpeechGfx_Pika1[] = INCBIN_U32("graphics/oak_speech/pika1.4bpp.lz");
|
||||
static const u32 sOakSpeechGfx_Pika2[] = INCBIN_U32("graphics/oak_speech/pika2.4bpp.lz");
|
||||
static const u32 sOakSpeechGfx_PikaEyes[] = INCBIN_U32("graphics/oak_speech/pika_eyes.4bpp.lz");
|
||||
|
||||
static const struct BgTemplate sBgTemplates[3] = {
|
||||
{
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
#include "wild_pokemon_area.h"
|
||||
#include "pokedex_area_markers.h"
|
||||
|
||||
static const u16 sMarkerPal[] = INCBIN_U16("data/pokedex_area_markers/marker.gbapal");
|
||||
static const u32 sMarkerTiles[] = INCBIN_U32("data/pokedex_area_markers/marker.4bpp.lz");
|
||||
static const u16 sMarkerPal[] = INCBIN_U16("graphics/pokedex/area_markers/marker.gbapal");
|
||||
static const u32 sMarkerTiles[] = INCBIN_U32("graphics/pokedex/area_markers/marker.4bpp.lz");
|
||||
|
||||
static const struct Subsprite sSubsprite0 = {
|
||||
.size = ST_OAM_SIZE_0,
|
||||
|
||||
+2
-2
@@ -168,7 +168,7 @@ static const struct WindowTemplate sQuestLogHeaderWindowTemplates[3] = {
|
||||
|
||||
static const u8 sTextColors[3] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_3};
|
||||
|
||||
static const u16 gUnknown_8456638[] = INCBIN_U16("data/graphics/unknown_8456638.bin");
|
||||
static const u16 sUnknown_8456638[] = INCBIN_U16("graphics/unknown/unknown_8456638.bin");
|
||||
|
||||
static const u8 sQuestLogTextLineYCoords[] = {17, 10, 3};
|
||||
|
||||
@@ -1016,7 +1016,7 @@ static void DrawQuestLogSceneDescription(void)
|
||||
|
||||
static void sub_8111D90(u8 a0)
|
||||
{
|
||||
const u16 *src = gUnknown_8456638;
|
||||
const u16 *src = sUnknown_8456638;
|
||||
u16 *buffer = Alloc(0x1680);
|
||||
u8 i, j, y;
|
||||
|
||||
|
||||
+4
-4
@@ -640,10 +640,10 @@ static const struct SpriteTemplate sMuseumFossilSprTemplate = {
|
||||
.callback = SpriteCallbackDummy
|
||||
};
|
||||
|
||||
static const u16 sMuseumAerodactylSprTiles[] = INCBIN_U16("data/script_menu/aerodactyl_fossil.4bpp");
|
||||
static const u16 sMuseumAerodactylSprPalette[] = INCBIN_U16("data/script_menu/aerodactyl_fossil.gbapal");
|
||||
static const u16 sMuseumKabutopsSprTiles[] = INCBIN_U16("data/script_menu/kabutops_fossil.4bpp");
|
||||
static const u16 sMuseumKabutopsSprPalette[] = INCBIN_U16("data/script_menu/kabutops_fossil.gbapal");
|
||||
static const u16 sMuseumAerodactylSprTiles[] = INCBIN_U16("graphics/script_menu/aerodactyl_fossil.4bpp");
|
||||
static const u16 sMuseumAerodactylSprPalette[] = INCBIN_U16("graphics/script_menu/aerodactyl_fossil.gbapal");
|
||||
static const u16 sMuseumKabutopsSprTiles[] = INCBIN_U16("graphics/script_menu/kabutops_fossil.4bpp");
|
||||
static const u16 sMuseumKabutopsSprPalette[] = INCBIN_U16("graphics/script_menu/kabutops_fossil.gbapal");
|
||||
|
||||
static const struct SpriteSheet sMuseumKabutopsSprSheets[] = {
|
||||
{sMuseumKabutopsSprTiles, 0x800, 7000},
|
||||
|
||||
+7
-7
@@ -44,13 +44,13 @@ static void CreateWakeSprite(s16 x);
|
||||
static void SpriteCB_Wake(struct Sprite * sprite);
|
||||
static bool8 GetDirectionOfTravel(void);
|
||||
|
||||
static const u16 sWaterTiles[] = INCBIN_U16("data/seagallop/water.4bpp");
|
||||
static const u16 sWaterPal[] = INCBIN_U16("data/seagallop/water.gbapal");
|
||||
static const u16 sWaterTilemap_WB[] = INCBIN_U16("data/seagallop/wb_tilemap.bin");
|
||||
static const u16 sWaterTilemap_EB[] = INCBIN_U16("data/seagallop/eb_tilemap.bin");
|
||||
static const u16 sFerrySpriteTiles[] = INCBIN_U16("data/seagallop/ferry_sprite.4bpp");
|
||||
static const u16 sFerryAndWakePal[] = INCBIN_U16("data/seagallop/ferry_and_wake.gbapal");
|
||||
static const u16 sWakeSpriteTiles[] = INCBIN_U16("data/seagallop/wake.4bpp");
|
||||
static const u16 sWaterTiles[] = INCBIN_U16("graphics/seagallop/water.4bpp");
|
||||
static const u16 sWaterPal[] = INCBIN_U16("graphics/seagallop/water.gbapal");
|
||||
static const u16 sWaterTilemap_WB[] = INCBIN_U16("graphics/seagallop/wb_tilemap.bin");
|
||||
static const u16 sWaterTilemap_EB[] = INCBIN_U16("graphics/seagallop/eb_tilemap.bin");
|
||||
static const u16 sFerrySpriteTiles[] = INCBIN_U16("graphics/seagallop/ferry_sprite.4bpp");
|
||||
static const u16 sFerryAndWakePal[] = INCBIN_U16("graphics/seagallop/ferry_and_wake.gbapal");
|
||||
static const u16 sWakeSpriteTiles[] = INCBIN_U16("graphics/seagallop/wake.4bpp");
|
||||
|
||||
static const struct BgTemplate sBGTemplates[] = {
|
||||
{
|
||||
|
||||
+88
-88
@@ -18,17 +18,17 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese);
|
||||
|
||||
TextFlags gTextFlags;
|
||||
|
||||
const u8 gDownArrowTiles[] = INCBIN_U8("data/graphics/fonts/down_arrow.4bpp");
|
||||
const u8 gDarkDownArrowTiles[] = INCBIN_U8("data/graphics/fonts/down_arrow_RS.4bpp");
|
||||
const u8 gTinyArrowTiles[] = INCBIN_U8("data/graphics/fonts/down_arrow_2.4bpp");
|
||||
const u8 gTinyDarkDownArrowTiles[] = INCBIN_U8("data/graphics/fonts/down_arrow_RS_2.4bpp");
|
||||
const u8 gDoubleArrowTiles1[] = INCBIN_U8("data/graphics/fonts/down_arrow_3.4bpp");
|
||||
const u8 gDoubleArrowTiles2[] = INCBIN_U8("data/graphics/fonts/down_arrow_4.4bpp");
|
||||
static const u8 sDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow.4bpp");
|
||||
static const u8 sDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS.4bpp");
|
||||
static const u8 sTinyArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_2.4bpp");
|
||||
static const u8 sTinyDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_RS_2.4bpp");
|
||||
static const u8 sDoubleArrowTiles1[] = INCBIN_U8("graphics/fonts/down_arrow_3.4bpp");
|
||||
static const u8 sDoubleArrowTiles2[] = INCBIN_U8("graphics/fonts/down_arrow_4.4bpp");
|
||||
|
||||
const u8 gDownArrowYCoords[] = { 0x0, 0x10, 0x20, 0x10 };
|
||||
const u8 gWindowVerticalScrollSpeeds[] = { 0x1, 0x2 , 0x4 , 0x0 };
|
||||
static const u8 sDownArrowYCoords[] = { 0x0, 0x10, 0x20, 0x10 };
|
||||
static const u8 sWindowVerticalScrollSpeeds[] = { 0x1, 0x2 , 0x4 , 0x0 };
|
||||
|
||||
const struct GlyphWidthFunc gGlyphWidthFuncs[] = {
|
||||
static const struct GlyphWidthFunc sGlyphWidthFuncs[] = {
|
||||
{ 0x0, GetGlyphWidthFont0 },
|
||||
{ 0x1, GetGlyphWidthFont1 },
|
||||
{ 0x2, GetGlyphWidthFont2 },
|
||||
@@ -38,20 +38,20 @@ const struct GlyphWidthFunc gGlyphWidthFuncs[] = {
|
||||
{ 0x6, GetGlyphWidthFont6 }
|
||||
};
|
||||
|
||||
const struct SpriteSheet gUnknown_81EA68C[] =
|
||||
static const struct SpriteSheet sUnknown_81EA68C[] =
|
||||
{
|
||||
{gDoubleArrowTiles1, sizeof(gDoubleArrowTiles1), 0x8000},
|
||||
{gDoubleArrowTiles2, sizeof(gDoubleArrowTiles2), 0x8000},
|
||||
{sDoubleArrowTiles1, sizeof(sDoubleArrowTiles1), 0x8000},
|
||||
{sDoubleArrowTiles2, sizeof(sDoubleArrowTiles2), 0x8000},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
const struct SpritePalette gUnknown_81EA6A4[] =
|
||||
static const struct SpritePalette sUnknown_81EA6A4[] =
|
||||
{
|
||||
{gTMCaseMainWindowPalette, 0x8000},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gUnknown_81EA6B4 =
|
||||
static const struct SpriteTemplate sUnknown_81EA6B4 =
|
||||
{
|
||||
.tileTag = 0x8000,
|
||||
.paletteTag = 0x8000,
|
||||
@@ -62,7 +62,7 @@ const struct SpriteTemplate gUnknown_81EA6B4 =
|
||||
.callback = sub_80062B0,
|
||||
};
|
||||
|
||||
const struct KeypadIcon gKeypadIcons[] = {
|
||||
static const struct KeypadIcon sKeypadIcons[] = {
|
||||
{ 0x0, 0x8, 0xC },
|
||||
{ 0x1, 0x8, 0xC },
|
||||
{ 0x2, 0x10, 0xC },
|
||||
@@ -78,11 +78,11 @@ const struct KeypadIcon gKeypadIcons[] = {
|
||||
{ 0x22, 0x8, 0xC },
|
||||
};
|
||||
|
||||
const u8 gKeypadIconTiles[] = INCBIN_U8("data/graphics/fonts/keypad_icons.4bpp");
|
||||
const u8 gKeypadIconTiles[] = INCBIN_U8("graphics/fonts/keypad_icons.4bpp");
|
||||
|
||||
// Font 0
|
||||
const u16 gFont0LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font0_latin.latfont");
|
||||
const u8 gFont0LatinGlyphWidths[] =
|
||||
static const u16 sFont0LatinGlyphs[] = INCBIN_U16("graphics/fonts/font0_latin.latfont");
|
||||
static const u8 sFont0LatinGlyphWidths[] =
|
||||
{
|
||||
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x05, 0x04, 0x04, 0x05,
|
||||
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
|
||||
@@ -122,11 +122,11 @@ const u8 gFont0LatinGlyphWidths[] =
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x05
|
||||
};
|
||||
const u16 gFont0JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font0_jap.fwjpnfont");
|
||||
static const u16 sFont0JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font0_jap.fwjpnfont");
|
||||
|
||||
// Font 1
|
||||
const u16 gFont1LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font1_latin.latfont");
|
||||
const u8 gFont1LatinGlyphWidths[] =
|
||||
static const u16 sFont1LatinGlyphs[] = INCBIN_U16("graphics/fonts/font1_latin.latfont");
|
||||
static const u8 sFont1LatinGlyphWidths[] =
|
||||
{
|
||||
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
|
||||
0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
|
||||
@@ -166,11 +166,11 @@ const u8 gFont1LatinGlyphWidths[] =
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06
|
||||
};
|
||||
const u16 gFont1JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font1_jap.fwjpnfont");
|
||||
static const u16 sFont1JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font1_jap.fwjpnfont");
|
||||
|
||||
// Font 2
|
||||
const u16 gFont2LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font2_latin.latfont");
|
||||
const u8 gFont2LatinGlyphWidths[] =
|
||||
static const u16 sFont2LatinGlyphs[] = INCBIN_U16("graphics/fonts/font2_latin.latfont");
|
||||
static const u8 sFont2LatinGlyphWidths[] =
|
||||
{
|
||||
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
|
||||
0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
|
||||
@@ -210,8 +210,8 @@ const u8 gFont2LatinGlyphWidths[] =
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06
|
||||
};
|
||||
const u16 gFont2JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font2_jap.fwjpnfont");
|
||||
const u8 gFont2JapaneseGlyphWidths[] =
|
||||
static const u16 sFont2JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font2_jap.fwjpnfont");
|
||||
static const u8 sFont2JapaneseGlyphWidths[] =
|
||||
{
|
||||
0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
|
||||
0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
|
||||
@@ -236,8 +236,8 @@ const u8 gFont2JapaneseGlyphWidths[] =
|
||||
};
|
||||
|
||||
// Font 4
|
||||
const u16 gFont4LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font4_latin.latfont");
|
||||
const u8 gFont4LatinGlyphWidths[] =
|
||||
static const u16 sFont4LatinGlyphs[] = INCBIN_U16("graphics/fonts/font4_latin.latfont");
|
||||
static const u8 sFont4LatinGlyphWidths[] =
|
||||
{
|
||||
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
|
||||
0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
|
||||
@@ -277,8 +277,8 @@ const u8 gFont4LatinGlyphWidths[] =
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06
|
||||
};
|
||||
const u16 gFont4JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font4_jap.fwjpnfont");
|
||||
const u8 gFont4JapaneseGlyphWidths[] =
|
||||
static const u16 sFont4JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font4_jap.fwjpnfont");
|
||||
static const u8 sFont4JapaneseGlyphWidths[] =
|
||||
{
|
||||
0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
|
||||
0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
|
||||
@@ -303,8 +303,8 @@ const u8 gFont4JapaneseGlyphWidths[] =
|
||||
};
|
||||
|
||||
// Font 5
|
||||
const u16 gFont5LatinGlyphs[] = INCBIN_U16("data/graphics/fonts/font5_latin.latfont");
|
||||
const u8 gFont5LatinGlyphWidths[] =
|
||||
static const u16 sFont5LatinGlyphs[] = INCBIN_U16("graphics/fonts/font5_latin.latfont");
|
||||
static const u8 sFont5LatinGlyphWidths[] =
|
||||
{
|
||||
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
|
||||
0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
|
||||
@@ -344,8 +344,8 @@ const u8 gFont5LatinGlyphWidths[] =
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06
|
||||
};
|
||||
const u16 gFont5JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font5_jap.fwjpnfont");
|
||||
const u8 gFont5JapaneseGlyphWidths[] =
|
||||
static const u16 sFont5JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font5_jap.fwjpnfont");
|
||||
static const u8 sFont5JapaneseGlyphWidths[] =
|
||||
{
|
||||
0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
|
||||
0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
|
||||
@@ -370,7 +370,7 @@ const u8 gFont5JapaneseGlyphWidths[] =
|
||||
};
|
||||
|
||||
// Font 9
|
||||
const u16 gFont9JapaneseGlyphs[] = INCBIN_U16("data/graphics/fonts/font9_jap.fwjpnfont");
|
||||
static const u16 sFont9JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font9_jap.fwjpnfont");
|
||||
|
||||
u16 Font0Func(struct TextPrinter *textPrinter)
|
||||
{
|
||||
@@ -482,17 +482,17 @@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter)
|
||||
{
|
||||
case 0:
|
||||
default:
|
||||
arrowTiles = gDownArrowTiles;
|
||||
arrowTiles = sDownArrowTiles;
|
||||
break;
|
||||
case 1:
|
||||
arrowTiles = gDarkDownArrowTiles;
|
||||
arrowTiles = sDarkDownArrowTiles;
|
||||
break;
|
||||
}
|
||||
|
||||
BlitBitmapRectToWindow(
|
||||
textPrinter->printerTemplate.windowId,
|
||||
arrowTiles,
|
||||
gDownArrowYCoords[*(u32*)subStruct << 17 >> 30], // subStruct->downArrowYPosIdx but again, stupidly retrieved
|
||||
sDownArrowYCoords[*(u32*)subStruct << 17 >> 30], // subStruct->downArrowYPosIdx but again, stupidly retrieved
|
||||
0,
|
||||
0x80,
|
||||
0x10,
|
||||
@@ -590,17 +590,17 @@ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *c
|
||||
{
|
||||
case 0:
|
||||
default:
|
||||
arrowTiles = gDownArrowTiles;
|
||||
arrowTiles = sDownArrowTiles;
|
||||
break;
|
||||
case 1:
|
||||
arrowTiles = gDarkDownArrowTiles;
|
||||
arrowTiles = sDarkDownArrowTiles;
|
||||
break;
|
||||
}
|
||||
|
||||
BlitBitmapRectToWindow(
|
||||
windowId,
|
||||
arrowTiles,
|
||||
gDownArrowYCoords[*yCoordIndex & 3],
|
||||
sDownArrowYCoords[*yCoordIndex & 3],
|
||||
0,
|
||||
0x80,
|
||||
0x10,
|
||||
@@ -870,15 +870,15 @@ u16 RenderText(struct TextPrinter *textPrinter)
|
||||
if (textPrinter->scrollDistance)
|
||||
{
|
||||
|
||||
if (textPrinter->scrollDistance < gWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed])
|
||||
if (textPrinter->scrollDistance < sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed])
|
||||
{
|
||||
ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, PIXEL_FILL(textPrinter->printerTemplate.bgColor));
|
||||
textPrinter->scrollDistance = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
ScrollWindow(textPrinter->printerTemplate.windowId, 0, gWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->printerTemplate.bgColor));
|
||||
textPrinter->scrollDistance -= gWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed];
|
||||
ScrollWindow(textPrinter->printerTemplate.windowId, 0, sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->printerTemplate.bgColor));
|
||||
textPrinter->scrollDistance -= sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed];
|
||||
}
|
||||
CopyWindowToVram(textPrinter->printerTemplate.windowId, 2);
|
||||
}
|
||||
@@ -999,8 +999,8 @@ s32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese)
|
||||
|
||||
for (i = 0; i < 7; ++i)
|
||||
{
|
||||
if (glyphId == gGlyphWidthFuncs[i].fontId)
|
||||
return *gGlyphWidthFuncs[i].func;
|
||||
if (glyphId == sGlyphWidthFuncs[i].fontId)
|
||||
return *sGlyphWidthFuncs[i].func;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
@@ -1308,9 +1308,9 @@ void sub_80062B0(struct Sprite *sprite)
|
||||
u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority)
|
||||
{
|
||||
u8 spriteId;
|
||||
LoadSpriteSheet(&gUnknown_81EA68C[sheetId & 1]);
|
||||
LoadSpritePalette(gUnknown_81EA6A4);
|
||||
spriteId = CreateSprite(&gUnknown_81EA6B4, x + 3, y + 4, subpriority);
|
||||
LoadSpriteSheet(&sUnknown_81EA68C[sheetId & 1]);
|
||||
LoadSpritePalette(sUnknown_81EA6A4);
|
||||
spriteId = CreateSprite(&sUnknown_81EA6B4, x + 3, y + 4, subpriority);
|
||||
gSprites[spriteId].oam.priority = (priority & 3);
|
||||
gSprites[spriteId].oam.matrixNum = 0;
|
||||
gSprites[spriteId].data[0] = 8;
|
||||
@@ -1328,31 +1328,31 @@ u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y)
|
||||
{
|
||||
BlitBitmapRectToWindow(
|
||||
windowId,
|
||||
gKeypadIconTiles + (gKeypadIcons[keypadIconId].tileOffset * 0x20),
|
||||
gKeypadIconTiles + (sKeypadIcons[keypadIconId].tileOffset * 0x20),
|
||||
0,
|
||||
0,
|
||||
0x80,
|
||||
0x80,
|
||||
x,
|
||||
y,
|
||||
gKeypadIcons[keypadIconId].width,
|
||||
gKeypadIcons[keypadIconId].height);
|
||||
return gKeypadIcons[keypadIconId].width;
|
||||
sKeypadIcons[keypadIconId].width,
|
||||
sKeypadIcons[keypadIconId].height);
|
||||
return sKeypadIcons[keypadIconId].width;
|
||||
}
|
||||
|
||||
u8 GetKeypadIconTileOffset(u8 keypadIconId)
|
||||
{
|
||||
return gKeypadIcons[keypadIconId].tileOffset;
|
||||
return sKeypadIcons[keypadIconId].tileOffset;
|
||||
}
|
||||
|
||||
u8 GetKeypadIconWidth(u8 keypadIconId)
|
||||
{
|
||||
return gKeypadIcons[keypadIconId].width;
|
||||
return sKeypadIcons[keypadIconId].width;
|
||||
}
|
||||
|
||||
u8 GetKeypadIconHeight(u8 keypadIconId)
|
||||
{
|
||||
return gKeypadIcons[keypadIconId].height;
|
||||
return sKeypadIcons[keypadIconId].height;
|
||||
}
|
||||
|
||||
void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
|
||||
@@ -1361,7 +1361,7 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
|
||||
|
||||
if (isJapanese == 1)
|
||||
{
|
||||
glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
|
||||
glyphs = sFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
|
||||
gGlyphInfo[0x80] = 8;
|
||||
@@ -1369,10 +1369,10 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
|
||||
}
|
||||
else
|
||||
{
|
||||
glyphs = gFont0LatinGlyphs + (0x10 * glyphId);
|
||||
glyphs = sFont0LatinGlyphs + (0x10 * glyphId);
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x40));
|
||||
gGlyphInfo[0x80] = gFont0LatinGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x80] = sFont0LatinGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x81] = 13;
|
||||
}
|
||||
}
|
||||
@@ -1382,7 +1382,7 @@ s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese)
|
||||
if (isJapanese == TRUE)
|
||||
return 8;
|
||||
else
|
||||
return gFont0LatinGlyphWidths[glyphId];
|
||||
return sFont0LatinGlyphWidths[glyphId];
|
||||
}
|
||||
|
||||
void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
|
||||
@@ -1392,7 +1392,7 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
|
||||
if (isJapanese == TRUE)
|
||||
{
|
||||
int eff;
|
||||
glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now
|
||||
glyphs = sFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
|
||||
gGlyphInfo[0x80] = 8;
|
||||
@@ -1400,12 +1400,12 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
|
||||
}
|
||||
else
|
||||
{
|
||||
glyphs = gFont1LatinGlyphs + (0x20 * glyphId);
|
||||
glyphs = sFont1LatinGlyphs + (0x20 * glyphId);
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
|
||||
DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40));
|
||||
DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60));
|
||||
gGlyphInfo[0x80] = gFont1LatinGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x80] = sFont1LatinGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x81] = 14;
|
||||
}
|
||||
}
|
||||
@@ -1415,7 +1415,7 @@ s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese)
|
||||
if (isJapanese == TRUE)
|
||||
return 8;
|
||||
else
|
||||
return gFont1LatinGlyphWidths[glyphId];
|
||||
return sFont1LatinGlyphWidths[glyphId];
|
||||
}
|
||||
|
||||
void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
|
||||
@@ -1440,12 +1440,12 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
|
||||
}
|
||||
else
|
||||
{
|
||||
glyphs = gFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
|
||||
glyphs = sFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
|
||||
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
|
||||
DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo + 0x60));
|
||||
gGlyphInfo[0x80] = gFont2JapaneseGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x80] = sFont2JapaneseGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x81] = 12;
|
||||
}
|
||||
}
|
||||
@@ -1459,18 +1459,18 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
|
||||
{
|
||||
gGlyphInfo[i] = lastColor | lastColor << 4;
|
||||
// but why
|
||||
gGlyphInfo[0x80] = gFont2LatinGlyphWidths[0];
|
||||
gGlyphInfo[0x80] = sFont2LatinGlyphWidths[0];
|
||||
gGlyphInfo[0x81] = 14;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
glyphs = gFont2LatinGlyphs + (0x20 * glyphId);
|
||||
glyphs = sFont2LatinGlyphs + (0x20 * glyphId);
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
|
||||
DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40));
|
||||
DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60));
|
||||
gGlyphInfo[0x80] = gFont2LatinGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x80] = sFont2LatinGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x81] = 14;
|
||||
}
|
||||
}
|
||||
@@ -1483,11 +1483,11 @@ s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese)
|
||||
if(glyphId == 0)
|
||||
return 10;
|
||||
|
||||
return gFont2JapaneseGlyphWidths[glyphId];
|
||||
return sFont2JapaneseGlyphWidths[glyphId];
|
||||
}
|
||||
else
|
||||
{
|
||||
return gFont2LatinGlyphWidths[glyphId];
|
||||
return sFont2LatinGlyphWidths[glyphId];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1513,7 +1513,7 @@ static void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese)
|
||||
}
|
||||
else
|
||||
{
|
||||
glyphs = gFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
|
||||
glyphs = sFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
|
||||
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
|
||||
@@ -1531,7 +1531,7 @@ s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese)
|
||||
if(isJapanese == TRUE)
|
||||
return 10;
|
||||
else
|
||||
return gFont2LatinGlyphWidths[glyphId];
|
||||
return sFont2LatinGlyphWidths[glyphId];
|
||||
}
|
||||
|
||||
static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese)
|
||||
@@ -1556,12 +1556,12 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese)
|
||||
}
|
||||
else
|
||||
{
|
||||
glyphs = gFont4JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
|
||||
glyphs = sFont4JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
|
||||
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
|
||||
DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo + 0x60));
|
||||
gGlyphInfo[0x80] = gFont4JapaneseGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x80] = sFont4JapaneseGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x81] = 12;
|
||||
}
|
||||
}
|
||||
@@ -1575,18 +1575,18 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese)
|
||||
{
|
||||
gGlyphInfo[i] = lastColor | lastColor << 4;
|
||||
// but why
|
||||
gGlyphInfo[0x80] = gFont4LatinGlyphWidths[0];
|
||||
gGlyphInfo[0x80] = sFont4LatinGlyphWidths[0];
|
||||
gGlyphInfo[0x81] = 14;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
glyphs = gFont4LatinGlyphs + (0x20 * glyphId);
|
||||
glyphs = sFont4LatinGlyphs + (0x20 * glyphId);
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
|
||||
DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40));
|
||||
DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60));
|
||||
gGlyphInfo[0x80] = gFont4LatinGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x80] = sFont4LatinGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x81] = 14;
|
||||
}
|
||||
}
|
||||
@@ -1599,10 +1599,10 @@ s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese)
|
||||
if(glyphId == 0)
|
||||
return 10;
|
||||
|
||||
return gFont4JapaneseGlyphWidths[glyphId];
|
||||
return sFont4JapaneseGlyphWidths[glyphId];
|
||||
}
|
||||
else
|
||||
return gFont4LatinGlyphWidths[glyphId];
|
||||
return sFont4LatinGlyphWidths[glyphId];
|
||||
}
|
||||
|
||||
void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese)
|
||||
@@ -1627,12 +1627,12 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese)
|
||||
}
|
||||
else
|
||||
{
|
||||
glyphs = gFont5JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
|
||||
glyphs = sFont5JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
|
||||
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
|
||||
DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo + 0x60));
|
||||
gGlyphInfo[0x80] = gFont5JapaneseGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x80] = sFont5JapaneseGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x81] = 12;
|
||||
}
|
||||
}
|
||||
@@ -1646,18 +1646,18 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese)
|
||||
{
|
||||
gGlyphInfo[i] = lastColor | lastColor << 4;
|
||||
// but why
|
||||
gGlyphInfo[0x80] = gFont5LatinGlyphWidths[0];
|
||||
gGlyphInfo[0x80] = sFont5LatinGlyphWidths[0];
|
||||
gGlyphInfo[0x81] = 14;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
glyphs = gFont5LatinGlyphs + (0x20 * glyphId);
|
||||
glyphs = sFont5LatinGlyphs + (0x20 * glyphId);
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo + 0x20));
|
||||
DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo + 0x40));
|
||||
DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo + 0x60));
|
||||
gGlyphInfo[0x80] = gFont5LatinGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x80] = sFont5LatinGlyphWidths[glyphId];
|
||||
gGlyphInfo[0x81] = 14;
|
||||
}
|
||||
}
|
||||
@@ -1670,15 +1670,15 @@ s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese)
|
||||
if(glyphId == 0)
|
||||
return 10;
|
||||
|
||||
return gFont5JapaneseGlyphWidths[glyphId];
|
||||
return sFont5JapaneseGlyphWidths[glyphId];
|
||||
}
|
||||
else
|
||||
return gFont5LatinGlyphWidths[glyphId];
|
||||
return sFont5LatinGlyphWidths[glyphId];
|
||||
}
|
||||
|
||||
void DecompressGlyphFont9(u16 glyphId)
|
||||
{
|
||||
const u16* glyphs = gFont9JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
|
||||
const u16* glyphs = sFont9JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
|
||||
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo);
|
||||
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo + 0x40));
|
||||
gGlyphInfo[0x80] = 8;
|
||||
|
||||
+10
-10
@@ -74,23 +74,23 @@ static bool32 IsSlashSpriteHidden(u8 spriteId);
|
||||
static void SpriteCallback_Slash(struct Sprite * sprite);
|
||||
|
||||
// bg3
|
||||
static const u8 sBorderBgTiles[] = INCBIN_U8("data/graphics/title_screen/unk_83BF58C.4bpp.lz");
|
||||
static const u8 sBorderBgTiles[] = INCBIN_U8("graphics/title_screen/unk_83BF58C.4bpp.lz");
|
||||
#if defined(FIRERED)
|
||||
static const u8 sBorderBgMap[] = INCBIN_U8("data/graphics/title_screen/unk_83BF5A8.bin.lz");
|
||||
static const u8 sBorderBgMap[] = INCBIN_U8("graphics/title_screen/unk_83BF5A8.bin.lz");
|
||||
#elif defined(LEAFGREEN)
|
||||
static const u8 sBorderBgMap[] = INCBIN_U8("data/graphics/title_screen/lg_border_bg.bin.lz");
|
||||
static const u8 sBorderBgMap[] = INCBIN_U8("graphics/title_screen/lg_border_bg.bin.lz");
|
||||
#endif
|
||||
|
||||
//sprites
|
||||
static const u32 sSlashSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_83bf64c.4bpp.lz");
|
||||
static const u32 sSlashSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_83bf64c.4bpp.lz");
|
||||
#if defined(FIRERED)
|
||||
static const u16 sSlashSpritePals[] = INCBIN_U16("data/graphics/title_screen/unk_83bf77c.gbapal");
|
||||
static const u32 sFireSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_83bf79c.4bpp.lz");
|
||||
static const u32 sBlankFireSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_83bfa14.4bpp.lz");
|
||||
static const u16 sSlashSpritePals[] = INCBIN_U16("graphics/title_screen/unk_83bf77c.gbapal");
|
||||
static const u32 sFireSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_83bf79c.4bpp.lz");
|
||||
static const u32 sBlankFireSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_83bfa14.4bpp.lz");
|
||||
#elif defined(LEAFGREEN)
|
||||
static const u16 sSlashSpritePals[] = INCBIN_U16("data/graphics/title_screen/unk_lg_83bf764.gbapal");
|
||||
static const u32 sLeafSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_lg_83bf784.4bpp.lz");
|
||||
static const u32 sBlankLeafSpriteTiles[] = INCBIN_U32("data/graphics/title_screen/unk_lg_83bf89c.4bpp.lz");
|
||||
static const u16 sSlashSpritePals[] = INCBIN_U16("graphics/title_screen/unk_lg_83bf764.gbapal");
|
||||
static const u32 sLeafSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_lg_83bf784.4bpp.lz");
|
||||
static const u32 sBlankLeafSpriteTiles[] = INCBIN_U32("graphics/title_screen/unk_lg_83bf89c.4bpp.lz");
|
||||
#endif
|
||||
|
||||
static const struct OamData sOamData_FlameOrLeaf = {
|
||||
|
||||
@@ -367,7 +367,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
|
||||
headerId = GetCurrentMapWildMonHeaderId();
|
||||
if (headerId != 0xFFFF)
|
||||
{
|
||||
if (GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_GRASS)
|
||||
if (GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_LAND)
|
||||
{
|
||||
if (gWildMonHeaders[headerId].landMonsInfo == NULL)
|
||||
return FALSE;
|
||||
@@ -474,7 +474,7 @@ bool8 SweetScentWildEncounter(void)
|
||||
headerId = GetCurrentMapWildMonHeaderId();
|
||||
if (headerId != 0xFFFF)
|
||||
{
|
||||
if (MapGridGetMetatileAttributeAt(x, y, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_GRASS)
|
||||
if (MapGridGetMetatileAttributeAt(x, y, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_LAND)
|
||||
{
|
||||
if (TryStartRoamerEncounter() == TRUE)
|
||||
{
|
||||
@@ -680,7 +680,7 @@ static u8 GetMapBaseEncounterCooldown(u8 encounterType)
|
||||
u16 headerIdx = GetCurrentMapWildMonHeaderId();
|
||||
if (headerIdx == 0xFFFF)
|
||||
return 0xFF;
|
||||
if (encounterType == TILE_ENCOUNTER_GRASS)
|
||||
if (encounterType == TILE_ENCOUNTER_LAND)
|
||||
{
|
||||
if (gWildMonHeaders[headerIdx].landMonsInfo == NULL)
|
||||
return 0xFF;
|
||||
|
||||
Reference in New Issue
Block a user