From ad7a7222a538380b446f9aecde44c5222ff3b68a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 6 Jul 2017 19:25:06 -0500 Subject: decompile sub_80A34B4 - ClearBag --- include/graphics.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index c3fe20996..fc0cc3adf 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2435,4 +2435,10 @@ extern const u8 gMonFrontPic_UnownQuestionMark[]; extern const u8 gMonBackPic_UnownQuestionMark[]; extern const u8 gMonIcon_UnownQuestionMark[]; +// data/graphics.s +extern const u8 gBagScreen_Gfx[]; +extern const u8 gBagScreenMale_Pal[]; +extern const u8 gBagScreenFemale_Pal[]; +extern const u16 gUnknown_08E77004[]; + #endif // GUARD_GRAPHICS_H -- cgit v1.2.3 From 9a57e785576c658980e7cac5d3531181ccc64d42 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 8 Jul 2017 12:16:19 -0500 Subject: decompile sub_80A3740 - swap32 --- include/graphics.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index 4d042b3b6..12ffd16fe 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2440,12 +2440,16 @@ extern const u8 gBagScreen_Gfx[]; extern const u8 gBagScreenMale_Pal[]; extern const u8 gBagScreenFemale_Pal[]; extern const u16 gUnknown_08E77004[]; - +extern const u8 gBuyMenuFrame_Gfx[]; +extern const u8 gMenuMoneyPal[]; +extern const u8 gBuyMenuFrame_Tilemap[]; +extern const u8 gMenuMoneyGfx[]; extern const u8 gMenuPokeblock_Gfx[]; -extern const u8 gMenuPokeblock_Tilemap[]; extern const u8 gMenuPokeblock_Pal[]; - extern const u8 gMenuPokeblockDevice_Gfx[]; extern const u8 gMenuPokeblockDevice_Pal[]; +extern const u8 gMenuPokeblock_Tilemap[]; + +extern const u8 gUnknown_08E96EC8[]; #endif // GUARD_GRAPHICS_H -- cgit v1.2.3 From 24ac9f1767a988278712911d24b5cd7bad7e45ae Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 10 Jul 2017 18:14:18 -0500 Subject: finish decompiling item_menu --- include/graphics.h | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index 12ffd16fe..fb9781147 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2436,6 +2436,9 @@ extern const u8 gMonBackPic_UnownQuestionMark[]; extern const u8 gMonIcon_UnownQuestionMark[]; // data/graphics.s +extern const u8 gBagMaleTiles[]; +extern const u8 gBagFemaleTiles[]; +extern const u8 gBagPalette[]; extern const u8 gBagScreen_Gfx[]; extern const u8 gBagScreenMale_Pal[]; extern const u8 gBagScreenFemale_Pal[]; @@ -2450,6 +2453,100 @@ extern const u8 gMenuPokeblockDevice_Gfx[]; extern const u8 gMenuPokeblockDevice_Pal[]; extern const u8 gMenuPokeblock_Tilemap[]; +extern const u8 gBerryCheck_Gfx[]; +extern const u8 gBerryCheck_Pal[]; +extern const u8 gUnknown_08E788E4[]; +extern const u8 gUnknown_08E78A84[]; +extern const u8 gBerryCheckCircle_Gfx[]; + +// data/graphics/berries/graphics.inc +extern const u8 gBerryPic_Cheri[]; +extern const u8 gBerryPic_Oran[]; +extern const u8 gBerryPic_Pecha[]; +extern const u8 gBerryPic_Rawst[]; +extern const u8 gBerryPic_Aspear[]; +extern const u8 gBerryPic_Leppa[]; +extern const u8 gBerryPic_Chesto[]; +extern const u8 gBerryPic_Persim[]; +extern const u8 gBerryPic_Lum[]; +extern const u8 gBerryPic_Sitrus[]; +extern const u8 gBerryPic_Figy[]; +extern const u8 gBerryPic_Wiki[]; +extern const u8 gBerryPic_Mago[]; +extern const u8 gBerryPic_Aguav[]; +extern const u8 gBerryPic_Iapapa[]; +extern const u8 gBerryPic_Razz[]; +extern const u8 gBerryPic_Bluk[]; +extern const u8 gBerryPic_Nanab[]; +extern const u8 gBerryPic_Wepear[]; +extern const u8 gBerryPic_Pinap[]; +extern const u8 gBerryPic_Pomeg[]; +extern const u8 gBerryPic_Kelpsy[]; +extern const u8 gBerryPic_Qualot[]; +extern const u8 gBerryPic_Hondew[]; +extern const u8 gBerryPic_Grepa[]; +extern const u8 gBerryPic_Tamato[]; +extern const u8 gBerryPic_Cornn[]; +extern const u8 gBerryPic_Magost[]; +extern const u8 gBerryPic_Rabuta[]; +extern const u8 gBerryPic_Nomel[]; +extern const u8 gBerryPic_Spelon[]; +extern const u8 gBerryPic_Pamtre[]; +extern const u8 gBerryPic_Watmel[]; +extern const u8 gBerryPic_Durin[]; +extern const u8 gBerryPic_Belue[]; +extern const u8 gBerryPic_Liechi[]; +extern const u8 gBerryPic_Ganlon[]; +extern const u8 gBerryPic_Salac[]; +extern const u8 gBerryPic_Petaya[]; +extern const u8 gBerryPic_Apicot[]; +extern const u8 gBerryPic_Lansat[]; +extern const u8 gBerryPic_Starf[]; +extern const u8 gBerryPic_Enigma[]; +extern const u8 gBerryPalette_Cheri[]; +extern const u8 gBerryPalette_Oran[]; +extern const u8 gBerryPalette_Pecha[]; +extern const u8 gBerryPalette_Rawst[]; +extern const u8 gBerryPalette_Aspear[]; +extern const u8 gBerryPalette_Leppa[]; +extern const u8 gBerryPalette_Chesto[]; +extern const u8 gBerryPalette_Persim[]; +extern const u8 gBerryPalette_Lum[]; +extern const u8 gBerryPalette_Sitrus[]; +extern const u8 gBerryPalette_Figy[]; +extern const u8 gBerryPalette_Wiki[]; +extern const u8 gBerryPalette_Mago[]; +extern const u8 gBerryPalette_Aguav[]; +extern const u8 gBerryPalette_Iapapa[]; +extern const u8 gBerryPalette_Razz[]; +extern const u8 gBerryPalette_Bluk[]; +extern const u8 gBerryPalette_Nanab[]; +extern const u8 gBerryPalette_Wepear[]; +extern const u8 gBerryPalette_Pinap[]; +extern const u8 gBerryPalette_Pomeg[]; +extern const u8 gBerryPalette_Kelpsy[]; +extern const u8 gBerryPalette_Qualot[]; +extern const u8 gBerryPalette_Hondew[]; +extern const u8 gBerryPalette_Grepa[]; +extern const u8 gBerryPalette_Tamato[]; +extern const u8 gBerryPalette_Cornn[]; +extern const u8 gBerryPalette_Magost[]; +extern const u8 gBerryPalette_Rabuta[]; +extern const u8 gBerryPalette_Nomel[]; +extern const u8 gBerryPalette_Spelon[]; +extern const u8 gBerryPalette_Pamtre[]; +extern const u8 gBerryPalette_Watmel[]; +extern const u8 gBerryPalette_Durin[]; +extern const u8 gBerryPalette_Belue[]; +extern const u8 gBerryPalette_Liechi[]; +extern const u8 gBerryPalette_Ganlon[]; +extern const u8 gBerryPalette_Salac[]; +extern const u8 gBerryPalette_Petaya[]; +extern const u8 gBerryPalette_Apicot[]; +extern const u8 gBerryPalette_Lansat[]; +extern const u8 gBerryPalette_Starf[]; +extern const u8 gBerryPalette_Enigma[]; + extern const u8 gUnknown_08E96EC8[]; #endif // GUARD_GRAPHICS_H -- cgit v1.2.3 From 5dddba1eeba45b5f9a5aff8e3751df1d6e7d9d89 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 14 Jul 2017 15:43:19 -0500 Subject: finish decompiling trainer_card (except two functions) --- include/graphics.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index 36b11fd0a..e448d60ce 100755 --- a/include/graphics.h +++ b/include/graphics.h @@ -2443,4 +2443,15 @@ extern const u8 gMenuPokeblock_Pal[]; extern const u8 gMenuPokeblockDevice_Gfx[]; extern const u8 gMenuPokeblockDevice_Pal[]; +extern const u8 gMenuTrainerCard_Gfx[]; +extern const u16 gMenuTrainerCard0Star_Pal[]; +extern const u16 gMenuTrainerCard1Star_Pal[]; +extern const u16 gMenuTrainerCard2Star_Pal[]; +extern const u16 gMenuTrainerCard3Star_Pal[]; +extern const u16 gMenuTrainerCard4Star_Pal[]; +extern const u8 gUnknown_08E8CAC0[]; +extern const u8 gUnknown_08E8CFC0[]; +extern const u8 gUnknown_08E8D4C0[]; +extern const u8 gUnknown_08E8D9C0[]; + #endif // GUARD_GRAPHICS_H -- cgit v1.2.3 From a1d0d153c025dab893930265e88b3e4d8c917a7a Mon Sep 17 00:00:00 2001 From: drifloony Date: Sun, 16 Jul 2017 21:53:57 -0700 Subject: move ROM data into pokemon_icon.c --- include/graphics.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index fb9781147..8a205b0dd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2435,6 +2435,10 @@ extern const u8 gMonFrontPic_UnownQuestionMark[]; extern const u8 gMonBackPic_UnownQuestionMark[]; extern const u8 gMonIcon_UnownQuestionMark[]; +extern const u8 gMonIcon_QuestionMark[]; +extern const u8 gMonIcon_Egg[]; +extern const u16 gMonIconPalettes[][16]; + // data/graphics.s extern const u8 gBagMaleTiles[]; extern const u8 gBagFemaleTiles[]; -- cgit v1.2.3 From d3dca02924bc19bff355feb74a667707751bcc8f Mon Sep 17 00:00:00 2001 From: scnorton Date: Thu, 31 Aug 2017 13:46:14 -0400 Subject: Nonmatching sub_8047D58 --- 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 5632cb831..72688ec44 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2564,4 +2564,7 @@ extern const u8 gUnknown_08E8CFC0[]; extern const u8 gUnknown_08E8D4C0[]; extern const u8 gUnknown_08E8D9C0[]; +extern const u8 gUnknown_08EA1DEC[]; +extern const u16 gUnknown_08EA0328[]; + #endif // GUARD_GRAPHICS_H -- cgit v1.2.3 From ff1da361388c9f38813e6622839e702740b2974c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 1 Sep 2017 22:02:57 -0400 Subject: nonmatching sub_8048B0C --- include/graphics.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index 72688ec44..09ef5343c 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2566,5 +2566,7 @@ extern const u8 gUnknown_08E8D9C0[]; extern const u8 gUnknown_08EA1DEC[]; extern const u16 gUnknown_08EA0328[]; - +extern const u16 gUnknown_08EA02C8[]; +extern const u16 gUnknown_08EA0348[]; +extern const u16 gUnknown_08EA15C8[]; #endif // GUARD_GRAPHICS_H -- cgit v1.2.3 From e32ae86756636812ab899b543ebe4c943459cd49 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 2 Sep 2017 20:06:47 -0400 Subject: sub_804A51C --- 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 09ef5343c..b196cfe1c 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2569,4 +2569,5 @@ extern const u16 gUnknown_08EA0328[]; extern const u16 gUnknown_08EA02C8[]; extern const u16 gUnknown_08EA0348[]; extern const u16 gUnknown_08EA15C8[]; +extern const u16 gTradeMonBoxTilemap[]; #endif // GUARD_GRAPHICS_H -- cgit v1.2.3 From 92f40d920b26a13dfc7a3756382cdf97aff08288 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 3 Sep 2017 13:02:20 -0400 Subject: sub_804E22C --- 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 b196cfe1c..f3a722b40 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2570,4 +2570,7 @@ extern const u16 gUnknown_08EA02C8[]; extern const u16 gUnknown_08EA0348[]; extern const u16 gUnknown_08EA15C8[]; extern const u16 gTradeMonBoxTilemap[]; +extern const u8 gUnknown_08D00000[]; +extern const u16 gUnknown_08D00524[]; +extern const u8 gUnknown_08D004E0[]; #endif // GUARD_GRAPHICS_H -- cgit v1.2.3