diff options
| -rw-r--r-- | home/overworld.asm | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | yellow/bank3f/data/map_header_banks.asm (renamed from data/map_header_banks.asm) | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | yellow/bank3f/data/map_header_pointers.asm (renamed from data/map_header_pointers.asm) | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | yellow/bank3f/data/map_songs.asm (renamed from data/map_songs.asm) | 2 | ||||
| -rw-r--r-- | yellow/bank3f/main.asm | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index e98be1c0..22789ece 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -2094,12 +2094,12 @@ SwitchToMapRomBank:: ; 0f8b (0:0f8b) GetMapHeaderPointer:: ; 0fa7 (0:0fa7)
ld a,[H_LOADEDROMBANK]
push af
- switchbank Pointer_fc1f2 ; 3f:41f2
+ switchbank MapHeaderPointers ; 3f:41f2
push de
ld a,[W_CURMAP]
ld e,a
ld d,$0
- ld hl,Pointer_fc1f2
+ ld hl,MapHeaderPointers
add hl,de
add hl,de
ld a,[hli]
diff --git a/data/map_header_banks.asm b/yellow/bank3f/data/map_header_banks.asm index f6bd8d99..94a13510 100755..100644 --- a/data/map_header_banks.asm +++ b/yellow/bank3f/data/map_header_banks.asm @@ -1,5 +1,5 @@ ; see also MapHeaderPointers -MapHeaderBanks: ; c23d (3:423d) +MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(PalletTown_h) ;PALLET_TOWN db BANK(ViridianCity_h) ; VIRIDIAN_CITY db BANK(PewterCity_h) ; PEWTER_CITY @@ -248,6 +248,4 @@ MapHeaderBanks: ; c23d (3:423d) db BANK(Lorelei_h) db BANK(Bruno_h) db BANK(Agatha_h) -IF DEF(_OPTION_BEACH_HOUSE) db BANK(BeachHouse_h) -ENDC diff --git a/data/map_header_pointers.asm b/yellow/bank3f/data/map_header_pointers.asm index 771989a5..5431727e 100755..100644 --- a/data/map_header_pointers.asm +++ b/yellow/bank3f/data/map_header_pointers.asm @@ -1,5 +1,5 @@ ; see also MapHeaderBanks -MapHeaderPointers:: ; 01ae (0:01ae) +MapHeaderPointers:: ; fc1f2 (3f:41f2) dw PalletTown_h dw ViridianCity_h dw PewterCity_h @@ -248,6 +248,4 @@ MapHeaderPointers:: ; 01ae (0:01ae) dw Lorelei_h dw Bruno_h dw Agatha_h ;247 -IF DEF(_OPTION_BEACH_HOUSE) dw BeachHouse_h -ENDC diff --git a/data/map_songs.asm b/yellow/bank3f/data/map_songs.asm index 1d7ab269..4a84aebb 100755..100644 --- a/data/map_songs.asm +++ b/yellow/bank3f/data/map_songs.asm @@ -1,4 +1,4 @@ -MapSongBanks: ; c04d (3:404d) +MapSongBanks: ; fc000 (3f:4000) db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY diff --git a/yellow/bank3f/main.asm b/yellow/bank3f/main.asm index 736ac8ae..f9cc0ad9 100644 --- a/yellow/bank3f/main.asm +++ b/yellow/bank3f/main.asm @@ -1,5 +1,7 @@ ; asm to be added
+Func_fc4dd:: ; fc4dd (3f:44dd)
+
Func_fc5fa:: ; fc5fa (3f:45fa)
Func_fc65b:: ; fc65b (3f:465b)
|