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/victoryroad1.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/victoryroad1.asm')
| -rwxr-xr-x | scripts/victoryroad1.asm | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index b9b946ad..cebd8070 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -1,5 +1,5 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] call nz, .next @@ -11,14 +11,13 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) ld [W_VICTORYROAD1CURSCRIPT], a ret .next - ld a, [$d869] + ld a, [wd869] bit 7, a ret z ld a, $1d - ld [$d09f], a + ld [wd09f], a ld bc, $604 - ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + predef_jump Func_ee9e VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a) dw VictoryRoad1Script0 @@ -26,15 +25,15 @@ VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a) dw EndTrainerBattle VictoryRoad1Script0: ; 5da40 (17:5a40) - ld a, [$d869] + ld a, [wd869] bit 7, a jp nz, CheckFightingMapTrainers ld hl, CoordsData_5da5c ; $5a5c call CheckBoulderCoords jp nc, CheckFightingMapTrainers - ld hl, $d126 + ld hl, wd126 set 5, [hl] - ld hl, $d869 + ld hl, wd869 set 7, [hl] ret @@ -54,7 +53,7 @@ VictoryRoad1TrainerHeaders: ; 5da6d (17:5a6d) VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d869 ; flag's byte + dw wd869 ; flag's byte dw VictoryRoad1BattleText1 ; 0x5a9a TextBeforeBattle dw VictoryRoad1AfterBattleText1 ; 0x5aa4 TextAfterBattle dw VictoryRoad1EndBattleText1 ; 0x5a9f TextEndBattle @@ -63,7 +62,7 @@ VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d) VictoryRoad1TrainerHeader1: ; 5da79 (17:5a79) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d869 ; flag's byte + dw wd869 ; flag's byte dw VictoryRoad1BattleText2 ; 0x5aa9 TextBeforeBattle dw VictoryRoad1AfterBattleText2 ; 0x5ab3 TextAfterBattle dw VictoryRoad1EndBattleText2 ; 0x5aae TextEndBattle |