diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
| commit | ce3ec76762d9e2f0c560e2ea7868678418883143 (patch) | |
| tree | 13bd307196f870d59157ab803c858c205eba6921 /engine/palettes.asm | |
| parent | Remove more address comments (diff) | |
| parent | Merge pull request #16 from YamaArashi/master (diff) | |
| download | pokeyellow-ce3ec76762d9e2f0c560e2ea7868678418883143.tar.gz pokeyellow-ce3ec76762d9e2f0c560e2ea7868678418883143.tar.xz pokeyellow-ce3ec76762d9e2f0c560e2ea7868678418883143.zip | |
Merge branch 'master' of https://github.com/pret/pokeyellow into merge-pokered
Diffstat (limited to 'engine/palettes.asm')
| -rwxr-xr-x | engine/palettes.asm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engine/palettes.asm b/engine/palettes.asm index d3fd0050..a9d8908c 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -181,19 +181,15 @@ SetPal_Overworld: ld a, SET_PAL_OVERWORLD ld [wDefaultPaletteCommand], a ret - .PokemonTowerOrAgatha ld a, PAL_GREYMON - 1 jr .town - .caveOrBruno ld a, PAL_CAVE - 1 jr .town - .Lorelei xor a jr .town - .trade_center_colosseum ld a, PAL_GREYMON - 1 jr .town @@ -535,9 +531,8 @@ _SendSGBPacket: ; set P14=HIGH, P15=HIGH ld a, $30 ld [rJOYP], a - call Wait7000 ; wait for about 70000 cycles -; call Wait7000 + call Wait7000 ; restore (previously pushed) number of packets pop bc dec b @@ -613,6 +608,7 @@ PrepareSuperNintendoVRAMTransfer: dw DataSnd_72911 CheckSGB: +; Returns whether the game is running on an SGB in carry. ld hl, MltReq2Packet call SendSGBPacket call Wait7000 |