diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-02-23 16:26:33 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-02-23 16:26:33 -0500 |
| commit | 890d85ff029feb6509bca88ba913580c5c0cd56c (patch) | |
| tree | fe26d75515206a7dbf214418c00a9b2068b60319 /include | |
| parent | 9aaafa84871e7bcc553d3eda680415545a337eee (diff) | |
battle_bg
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_bg.h | 2 | ||||
| -rw-r--r-- | include/battle_message.h | 4 | ||||
| -rw-r--r-- | include/graphics.h | 6 | ||||
| -rw-r--r-- | include/overworld.h | 1 |
4 files changed, 12 insertions, 1 deletions
diff --git a/include/battle_bg.h b/include/battle_bg.h index 60a6de8f5..518c566dc 100644 --- a/include/battle_bg.h +++ b/include/battle_bg.h @@ -7,7 +7,7 @@ extern const struct BgTemplate gBattleBgTemplates[]; void InitBattleBgsVideo(void); void DrawBattleEntryBackground(void); -void sub_800F6FC(u8 taskId); +void InitLinkBattleVsScreen(u8 taskId); void LoadBattleMenuWindowGfx(void); void LoadBattleTextboxAndBackground(void); void sub_800F324(void); diff --git a/include/battle_message.h b/include/battle_message.h index 2e2baa278..5a16a4250 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -251,4 +251,8 @@ extern const u8 gUnknown_83FE864[]; extern const u8 gText_SafariBalls[]; extern const u8 gText_HighlightRed_Left[]; +extern const u8 gText_Win[]; +extern const u8 gText_Loss[]; +extern const u8 gText_Draw[]; + #endif // GUARD_BATTLE_MESSAGE_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 diff --git a/include/overworld.h b/include/overworld.h index 8242615c7..f0a168052 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -176,6 +176,7 @@ void sub_8056078(void *, void *); void sub_805546C(u8 a0); bool32 sub_80582E0(void); bool32 sub_8058274(void); +u8 GetCurrentMapBattleScene(void); extern u16 gHeldKeyCodeToSend; |