diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /scripts/silphco10.asm | |
| parent | 15427f532085846ab6b51719be687951a094cb6c (diff) | |
| parent | 9f29f21d9d43baa7124991dcf3b093fc6c615706 (diff) | |
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'scripts/silphco10.asm')
| -rwxr-xr-x | scripts/silphco10.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index ede60acc..c831655f 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -9,21 +9,20 @@ SilphCo10Script: ; 5a139 (16:6139) ret SilphCo10Script_5a14f: ; 5a14f (16:614f) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, DataTable_5a173 ; $6173 call SilphCo2Script_59d43 call SilphCo10Text_5a176 - ld a, [$d836] + ld a, [wd836] bit 0, a ret nz ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $405 - ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + predef_jump Func_ee9e DataTable_5a173: ; 5a173 (16:6173) db $04,$05,$FF @@ -32,7 +31,7 @@ SilphCo10Text_5a176: ; 5a176 (16:6176) ld a, [$ffe0] and a ret z - ld hl, $d836 + ld hl, wd836 set 0, [hl] ret @@ -53,7 +52,7 @@ SilphCo10TrainerHeaders: ; 5a192 (16:6192) SilphCo10TrainerHeader0: ; 5a192 (16:6192) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d835 ; flag's byte + dw wd835 ; flag's byte dw SilphCo10BattleText1 ; 0x61dd TextBeforeBattle dw SilphCo10AfterBattleText1 ; 0x61e7 TextAfterBattle dw SilphCo10EndBattleText1 ; 0x61e2 TextEndBattle @@ -62,7 +61,7 @@ SilphCo10TrainerHeader0: ; 5a192 (16:6192) SilphCo10TrainerHeader1: ; 5a19e (16:619e) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d835 ; flag's byte + dw wd835 ; flag's byte dw SilphCo10BattleText2 ; 0x61ec TextBeforeBattle dw SilphCo10AfterBattleText2 ; 0x61f6 TextAfterBattle dw SilphCo10EndBattleText2 ; 0x61f1 TextEndBattle @@ -84,7 +83,7 @@ SilphCo10Text2: ; 5a1b5 (16:61b5) SilphCo10Text3: ; 5a1bf (16:61bf) db $08 ; asm - ld a, [$d838] + ld a, [wd838] bit 7, a ld hl, SilphCo10Text_5a1d8 jr nz, .asm_cf85f |