From f54f2c424ffdbdd9b9b3c4758bbbe245833f6436 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 18:00:26 -0500 Subject: LoadWallClockGraphics --- include/graphics.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index c50fdef3f..f3d4588ea 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -91,5 +91,8 @@ extern const u8 gUnknown_08DB9F08[]; extern const u8 gUnknown_08DB9FFC[]; extern const u8 gUnknown_08DBA020[]; extern const u8 gUnknown_08DBA12C[]; +extern const u8 gUnknown_08DCC05C[]; +extern const u16 gUnknown_08DCC01C[]; +extern const u16 gUnknown_08DCC03C[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 24009ea941abb81068745926ca9960acf927dd4e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 19:49:03 -0500 Subject: through Cb2_StartWallClock and associated data --- include/graphics.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index f3d4588ea..528b7f49f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -94,5 +94,6 @@ extern const u8 gUnknown_08DBA12C[]; extern const u8 gUnknown_08DCC05C[]; extern const u16 gUnknown_08DCC01C[]; extern const u16 gUnknown_08DCC03C[]; +extern const u16 gUnknown_08DCC648[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From efd23cb91b402ff44cf8139490ae37cf6990d1be Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 20:06:29 -0500 Subject: Cb2_ViewWallClock --- include/graphics.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index 528b7f49f..25a5431c6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -94,6 +94,7 @@ extern const u8 gUnknown_08DBA12C[]; extern const u8 gUnknown_08DCC05C[]; extern const u16 gUnknown_08DCC01C[]; extern const u16 gUnknown_08DCC03C[]; -extern const u16 gUnknown_08DCC648[]; +extern const u8 gUnknown_08DCC648[]; +extern const u8 gUnknown_08DCC908[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 37ae6a7758d0f16394f31c367f5c1eb86d34327f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 10 Dec 2017 16:38:27 +0100 Subject: move more pokeblock data to C and label --- include/graphics.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index 4a522a429..ed0bfb108 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -1,10 +1,7 @@ -// -// Created by scott on 10/21/2017. -// - #ifndef GUARD_GRAPHICS_H #define GUARD_GRAPHICS_H +// interface pokeballs extern const u8 gInterfaceGfx_PokeBall[]; extern const u8 gInterfacePal_PokeBall[]; extern const u8 gInterfaceGfx_GreatBall[]; @@ -31,6 +28,23 @@ extern const u8 gInterfaceGfx_PremierBall[]; extern const u8 gInterfacePal_PremierBall[]; extern const u8 gOpenPokeballGfx[]; +// pokeblock +extern const u8 gPokeblockRed_Pal[]; +extern const u8 gPokeblockBlue_Pal[]; +extern const u8 gPokeblockPink_Pal[]; +extern const u8 gPokeblockGreen_Pal[]; +extern const u8 gPokeblockYellow_Pal[]; +extern const u8 gPokeblockPurple_Pal[]; +extern const u8 gPokeblockIndigo_Pal[]; +extern const u8 gPokeblockBrown_Pal[]; +extern const u8 gPokeblockLiteBlue_Pal[]; +extern const u8 gPokeblockOlive_Pal[]; +extern const u8 gPokeblockGray_Pal[]; +extern const u8 gPokeblockBlack_Pal[]; +extern const u8 gPokeblockWhite_Pal[]; +extern const u8 gPokeblockGold_Pal[]; +extern const u8 gPokeblock_Gfx[]; + extern const u8 gItemIcon_QuestionMark[]; extern const u8 gItemIconPalette_QuestionMark[]; extern const u8 gUnknown_08DB7AA0[]; -- cgit v1.2.3 From 8ac17e09486006c7d2d066173c8fa907aceb72de Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 11 Dec 2017 16:52:28 +0100 Subject: move data from asm to pokeblock.c --- include/graphics.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index ed0bfb108..24448308d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -29,6 +29,11 @@ extern const u8 gInterfacePal_PremierBall[]; extern const u8 gOpenPokeballGfx[]; // pokeblock +extern const u8 gMenuPokeblock_Gfx[]; +extern const u8 gMenuPokeblock_Pal[]; +extern const u8 gMenuPokeblock_Tilemap[]; +extern const u8 gMenuPokeblockDevice_Gfx[]; +extern const u8 gMenuPokeblockDevice_Pal[]; extern const u8 gPokeblockRed_Pal[]; extern const u8 gPokeblockBlue_Pal[]; extern const u8 gPokeblockPink_Pal[]; -- cgit v1.2.3 From eb8055eb07f4ed6e3dd1d04d61e66ad9fb0d08b8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Dec 2017 20:10:57 +0100 Subject: battle 1 is decompiled --- include/graphics.h | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index 4a522a429..95429230a 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -136,4 +136,82 @@ extern const u8 gUnknown_08DDB020[]; extern const u8 gUnknown_08DDB2C4[]; extern const u16 gUnknown_08DDAFE0[]; +extern const u8 gBattleTextboxTiles[]; +extern const u8 gBattleTextboxTilemap[]; +extern const u8 gBattleTextboxPalette[]; +extern const u8 gUnknown_08D778F0[]; +extern const u8 gUnknown_08D77B0C[]; +extern const u8 gUnknown_08D77AE4[]; +extern const u8 gUnknown_08D779D8[]; +extern const u8 gUnknown_08D857A8[]; +extern const u8 gUnknown_08D85A1C[]; +extern const u8 gUnknown_08D85600[]; + +// battle terrains +extern const u8 gBattleTerrainTiles_TallGrass[]; +extern const u8 gBattleTerrainTilemap_TallGrass[]; +extern const u8 gBattleTerrainAnimTiles_TallGrass[]; +extern const u8 gBattleTerrainAnimTilemap_TallGrass[]; +extern const u8 gBattleTerrainPalette_TallGrass[]; +extern const u8 gBattleTerrainTiles_LongGrass[]; +extern const u8 gBattleTerrainTilemap_LongGrass[]; +extern const u8 gBattleTerrainAnimTiles_LongGrass[]; +extern const u8 gBattleTerrainAnimTilemap_LongGrass[]; +extern const u8 gBattleTerrainPalette_LongGrass[]; +extern const u8 gBattleTerrainTiles_Sand[]; +extern const u8 gBattleTerrainTilemap_Sand[]; +extern const u8 gBattleTerrainAnimTiles_Sand[]; +extern const u8 gBattleTerrainAnimTilemap_Sand[]; +extern const u8 gBattleTerrainPalette_Sand[]; +extern const u8 gBattleTerrainTiles_Underwater[]; +extern const u8 gBattleTerrainTilemap_Underwater[]; +extern const u8 gBattleTerrainAnimTiles_Underwater[]; +extern const u8 gBattleTerrainAnimTilemap_Underwater[]; +extern const u8 gBattleTerrainPalette_Underwater[]; +extern const u8 gBattleTerrainTiles_Water[]; +extern const u8 gBattleTerrainTilemap_Water[]; +extern const u8 gBattleTerrainAnimTiles_Water[]; +extern const u8 gBattleTerrainAnimTilemap_Water[]; +extern const u8 gBattleTerrainPalette_Water[]; +extern const u8 gBattleTerrainTiles_PondWater[]; +extern const u8 gBattleTerrainTilemap_PondWater[]; +extern const u8 gBattleTerrainAnimTiles_PondWater[]; +extern const u8 gBattleTerrainAnimTilemap_PondWater[]; +extern const u8 gBattleTerrainPalette_PondWater[]; +extern const u8 gBattleTerrainTiles_Rock[]; +extern const u8 gBattleTerrainTilemap_Rock[]; +extern const u8 gBattleTerrainAnimTiles_Rock[]; +extern const u8 gBattleTerrainAnimTilemap_Rock[]; +extern const u8 gBattleTerrainPalette_Rock[]; +extern const u8 gBattleTerrainTiles_Cave[]; +extern const u8 gBattleTerrainTilemap_Cave[]; +extern const u8 gBattleTerrainAnimTiles_Cave[]; +extern const u8 gBattleTerrainAnimTilemap_Cave[]; +extern const u8 gBattleTerrainPalette_Cave[]; +extern const u8 gBattleTerrainTiles_Building[]; +extern const u8 gBattleTerrainTilemap_Building[]; +extern const u8 gBattleTerrainAnimTiles_Building[]; +extern const u8 gBattleTerrainAnimTilemap_Building[]; +extern const u8 gBattleTerrainPalette_Building[]; +extern const u8 gBattleTerrainPalette_Plain[]; +extern const u8 gBattleTerrainPalette_Frontier[]; +extern const u8 gBattleTerrainTiles_Stadium[]; +extern const u8 gBattleTerrainTilemap_Stadium[]; +extern const u8 gBattleTerrainTiles_Rayquaza[]; +extern const u8 gBattleTerrainTilemap_Rayquaza[]; +extern const u8 gBattleTerrainAnimTiles_Rayquaza[]; +extern const u8 gBattleTerrainAnimTilemap_Rayquaza[]; +extern const u8 gBattleTerrainPalette_Rayquaza[]; +extern const u8 gBattleTerrainPalette_Kyogre[]; +extern const u8 gBattleTerrainPalette_Groudon[]; +extern const u8 gBattleTerrainPalette_BuildingGym[]; +extern const u8 gBattleTerrainPalette_BuildingLeader[]; +extern const u8 gBattleTerrainPalette_StadiumAqua[]; +extern const u8 gBattleTerrainPalette_StadiumMagma[]; +extern const u8 gBattleTerrainPalette_StadiumSidney[]; +extern const u8 gBattleTerrainPalette_StadiumPhoebe[]; +extern const u8 gBattleTerrainPalette_StadiumGlacia[]; +extern const u8 gBattleTerrainPalette_StadiumDrake[]; +extern const u8 gBattleTerrainPalette_StadiumWallace[]; + #endif //GUARD_GRAPHICS_H -- cgit v1.2.3