diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/fightingdojo.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/FightingDojo.asm (renamed from scripts/fightingdojo.asm) | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/fightingdojo.asm b/scripts/FightingDojo.asm index 9d28046f..fc691dba 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/FightingDojo.asm @@ -1,7 +1,7 @@ -FightingDojoScript: +FightingDojo_Script: call EnableAutoTextBoxDrawing - ld hl, FightingDojoTrainerHeaders - ld de, FightingDojoScriptPointers + ld hl, FightingDojoTrainerHeader0 + ld de, FightingDojo_ScriptPointers ld a, [wFightingDojoCurScript] call ExecuteCurMapScriptInTable ld [wFightingDojoCurScript], a @@ -14,7 +14,7 @@ FightingDojoScript_5cd70: ld [wCurMapScript], a ret -FightingDojoScriptPointers: +FightingDojo_ScriptPointers: dw FightingDojoScript1 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -80,7 +80,7 @@ FightingDojoScript3: ld [wCurMapScript], a ret -FightingDojoTextPointers: +FightingDojo_TextPointers: dw FightingDojoText1 dw FightingDojoText2 dw FightingDojoText3 @@ -90,7 +90,6 @@ FightingDojoTextPointers: dw FightingDojoText7 dw FightingDojoText8 -FightingDojoTrainerHeaders: FightingDojoTrainerHeader0: dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -303,7 +302,7 @@ FightingDojoText7: jr nz, .done ld a, [wcf91] ld b, a - ld c,30 + ld c, 30 call GivePokemon jr nc, .done SetEvents EVENT_GOT_HITMONCHAN, EVENT_DEFEATED_FIGHTING_DOJO |