diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-05 20:15:21 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-05 20:15:21 -0400 |
| commit | 5ecda4d2741cc8f43a0b172aefc8299e44687832 (patch) | |
| tree | 7fbac7a8f1be0bcd6a877ea47ec73fd5dfbbc211 /engine/bank3f | |
| parent | Fix EOL to LF to make push requests more doable. (diff) | |
| parent | Fix a lot of bugs (diff) | |
| download | pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.tar.gz pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.tar.xz pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.zip | |
Merge git://github.com/dannye/pokeyellow into dannye-master
Conflicts:
constants/connection_constants.asm
constants/evolution_constants.asm
constants/list_constants.asm
constants/oam_constants.asm
constants/sprite_constants.asm
constants/type_constants.asm
engine/bank3d/random.asm
engine/bank3f/main.asm
home.asm
home/overworld.asm
home/serial.asm
macros.asm
main.asm
wram.asm
Diffstat (limited to '')
| -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) | 12 |
4 files changed, 6 insertions, 6 deletions
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 c9662acd..b02829eb 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] @@ -188,7 +188,7 @@ Func_fc5fa:: ; fc5fa (3f:45fa) cp ROCK_TUNNEL_1 jr z,.asm_fc645 ld a,[W_CURMAP] - ld hl,Pointer_fc64b + ld hl,Pointer_fc46b call Func_1568 ; similar to IsInArray, but not the same jr c,.asm_fc639 ld a,[W_CURMAP] @@ -232,7 +232,7 @@ Pointer_fc653:: ; fc653 (3f:4653) Func_fc65b:: ; fc65b (3f:465b) ld a,[W_CURMAP] - + Func_fc69a:: ; fc69a (3f:469a) Func_fcc08:: ; fcc08 (3f:4c08) |