diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-05 14:01:18 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-05 15:10:39 -0500 |
| commit | d48ea223eaad84af95e4f29043c279b56aa4ae88 (patch) | |
| tree | 2fd8807ed257d9d9f03e351c2d6a71d7b208d671 /engine | |
| parent | Merge branch 'master' of https://github.com/iimarckus/pokered (diff) | |
| download | pokeyellow-d48ea223eaad84af95e4f29043c279b56aa4ae88.tar.gz pokeyellow-d48ea223eaad84af95e4f29043c279b56aa4ae88.tar.xz pokeyellow-d48ea223eaad84af95e4f29043c279b56aa4ae88.zip | |
Fix a lot of bugs
Diffstat (limited to '')
| -rw-r--r-- | engine/bank3c/main.asm (renamed from yellow/bank3c/main.asm) | 2 | ||||
| -rw-r--r-- | engine/bank3c/overworld.asm (renamed from yellow/bank3c/overworld.asm) | 0 | ||||
| -rw-r--r-- | engine/bank3d/random.asm (renamed from yellow/bank3d/random.asm) | 2 | ||||
| -rw-r--r-- | engine/bank3f/data/map_header_banks.asm (renamed from yellow/bank3f/data/map_header_banks.asm) | 0 | ||||
| -rw-r--r-- | engine/bank3f/data/map_header_pointers.asm (renamed from yellow/bank3f/data/map_header_pointers.asm) | 0 | ||||
| -rw-r--r-- | engine/bank3f/data/map_songs.asm (renamed from yellow/bank3f/data/map_songs.asm) | 0 | ||||
| -rw-r--r-- | engine/bank3f/main.asm (renamed from yellow/bank3f/main.asm) | 8 |
7 files changed, 6 insertions, 6 deletions
diff --git a/yellow/bank3c/main.asm b/engine/bank3c/main.asm index c05f46f5..92f5634c 100644 --- a/yellow/bank3c/main.asm +++ b/engine/bank3c/main.asm @@ -1,4 +1,4 @@ -INCLUDE "yellow/bank3c/overworld.asm" +INCLUDE "engine/bank3c/overworld.asm" ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) ; Reset player status on blackout. diff --git a/yellow/bank3c/overworld.asm b/engine/bank3c/overworld.asm index 778244d6..778244d6 100644 --- a/yellow/bank3c/overworld.asm +++ b/engine/bank3c/overworld.asm diff --git a/yellow/bank3d/random.asm b/engine/bank3d/random.asm index b7fb0edd..8c8ead4e 100644 --- a/yellow/bank3d/random.asm +++ b/engine/bank3d/random.asm @@ -1,4 +1,4 @@ -SECTION "bank3d",ROMX[$67DC],BANK[$3D] +SECTION "bank3d Random",ROMX[$67DC],BANK[$3D] Random_:: ; Generate a random 16-bit value. diff --git a/yellow/bank3f/data/map_header_banks.asm b/engine/bank3f/data/map_header_banks.asm index 94a13510..94a13510 100644 --- a/yellow/bank3f/data/map_header_banks.asm +++ b/engine/bank3f/data/map_header_banks.asm diff --git a/yellow/bank3f/data/map_header_pointers.asm b/engine/bank3f/data/map_header_pointers.asm index 5431727e..5431727e 100644 --- a/yellow/bank3f/data/map_header_pointers.asm +++ b/engine/bank3f/data/map_header_pointers.asm diff --git a/yellow/bank3f/data/map_songs.asm b/engine/bank3f/data/map_songs.asm index 4a84aebb..4a84aebb 100644 --- a/yellow/bank3f/data/map_songs.asm +++ b/engine/bank3f/data/map_songs.asm diff --git a/yellow/bank3f/main.asm b/engine/bank3f/main.asm index b51d19b1..38aa9878 100644 --- a/yellow/bank3f/main.asm +++ b/engine/bank3f/main.asm @@ -1,6 +1,6 @@ -INCLUDE "yellow/bank3f/data/map_songs.asm" -INCLUDE "yellow/bank3f/data/map_header_pointers.asm" -INCLUDE "yellow/bank3f/data/map_header_banks.asm" +INCLUDE "engine/bank3f/data/map_songs.asm" +INCLUDE "engine/bank3f/data/map_header_pointers.asm" +INCLUDE "engine/bank3f/data/map_header_banks.asm" Func_fc4dd:: ; fc4dd (3f:44dd) ; possibly to test if pika should be out? @@ -21,7 +21,7 @@ Func_fc4dd:: ; fc4dd (3f:44dd) and a ret -Func_fc5fa:: ; fc5fa (3f:44fa) +Func_fc4fa:: ; fc4fa (3f:44fa) ld hl,wd430 bit 4,[hl] res 4,[hl] |