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/silphco5.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/silphco5.asm')
| -rwxr-xr-x | scripts/silphco5.asm | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index 0b63708b..4417466d 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -18,7 +18,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) call SilphCo5Script_19f9e ld a, [wd82c] bit 0, a - jr nz, .asm_19f74 ; 0x19f63 $f + jr nz, .asm_19f74 push af ld a, $5f ld [wd09f], a @@ -27,7 +27,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) pop af .asm_19f74 bit 1, a - jr nz, .asm_19f87 ; 0x19f76 $f + jr nz, .asm_19f87 push af ld a, $5f ld [wd09f], a @@ -42,7 +42,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) ld bc, $0507 predef_jump ReplaceTileBlock -SilphCo5Coords: ; 19f97 (6:5f97) ; coords? +SilphCo5Coords: ; 19f97 (6:5f97) db $02, $03, $06, $03, $05, $07, $ff SilphCo5Script_19f9e: ; 19f9e (6:5f9e) @@ -51,12 +51,12 @@ SilphCo5Script_19f9e: ; 19f9e (6:5f9e) and a ret z cp $1 - jr nz, .asm_19fac ; 0x19fa7 $3 + jr nz, .asm_19fac set 0, [hl] ret .asm_19fac cp $2 - jr nz, .asm_19fb3 ; 0x19fae $3 + jr nz, .asm_19fb3 set 1, [hl] ret .asm_19fb3 @@ -86,37 +86,37 @@ Silphco5TrainerHeader0: ; 19fd2 (6:5fd2) db $2 ; flag's bit db ($1 << 4) ; trainer's view range dw wd82b ; flag's byte - dw SilphCo5BattleText2 ; 0x6024 TextBeforeBattle - dw SilphCo5AfterBattleText2 ; 0x602e TextAfterBattle - dw SilphCo5EndBattleText2 ; 0x6029 TextEndBattle - dw SilphCo5EndBattleText2 ; 0x6029 TextEndBattle + dw SilphCo5BattleText2 ; TextBeforeBattle + dw SilphCo5AfterBattleText2 ; TextAfterBattle + dw SilphCo5EndBattleText2 ; TextEndBattle + dw SilphCo5EndBattleText2 ; TextEndBattle Silphco5TrainerHeader2: ; 19fde (6:5fde) db $3 ; flag's bit db ($2 << 4) ; trainer's view range dw wd82b ; flag's byte - dw SilphCo5BattleText3 ; 0x603d TextBeforeBattle - dw SilphCo5AfterBattleText3 ; 0x6047 TextAfterBattle - dw SilphCo5EndBattleText3 ; 0x6042 TextEndBattle - dw SilphCo5EndBattleText3 ; 0x6042 TextEndBattle + dw SilphCo5BattleText3 ; TextBeforeBattle + dw SilphCo5AfterBattleText3 ; TextAfterBattle + dw SilphCo5EndBattleText3 ; TextEndBattle + dw SilphCo5EndBattleText3 ; TextEndBattle Silphco5TrainerHeader3: ; 19fea (6:5fea) db $4 ; flag's bit db ($4 << 4) ; trainer's view range dw wd82b ; flag's byte - dw SilphCo5BattleText4 ; 0x6056 TextBeforeBattle - dw SilphCo5AfterBattleText4 ; 0x6060 TextAfterBattle - dw SilphCo5EndBattleText4 ; 0x605b TextEndBattle - dw SilphCo5EndBattleText4 ; 0x605b TextEndBattle + dw SilphCo5BattleText4 ; TextBeforeBattle + dw SilphCo5AfterBattleText4 ; TextAfterBattle + dw SilphCo5EndBattleText4 ; TextEndBattle + dw SilphCo5EndBattleText4 ; TextEndBattle Silphco5TrainerHeader4: ; 19ff6 (6:5ff6) db $5 ; flag's bit db ($3 << 4) ; trainer's view range dw wd82b ; flag's byte - dw SilphCo5BattleText5 ; 0x606f TextBeforeBattle - dw SilphCo5AfterBattleText5 ; 0x6079 TextAfterBattle - dw SilphCo5EndBattleText5 ; 0x6074 TextEndBattle - dw SilphCo5EndBattleText5 ; 0x6074 TextEndBattle + dw SilphCo5BattleText5 ; TextBeforeBattle + dw SilphCo5AfterBattleText5 ; TextAfterBattle + dw SilphCo5EndBattleText5 ; TextEndBattle + dw SilphCo5EndBattleText5 ; TextEndBattle db $ff |