diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/PowerPlant.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/PowerPlant.asm (renamed from scripts/powerplant.asm) | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/powerplant.asm b/scripts/PowerPlant.asm index c7a5625f..f720b6f8 100755 --- a/scripts/powerplant.asm +++ b/scripts/PowerPlant.asm @@ -1,18 +1,18 @@ -PowerPlantScript: +PowerPlant_Script: call EnableAutoTextBoxDrawing - ld hl, PowerPlantTrainerHeaders - ld de, .ScriptPointers + ld hl, Voltorb0TrainerHeader + ld de, PowerPlant_ScriptPointers ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable ld [wPowerPlantCurScript], a ret -.ScriptPointers +PowerPlant_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PowerPlantTextPointers: +PowerPlant_TextPointers: dw Voltorb0Text dw Voltorb1Text dw Voltorb2Text @@ -28,7 +28,6 @@ PowerPlantTextPointers: dw PickUpItemText dw PickUpItemText -PowerPlantTrainerHeaders: Voltorb0TrainerHeader: dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0 db 0 ; view range |