diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /home/trainers.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'home/trainers.asm')
| -rw-r--r-- | home/trainers.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/home/trainers.asm b/home/trainers.asm index 857a95629..4eabfbcbb 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -2,7 +2,7 @@ CheckTrainerBattle2:: ; 3600 ld a, [hROMBank] push af - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank call CheckTrainerBattle pop bc @@ -110,7 +110,7 @@ TalkToTrainer:: ; 3674 ld [EngineBuffer3], a LoadTrainer_continue:: ; 367e - call GetMapScriptHeaderBank + call GetMapScriptsBank ld [EngineBuffer1], a ld a, [hLastTalked] @@ -120,8 +120,8 @@ LoadTrainer_continue:: ; 367e add hl, bc ld a, [EngineBuffer1] call GetFarHalfword - ld de, wTempTrainerHeader - ld bc, wTempTrainerHeaderEnd - wTempTrainerHeader + ld de, wTempTrainer + ld bc, wTempTrainerEnd - wTempTrainer ld a, [EngineBuffer1] call FarCopyBytes xor a @@ -221,7 +221,7 @@ CheckTrainerFlag:: ; 36f5 ld a, [hli] ld h, [hl] ld l, a - call GetMapScriptHeaderBank + call GetMapScriptsBank call GetFarHalfword ld d, h ld e, l @@ -240,7 +240,7 @@ PrintWinLossText:: ; 3718 cp BATTLETYPE_CANLOSE jr .canlose ; ?????????? -; unreferenced +; unused ld hl, wWinTextPointer jr .ok @@ -255,7 +255,7 @@ PrintWinLossText:: ; 3718 ld a, [hli] ld h, [hl] ld l, a - call GetMapScriptHeaderBank + call GetMapScriptsBank call FarPrintText call WaitBGMap call WaitPressAorB_BlinkCursor |