From f66d0dfce3e8642aa08838e843cb4846e9268e71 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 22 Feb 2020 11:08:23 -0500 Subject: Move graphics.s through pokemon to src --- include/graphics.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index 467a1d461..7d1d6e9c9 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2879,7 +2879,7 @@ extern const u16 gTMCaseMainWindowPalette[]; // egg_hatch extern const u32 gBattleTextboxTiles[]; -extern const u32 gFile_graphics_interface_menu_map_tilemap[]; +extern const u32 gBattleTextboxTilemap[]; extern const u32 gBattleTextboxPalette[]; extern const u32 gTradeGba2_Pal[]; extern const u32 gTradeGba_Gfx[]; @@ -4314,7 +4314,7 @@ extern const u32 gHealthboxSafariGfx[]; extern const u32 gBlankGfxCompressed[]; extern const u16 gBattleInterface_BallStatusBarPal[]; extern const u16 gBattleInterface_BallDisplayPal[]; -extern const u32 gFile_graphics_interface_hp_numbers[]; +extern const u32 gInterfaceGfx_HPNumbers[]; extern const u32 gGhostFrontPic[]; extern const u32 gGhostPalette[]; extern const u32 gSubstituteDollGfx[]; -- cgit v1.2.3 From 890d85ff029feb6509bca88ba913580c5c0cd56c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 23 Feb 2020 16:26:33 -0500 Subject: battle_bg --- 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 7d1d6e9c9..fdee97c82 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4875,4 +4875,10 @@ extern const u32 gLinkMiscMenu_Tilemap[]; // union_room_chat_objects extern const u32 gUnionRoomChatIcons[]; +//battle_bg +extern const u32 gFile_graphics_battle_transitions_vs_frame_sheet[]; +extern const u32 gFile_graphics_battle_transitions_vs_sheet[]; +extern const u32 gFile_graphics_battle_transitions_vs_frame_palette[]; +extern const u32 gFile_graphics_battle_transitions_vs_frame_tilemap[]; + #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 9e1b0319b2afd066a646629117c4fa28bd40903c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 23 Feb 2020 21:06:59 -0500 Subject: Name battle terrains; address review comments --- include/graphics.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index fdee97c82..dcc4c44a7 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4877,7 +4877,7 @@ extern const u32 gUnionRoomChatIcons[]; //battle_bg extern const u32 gFile_graphics_battle_transitions_vs_frame_sheet[]; -extern const u32 gFile_graphics_battle_transitions_vs_sheet[]; +extern const u32 gVsLettersGfx[]; extern const u32 gFile_graphics_battle_transitions_vs_frame_palette[]; extern const u32 gFile_graphics_battle_transitions_vs_frame_tilemap[]; -- cgit v1.2.3 From 968ac4742adbc86148e344c7c0cb9b9f27addc6c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 27 Feb 2020 17:15:27 -0500 Subject: Sync trainer_card.c --- include/graphics.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index dcc4c44a7..1405cdcf1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4845,10 +4845,10 @@ extern const u32 gBuyMenuFrame_Pal[]; extern const u16 gUnknown_8D2FBB4[]; // trainer card -extern const u16 gFireRedTrainerCard_Pal[]; -extern const u32 gFireRedTrainerCard_Gfx[]; -extern const u16 gEmeraldTrainerCard_Pal[]; -extern const u32 gEmeraldTrainerCard_Gfx[]; +extern const u16 gKantoTrainerCard_Pal[]; +extern const u32 gKantoTrainerCard_Gfx[]; +extern const u16 gHoennTrainerCard_Pal[]; +extern const u32 gHoennTrainerCard_Gfx[]; // battle_interface extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[]; -- cgit v1.2.3 From 8a7c2ded11a2adf4f09ddca814eb06fdbca13fd1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 3 Mar 2020 12:24:18 -0500 Subject: Port berry_crush_3 from Emerald --- include/graphics.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index 1405cdcf1..2c3aa7c4b 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4875,10 +4875,15 @@ extern const u32 gLinkMiscMenu_Tilemap[]; // union_room_chat_objects extern const u32 gUnionRoomChatIcons[]; -//battle_bg +// battle_bg extern const u32 gFile_graphics_battle_transitions_vs_frame_sheet[]; extern const u32 gVsLettersGfx[]; extern const u32 gFile_graphics_battle_transitions_vs_frame_palette[]; extern const u32 gFile_graphics_battle_transitions_vs_frame_tilemap[]; +// berry_crush +extern const u16 gUnknown_8EAFEA0[]; +extern const u32 gUnknown_8EAFFC0[]; +extern const u32 gUnknown_8EB0ADC[]; + #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 6ce70985ebcb78267290e35e65aadb6a433c1cba Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 12:37:18 -0500 Subject: through sub_8100B70 --- 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 2c3aa7c4b..5bac692a4 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4886,4 +4886,8 @@ extern const u16 gUnknown_8EAFEA0[]; extern const u32 gUnknown_8EAFFC0[]; extern const u32 gUnknown_8EB0ADC[]; +// easy_chat_3 +extern const u32 gEasyChatWindow_Gfx[]; +extern const u32 gEasyChatWindow_Tilemap[]; + #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From ab1d075682a34164ed82810108f909e1f9b46390 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 18:05:54 -0500 Subject: through sub_8101558 --- 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 5bac692a4..2b449ea94 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4889,5 +4889,6 @@ extern const u32 gUnknown_8EB0ADC[]; // easy_chat_3 extern const u32 gEasyChatWindow_Gfx[]; extern const u32 gEasyChatWindow_Tilemap[]; +extern const u32 gEasyChatMode_Pal[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 40e4ef8f77caf47932d3b2c75481be9680eeea17 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 20:46:29 -0500 Subject: through sub_8101BA8 --- 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 2b449ea94..19f2ad4a8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4890,5 +4890,9 @@ extern const u32 gUnknown_8EB0ADC[]; extern const u32 gEasyChatWindow_Gfx[]; extern const u32 gEasyChatWindow_Tilemap[]; extern const u32 gEasyChatMode_Pal[]; +extern const u16 gUnknown_8E99F24[]; +extern const u32 gUnknown_8E9BD28[]; +extern const u32 gUnknown_8E99F44[]; +extern const u32 gUnknown_8E9A168[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From a9b72fbd7f00a1337c2f91f57d83110dbaeb1fa5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Mar 2020 12:32:34 -0400 Subject: Document Easy Chat 2/3 --- include/graphics.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index 19f2ad4a8..a61d5f62f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4891,8 +4891,8 @@ extern const u32 gEasyChatWindow_Gfx[]; extern const u32 gEasyChatWindow_Tilemap[]; extern const u32 gEasyChatMode_Pal[]; extern const u16 gUnknown_8E99F24[]; -extern const u32 gUnknown_8E9BD28[]; -extern const u32 gUnknown_8E99F44[]; -extern const u32 gUnknown_8E9A168[]; +extern const u32 gEasyChatRedRectangularCursor_Tiles[]; +extern const u32 gEasyChatSelectGroupHelp_Tiles[]; +extern const u32 gEasyChatModeIcons_Tiles[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 0fdffabbc8682c347694aa06f9fb7a7a8aad4e8e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Mar 2020 14:28:13 -0400 Subject: through pokemon_store --- 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 a61d5f62f..f85b95bad 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4895,4 +4895,9 @@ extern const u32 gEasyChatRedRectangularCursor_Tiles[]; extern const u32 gEasyChatSelectGroupHelp_Tiles[]; extern const u32 gEasyChatModeIcons_Tiles[]; +// naming_screen +extern const u32 gUnknown_8E982BC[]; +extern const u32 gUnknown_8E98458[]; +extern const u32 gUnknown_8E98398[]; + #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 98d63a5268258a7f83ee776300dd4a664ad45f59 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 10 Mar 2020 09:55:29 -0400 Subject: through NamingScreen_CreateRivalIcon --- 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 f85b95bad..a61250ea8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4899,5 +4899,6 @@ extern const u32 gEasyChatModeIcons_Tiles[]; extern const u32 gUnknown_8E982BC[]; extern const u32 gUnknown_8E98458[]; extern const u32 gUnknown_8E98398[]; +extern const u16 gUnknown_8E98004[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 9aa9c22a7f73afa710c26144a0a4da50b7cdadf9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 10 Mar 2020 11:32:18 -0400 Subject: Finish naming_screen --- include/graphics.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'include/graphics.h') diff --git a/include/graphics.h b/include/graphics.h index a61250ea8..d84371e3a 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4899,6 +4899,22 @@ extern const u32 gEasyChatModeIcons_Tiles[]; extern const u32 gUnknown_8E982BC[]; extern const u32 gUnknown_8E98458[]; extern const u32 gUnknown_8E98398[]; +extern const u32 gUnknown_8E98518[]; +extern const u32 gNamingScreenMenu_Gfx[]; extern const u16 gUnknown_8E98004[]; +extern const u16 gUnknown_8E97FE4[]; +extern const u16 gNamingScreenMenu_Pal[]; +extern const u16 gUnknown_8E98858[]; +extern const u16 gUnknown_8E98A38[]; +extern const u16 gUnknown_8E985D8[]; +extern const u16 gUnknown_8E98FD8[]; +extern const u16 gUnknown_8E98C18[]; +extern const u16 gUnknown_8E98CB8[]; +extern const u16 gUnknown_8E98D58[]; +extern const u16 gUnknown_8E98DF8[]; +extern const u16 gUnknown_8E98E98[]; +extern const u16 gUnknown_8E98F38[]; +extern const u16 gUnknown_8E990D8[]; +extern const u16 gUnknown_8E990F8[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3