diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:38:12 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:38:12 -0500 |
| commit | f4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce (patch) | |
| tree | c5eb931244f739bd3a88d488586923b2a0762b74 /scripts/powerplant.asm | |
| parent | cd649184f556db777d592671a7274bfa4a8423d7 (diff) | |
Rename/organize part 2 of 4
rename functions, clean up address/wram comments, other misc
only broken up so that all changes are viewable on github
Diffstat (limited to 'scripts/powerplant.asm')
| -rwxr-xr-x | scripts/powerplant.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index ec4f89b3..4355c039 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -112,7 +112,7 @@ PowerPlantTrainerHeader8: ; 1e35b (7:635b) db $ff -asm_234cc: ; 1e368 (7:6368) +InitVoltorbBattle: ; 1e368 (7:6368) call TalkToTrainer ld a, [W_CURMAPSCRIPT] ld [W_POWERPLANTCURSCRIPT], a @@ -120,48 +120,48 @@ asm_234cc: ; 1e368 (7:6368) PowerPlantText1: ; 1e374 (7:6374) db $8 ; asm - ld hl, PowerPlantTrainerHeader0 ; $62fb - jr asm_234cc ; 0x1e378 $ee + ld hl, PowerPlantTrainerHeader0 + jr InitVoltorbBattle PowerPlantText2: ; 1e37a (7:637a) db $8 ; asm - ld hl, PowerPlantTrainerHeader1 ; $6307 - jr asm_234cc ; 0x1e37e $e8 + ld hl, PowerPlantTrainerHeader1 + jr InitVoltorbBattle PowerPlantText3: ; 1e380 (7:6380) db $8 ; asm - ld hl, PowerPlantTrainerHeader2 ; $6313 - jr asm_234cc ; 0x1e384 $e2 + ld hl, PowerPlantTrainerHeader2 + jr InitVoltorbBattle PowerPlantText4: ; 1e386 (7:6386) db $8 ; asm - ld hl, PowerPlantTrainerHeader3 ; $631f - jr asm_234cc ; 0x1e38a $dc + ld hl, PowerPlantTrainerHeader3 + jr InitVoltorbBattle PowerPlantText5: ; 1e38c (7:638c) db $8 ; asm - ld hl, PowerPlantTrainerHeader4 ; $632b - jr asm_234cc ; 0x1e390 $d6 + ld hl, PowerPlantTrainerHeader4 + jr InitVoltorbBattle PowerPlantText6: ; 1e392 (7:6392) db $8 ; asm - ld hl, PowerPlantTrainerHeader5 ; $6337 - jr asm_234cc ; 0x1e396 $d0 + ld hl, PowerPlantTrainerHeader5 + jr InitVoltorbBattle PowerPlantText7: ; 1e398 (7:6398) db $8 ; asm - ld hl, PowerPlantTrainerHeader6 ; $6343 - jr asm_234cc ; 0x1e39c $ca + ld hl, PowerPlantTrainerHeader6 + jr InitVoltorbBattle PowerPlantText8: ; 1e39e (7:639e) db $8 ; asm - ld hl, PowerPlantTrainerHeader7 ; $634f - jr asm_234cc ; 0x1e3a2 $c4 + ld hl, PowerPlantTrainerHeader7 + jr InitVoltorbBattle PowerPlantText9: ; 1e3a4 (7:63a4) db $8 ; asm - ld hl, PowerPlantTrainerHeader8 ; $635b - jr asm_234cc ; 0x1e3a8 $be + ld hl, PowerPlantTrainerHeader8 + jr InitVoltorbBattle VoltorbBattleText: ; 1e3aa (7:63aa) TX_FAR _VoltorbBattleText |