diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 20:10:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 20:10:46 -0700 |
| commit | 62388f3bfd5b1abd9fa369628b805e683e64c302 (patch) | |
| tree | 7b57d749b99b491905f1590d7791780a7ff69596 /include | |
| parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) | |
| parent | 09411d29f66c427367a2db3de155fed8c98138f5 (diff) | |
Merge pull request #561 from yenatch/battle-1
almost all of battle_1
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 6 | ||||
| -rw-r--r-- | include/graphics.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/battle.h b/include/battle.h index 544e65b80..d5add3d43 100644 --- a/include/battle.h +++ b/include/battle.h @@ -710,11 +710,11 @@ extern u8 gBattleTextBuff1[]; // asm/battle_1.o void sub_800D6D4(); -void sub_800D74C(); +void ApplyPlayerChosenFrameToBattleMenu(); void DrawMainBattleBackground(void); -void sub_800DAB8(); +void LoadBattleTextboxAndBackground(); void sub_800DE30(u8); -void sub_800E23C(); +void LoadBattleEntryBackground(); // src/battle_2.o void sub_800E7C4(void); diff --git a/include/graphics.h b/include/graphics.h index 889dc3916..b779c2dcd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2634,9 +2634,9 @@ 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[]; +extern const u8 gBattleTextboxTiles[]; +extern const u16 gBattleTextboxTilemap[]; +extern const u8 gBattleTextboxPalette[]; extern const u8 gNamingScreenBackButtonTiles[]; extern const u8 gNamingScreenOKButtonTiles[]; |