diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-20 15:15:32 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-20 15:15:32 -0500 |
| commit | 7b3090e22aefffa464570ac34665ee8e43df873d (patch) | |
| tree | df5bc383b2f1ed2a8ebdd358306f3f9742f41d5c /battle/core.asm | |
| parent | 812976cee6ba39d50583921273ad85195e77be37 (diff) | |
Annotate battle tower text bug
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/battle/core.asm b/battle/core.asm index 008535576..15ee3caa4 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2916,7 +2916,7 @@ ForcePlayerMonChoice: ; 3d227 call ExitMenu call LoadTileMapToTempTileMap call WaitBGMap - call ClearSGB + call GetMemSGBLayout call SetPalettes xor a ld c, a @@ -2935,7 +2935,7 @@ ForcePlayerMonChoice: ; 3d227 call DelayFrame call _LoadHPBar call WriteBackup - call ClearSGB + call GetMemSGBLayout call SetPalettes call SendOutPkmnText call NewBattleMonStatus @@ -5372,7 +5372,7 @@ Function3e299: call _LoadHPBar call WriteBackup call LoadTileMapToTempTileMap - call ClearSGB + call GetMemSGBLayout call SetPalettes jp BattleMenu ; 3e2f5 @@ -5454,7 +5454,7 @@ Function3e358: ; 3e358 call ClearSprites call _LoadHPBar call WriteBackup - call ClearSGB + call GetMemSGBLayout call SetPalettes ld a, [CurPartyMon] ld [CurBattleMon], a @@ -8450,7 +8450,7 @@ Function3f486: ; 3f486 ld hl, EnemyMonDVs predef GetUnownLetter ld de, VTiles2 - predef Function5108b + predef FrontpicPredef pop af ld [CurPartySpecies], a ret @@ -8659,7 +8659,7 @@ InitEnemyWildmon: ; 3f607 ld [wdef4], a .skip_unown ld de, VTiles2 - predef Function5108b + predef FrontpicPredef xor a ld [TrainerClass], a ld [hFillBox], a |