diff options
| -rwxr-xr-x | data/map_scripts.asm | 353 | ||||
| -rwxr-xr-x | data/map_songs.asm | 37 | ||||
| -rwxr-xr-x | data/overworld_indexes.asm | 19 | ||||
| -rwxr-xr-x | data/warp_data.asm | 250 | ||||
| -rwxr-xr-x | engine/bank4.asm | 361 | ||||
| -rwxr-xr-x | engine/bank7.asm | 289 | ||||
| -rwxr-xr-x | engine/home.asm | 4 |
7 files changed, 665 insertions, 648 deletions
diff --git a/data/map_scripts.asm b/data/map_scripts.asm new file mode 100755 index 0000000..d100bd2 --- /dev/null +++ b/data/map_scripts.asm @@ -0,0 +1,353 @@ +; each map has a mximum of 8 scripts +; scripts are referenced with ids [0,2,4,6,8,a,c,e] +; each script id is used for a specific event +; if a script pointer is $0000, that map has no script for that event +; 0: load texts +; 2: unused +; 4: pressed A button +; 6: pressed A button +; 8: load map +; a: after battle +; c: moved player +; e: load map/closed text box + +MapScripts: ; 1162a (4:562a) +; OVERWORLD_MAP + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $54ec + dw $0000 + dw $0000 + dw $0000 + +; MASON_LABORATORY + dw $772f + dw $0000 + dw $7b04 + dw $5565 + dw $5549 + dw $553b + dw $0000 + dw $555e + +; DECK_MACHINE_ROOM + dw $775a + dw $0000 + dw $7b4d + dw $0000 + dw $0000 + dw $589f + dw $0000 + dw $58ad + +; ISHIHARAS_HOUSE + dw $7773 + dw $0000 + dw $7c02 + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $0000 + +; FIGHTING_CLUB_ENTRANCE + dw $7786 + dw $0000 + dw $0000 + dw $0000 + dw $6809 + dw $67f6 + dw $0000 + dw $0000 + +; FIGHTING_CLUB_LOBBY + dw $779f + dw $0000 + dw $7c6f + dw $0000 + dw $0000 + dw $5c68 + dw $0000 + dw $0000 + +; FIGHTING_CLUB + dw $77ca + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $5da3 + dw $0000 + dw $0000 + +; ROCK_CLUB_ENTRANCE + dw $77e3 + dw $0000 + dw $0000 + dw $0000 + dw $6809 + dw $67f6 + dw $0000 + dw $0000 + +; ROCK_CLUB_LOBBY + dw $77fc + dw $0000 + dw $7ca6 + dw $0000 + dw $0000 + dw $5ed5 + dw $0000 + dw $0000 + +; ROCK_CLUB + dw $7827 + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $5fd6 + dw $0000 + dw $0000 + +; WATER_CLUB_ENTRANCE + dw $783a + dw $0000 + dw $0000 + dw $0000 + dw $6809 + dw $67f6 + dw $0000 + dw $0000 + +; WATER_CLUB_LOBBY + dw $7853 + dw $0000 + dw $7cdd + dw $0000 + dw $0000 + dw $60a2 + dw $0000 + dw $0000 + +; WATER_CLUB + dw $787e + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $6157 + dw $613f + dw $0000 + +; LIGHTNING_CLUB_ENTRANCE + dw $7897 + dw $0000 + dw $0000 + dw $0000 + dw $6809 + dw $67f6 + dw $0000 + dw $0000 + +; LIGHTNING_CLUB_LOBBY + dw $78b0 + dw $0000 + dw $7d14 + dw $0000 + dw $0000 + dw $636d + dw $0000 + dw $0000 + +; LIGHTNING_CLUB + dw $78d5 + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $63e8 + dw $0000 + dw $0000 + +; GRASS_CLUB_ENTRANCE + dw $78ee + dw $0000 + dw $0000 + dw $0000 + dw $6809 + dw $6525 + dw $0000 + dw $0000 + +; GRASS_CLUB_LOBBY + dw $790d + dw $0000 + dw $7d4b + dw $0000 + dw $0000 + dw $65c4 + dw $0000 + dw $0000 + +; GRASS_CLUB + dw $7932 + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $66e7 + dw $0000 + dw $0000 + +; PSYCHIC_CLUB_ENTRANCE + dw $7945 + dw $0000 + dw $0000 + dw $0000 + dw $6809 + dw $67f6 + dw $0000 + dw $0000 + +; PSYCHIC_CLUB_LOBBY + dw $7964 + dw $0000 + dw $7d82 + dw $0000 + dw $6971 + dw $6963 + dw $0000 + dw $0000 + +; PSYCHIC_CLUB + dw $798f + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $6a46 + dw $0000 + dw $0000 + +; SCIENCE_CLUB_ENTRANCE + dw $79a8 + dw $0000 + dw $0000 + dw $0000 + dw $6809 + dw $67f6 + dw $0000 + dw $0000 + +; SCIENCE_CLUB_LOBBY + dw $79c1 + dw $0000 + dw $7db9 + dw $0000 + dw $0000 + dw $6b57 + dw $0000 + dw $0000 + +; SCIENCE_CLUB + dw $79ec + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $6bf1 + dw $0000 + dw $0000 + +; FIRE_CLUB_ENTRANCE + dw $7a05 + dw $0000 + dw $0000 + dw $0000 + dw $6809 + dw $67f6 + dw $0000 + dw $0000 + +; FIRE_CLUB_LOBBY + dw $7a1e + dw $0000 + dw $7df0 + dw $6d57 + dw $0000 + dw $6d49 + dw $0000 + dw $0000 + +; FIRE_CLUB + dw $7a43 + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $6e93 + dw $0000 + dw $0000 + +; CHALLENGE_HALL_ENTRANCE + dw $7a5c + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $0000 + dw $0000 + +; CHALLENGE_HALL_LOBBY + dw $7a63 + dw $0000 + dw $7e27 + dw $0000 + dw $7088 + dw $0000 + dw $0000 + dw $0000 + +; CHALLENGE_HALL + dw $7a9a + dw $0000 + dw $0000 + dw $0000 + dw $7258 + dw $7239 + dw $0000 + dw $0000 + +; POKEMON_DOME_ENTRANCE + dw $7ab9 + dw $0000 + dw $7e5e + dw $0000 + dw $7607 + dw $0000 + dw $0000 + dw $762a + +; POKEMON_DOME + dw $7ac0 + dw $0000 + dw $0000 + dw $0000 + dw $7706 + dw $76e0 + dw $76c6 + dw $7718 + +; HALL_OF_HONOR + dw $7adf + dw $0000 + dw $7ec2 + dw $0000 + dw $7bdb + dw $0000 + dw $0000 + dw $0000
\ No newline at end of file diff --git a/data/map_songs.asm b/data/map_songs.asm new file mode 100755 index 0000000..2a584ee --- /dev/null +++ b/data/map_songs.asm @@ -0,0 +1,37 @@ +; todo: figure out the rest of the data for each map +; related to the table at 20:4e5d +MapSongs: ; 1c374 (7:4374) + db $00,$01,$00,$01,$01,MUSIC_OVERWORLD ; OVERWORLD_MAP + db $02,$03,$00,$02,$02,MUSIC_OVERWORLD ; MASON_LABORATORY + db $06,$07,$00,$02,$02,MUSIC_OVERWORLD ; DECK_MACHINE_ROOM + db $0A,$0B,$00,$03,$03,MUSIC_OVERWORLD ; ISHIHARAS_HOUSE + db $0C,$0D,$00,$03,$04,MUSIC_OVERWORLD ; FIGHTING_CLUB_ENTRANCE + db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; FIGHTING_CLUB_LOBBY + db $20,$21,$00,$04,$0D,MUSIC_CLUB3 ; FIGHTING_CLUB + db $0E,$0F,$00,$03,$05,MUSIC_OVERWORLD ; ROCK_CLUB_ENTRANCE + db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; ROCK_CLUB_LOBBY + db $22,$23,$00,$04,$0E,MUSIC_CLUB2 ; ROCK_CLUB + db $10,$11,$00,$03,$06,MUSIC_OVERWORLD ; WATER_CLUB_ENTRANCE + db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; WATER_CLUB_LOBBY + db $24,$25,$00,$02,$0F,MUSIC_CLUB2 ; WATER_CLUB + db $12,$13,$00,$03,$07,MUSIC_OVERWORLD ; LIGHTNING_CLUB_ENTRANCE + db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; LIGHTNING_CLUB_LOBBY + db $26,$27,$00,$05,$10,MUSIC_CLUB1 ; LIGHTNING_CLUB + db $14,$15,$00,$03,$08,MUSIC_OVERWORLD ; GRASS_CLUB_ENTRANCE + db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; GRASS_CLUB_LOBBY + db $28,$29,$00,$06,$11,MUSIC_CLUB1 ; GRASS_CLUB + db $16,$17,$00,$03,$09,MUSIC_OVERWORLD ; PSYCHIC_CLUB_ENTRANCE + db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; PSYCHIC_CLUB_LOBBY + db $2A,$2B,$00,$07,$12,MUSIC_CLUB2 ; PSYCHIC_CLUB + db $18,$19,$00,$03,$0A,MUSIC_OVERWORLD ; SCIENCE_CLUB_ENTRANCE + db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; SCIENCE_CLUB_LOBBY + db $2C,$2D,$00,$06,$13,MUSIC_CLUB3 ; SCIENCE_CLUB + db $1A,$1B,$00,$03,$0B,MUSIC_OVERWORLD ; FIRE_CLUB_ENTRANCE + db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; FIRE_CLUB_LOBBY + db $2E,$2F,$00,$08,$14,MUSIC_CLUB3 ; FIRE_CLUB + db $1C,$1D,$00,$03,$04,MUSIC_OVERWORLD ; CHALLENGE_HALL_ENTRANCE + db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; CHALLENGE_HALL_LOBBY + db $30,$31,$00,$09,$15,MUSIC_OVERWORLD ; CHALLENGE_HALL + db $32,$33,$00,$0A,$16,MUSIC_OVERWORLD ; POKEMON_DOME_ENTRANCE + db $36,$37,$00,$0A,$17,MUSIC_POKEMONDOME ; POKEMON_DOME + db $3A,$3B,$00,$0A,$18,MUSIC_HALLOFHONOR ; HALL_OF_HONOR
\ No newline at end of file diff --git a/data/overworld_indexes.asm b/data/overworld_indexes.asm new file mode 100755 index 0000000..18d8e65 --- /dev/null +++ b/data/overworld_indexes.asm @@ -0,0 +1,19 @@ +; each entry in the overworld map is four bytes +; 1: map id +; 2: player's x coordinate when entering the map +; 2: player's y coordinate when entering the map +; 4: 00 +OverworldMapIndexes: ; 10f88 (4:4f88) + db $00,$00,$00,$00 + db MASON_LABORATORY, $0E,$1A,$00 + db ISHIHARAS_HOUSE, $08,$14,$00 + db FIGHTING_CLUB_ENTRANCE, $08,$0E,$00 + db ROCK_CLUB_ENTRANCE, $08,$0E,$00 + db WATER_CLUB_ENTRANCE, $08,$0E,$00 + db LIGHTNING_CLUB_ENTRANCE,$08,$0E,$00 + db GRASS_CLUB_ENTRANCE, $08,$0E,$00 + db PSYCHIC_CLUB_ENTRANCE, $08,$0E,$00 + db SCIENCE_CLUB_ENTRANCE, $08,$0E,$00 + db FIRE_CLUB_ENTRANCE, $08,$0E,$00 + db CHALLENGE_HALL_ENTRANCE,$08,$0E,$00 + db POKEMON_DOME_ENTRANCE, $0E,$0E,$00
\ No newline at end of file diff --git a/data/warp_data.asm b/data/warp_data.asm new file mode 100755 index 0000000..8844542 --- /dev/null +++ b/data/warp_data.asm @@ -0,0 +1,250 @@ +WarpDataPointers: ; 1c099 (7:4099) + dw $0000 + dw MasonLaboratoryWarpData + dw DeckMachineRoomWarpData + dw IshiharasHouseWarpData + dw FightingClubEntranceWarpData + dw FightingClubLobbyWarpData + dw FightingClubWarpData + dw RockClubEntranceWarpData + dw RockClubLobbyWarpData + dw RockClubWarpData + dw WaterClubEntranceWarpData + dw WaterClubLobbyWarpData + dw WaterClubWarpData + dw LightningClubEntranceWarpData + dw LightningClubLobbyWarpData + dw LightningClubWarpData + dw GrassClubEntranceWarpData + dw GrassClubLobbyWarpData + dw GrassClubWarpData + dw PsychicClubEntranceWarpData + dw PsychicClubLobbyWarpData + dw PsychicClubWarpData + dw ScienceClubEntranceWarpData + dw ScienceClubLobbyWarpData + dw ScienceClubWarpData + dw FireClubEntranceWarpData + dw FireClubLobbyWarpData + dw FireClubWarpData + dw ChallengeHallEntranceWarpData + dw ChallengeHallLobbyWarpData + dw ChallengeHallWarpData + dw PokemonDomeEntranceWarpData + dw PokemonDomeWarpData + dw HallOfHonorWarpData + +; each warp is five bytes long +; coordinates are measured in tiles +; 1: x coordinate of current map +; 2: y coordinate of current map +; 3: id of connected map +; 4: x coordinate of connected map +; 5: y coordinate of connected map +; double null terminated +MasonLaboratoryWarpData: ; 1c0dd (7:40dd) + db $0E,$1C,OVERWORLD_MAP, $00,$00 + db $10,$1C,OVERWORLD_MAP, $00,$00 + db $1A,$0A,DECK_MACHINE_ROOM,$02,$0A + db $1A,$0C,DECK_MACHINE_ROOM,$02,$0C + db $00,$00 + +DeckMachineRoomWarpData: ; 1c0f3 (7:40f3) + db $00,$0A,MASON_LABORATORY,$18,$0A + db $00,$0C,MASON_LABORATORY,$18,$0C + db $00,$00 + +IshiharasHouseWarpData: ; 1c0ff (7:40ff) + db $08,$16,OVERWORLD_MAP,$00,$00 + db $0A,$16,OVERWORLD_MAP,$00,$00 + db $00,$00 + +FightingClubEntranceWarpData: ; 1c10b (7:410b) + db $08,$10,OVERWORLD_MAP, $00,$00 + db $0A,$10,OVERWORLD_MAP, $00,$00 + db $00,$06,FIGHTING_CLUB_LOBBY,$18,$0A + db $00,$08,FIGHTING_CLUB_LOBBY,$18,$0C + db $08,$00,FIGHTING_CLUB, $0A,$0E + db $0A,$00,FIGHTING_CLUB, $0C,$0E + db $00,$00 + +FightingClubLobbyWarpData: ; 1c12b (7:412b) + db $1A,$0A,FIGHTING_CLUB_ENTRANCE,$02,$06 + db $1A,$0C,FIGHTING_CLUB_ENTRANCE,$02,$08 + db $00,$00 + +FightingClubWarpData: ; 1c137 (7:4137) + db $0A,$10,FIGHTING_CLUB_ENTRANCE,$08,$02 + db $0C,$10,FIGHTING_CLUB_ENTRANCE,$0A,$02 + db $00,$00 + +RockClubEntranceWarpData: ; 1c143 (7:4143) + db $08,$10,OVERWORLD_MAP, $00,$00 + db $0A,$10,OVERWORLD_MAP, $00,$00 + db $00,$06,ROCK_CLUB_LOBBY,$18,$0A + db $00,$08,ROCK_CLUB_LOBBY,$18,$0C + db $08,$00,ROCK_CLUB, $0C,$1A + db $0A,$00,ROCK_CLUB, $0E,$1A + db $00,$00 + +RockClubLobbyWarpData: ; 1c163 (7:4163) + db $1A,$0A,ROCK_CLUB_ENTRANCE,$02,$06 + db $1A,$0C,ROCK_CLUB_ENTRANCE,$02,$08 + db $00,$00 + +RockClubWarpData: ; 1c16f (7:416f) + db $0C,$1C,ROCK_CLUB_ENTRANCE,$08,$02 + db $0E,$1C,ROCK_CLUB_ENTRANCE,$0A,$02 + db $00,$00 + +WaterClubEntranceWarpData: ; 1c17b (7:417b) + db $08,$10,OVERWORLD_MAP, $00,$00 + db $0A,$10,OVERWORLD_MAP, $00,$00 + db $00,$06,WATER_CLUB_LOBBY,$18,$0A + db $00,$08,WATER_CLUB_LOBBY,$18,$0C + db $08,$00,WATER_CLUB, $0C,$1C + db $0A,$00,WATER_CLUB, $0E,$1C + db $00,$00 + +WaterClubLobbyWarpData: ; 1c19b (7:419b) + db $1A,$0A,WATER_CLUB_ENTRANCE,$02,$06 + db $1A,$0C,WATER_CLUB_ENTRANCE,$02,$08 + db $00,$00 + +WaterClubWarpData: ; 1c1a7 (7:41a7) + db $0C,$1E,WATER_CLUB_ENTRANCE,$08,$02 + db $0E,$1E,WATER_CLUB_ENTRANCE,$0A,$02 + db $00,$00 + +LightningClubEntranceWarpData: ; 1c1b3 (7:41b3) + db $08,$10,OVERWORLD_MAP, $00,$00 + db $0A,$10,OVERWORLD_MAP, $00,$00 + db $00,$06,LIGHTNING_CLUB_LOBBY,$18,$0A + db $00,$08,LIGHTNING_CLUB_LOBBY,$18,$0C + db $08,$00,LIGHTNING_CLUB, $0C,$1C + db $0A,$00,LIGHTNING_CLUB, $0E,$1C + db $00,$00 + +LightningClubLobbyWarpData: ; 1c1d3 (7:41d3) + db $1A,$0A,LIGHTNING_CLUB_ENTRANCE,$02,$06 + db $1A,$0C,LIGHTNING_CLUB_ENTRANCE,$02,$08 + db $00,$00 + +LightningClubWarpData: ; 1c1df (7:41df) + db $0C,$1E,LIGHTNING_CLUB_ENTRANCE,$08,$02 + db $0E,$1E,LIGHTNING_CLUB_ENTRANCE,$0A,$02 + db $00,$00 + +GrassClubEntranceWarpData: ; 1c1eb (7:41eb) + db $08,$10,OVERWORLD_MAP, $00,$00 + db $0A,$10,OVERWORLD_MAP, $00,$00 + db $00,$06,GRASS_CLUB_LOBBY,$18,$0A + db $00,$08,GRASS_CLUB_LOBBY,$18,$0C + db $08,$00,GRASS_CLUB, $0C,$1C + db $0A,$00,GRASS_CLUB, $0E,$1C + db $00,$00 + +GrassClubLobbyWarpData: ; 1c20b (7:420b) + db $1A,$0A,GRASS_CLUB_ENTRANCE,$02,$06 + db $1A,$0C,GRASS_CLUB_ENTRANCE,$02,$08 + db $00,$00 + +GrassClubWarpData: ; 1c217 (7:4217) + db $0C,$1E,GRASS_CLUB_ENTRANCE,$08,$02 + db $0E,$1E,GRASS_CLUB_ENTRANCE,$0A,$02 + db $00,$00 + +PsychicClubEntranceWarpData: ; 1c223 (7:4223) + db $08,$10,OVERWORLD_MAP, $00,$00 + db $0A,$10,OVERWORLD_MAP, $00,$00 + db $00,$06,PSYCHIC_CLUB_LOBBY,$18,$0A + db $00,$08,PSYCHIC_CLUB_LOBBY,$18,$0C + db $08,$00,PSYCHIC_CLUB, $0C,$18 + db $0A,$00,PSYCHIC_CLUB, $0E,$18 + db $00,$00 + +PsychicClubLobbyWarpData: ; 1c243 (7:4243) + db $1A,$0A,PSYCHIC_CLUB_ENTRANCE,$02,$06 + db $1A,$0C,PSYCHIC_CLUB_ENTRANCE,$02,$08 + db $00,$00 + +PsychicClubWarpData: ; 1c24f (7:424f) + db $0C,$1A,PSYCHIC_CLUB_ENTRANCE,$08,$02 + db $0E,$1A,PSYCHIC_CLUB_ENTRANCE,$0A,$02 + db $00,$00 + +ScienceClubEntranceWarpData: ; 1c25b (7:425b) + db $08,$10,OVERWORLD_MAP, $00,$00 + db $0A,$10,OVERWORLD_MAP, $00,$00 + db $00,$06,SCIENCE_CLUB_LOBBY,$18,$0A + db $00,$08,SCIENCE_CLUB_LOBBY,$18,$0C + db $08,$00,SCIENCE_CLUB, $0C,$1C + db $0A,$00,SCIENCE_CLUB, $0E,$1C + db $00,$00 + +ScienceClubLobbyWarpData: ; 1c27b (7:427b) + db $1A,$0A,SCIENCE_CLUB_ENTRANCE,$02,$06 + db $1A,$0C,SCIENCE_CLUB_ENTRANCE,$02,$08 + db $00,$00 + +ScienceClubWarpData: ; 1c287 (7:4287) + db $0C,$1E,SCIENCE_CLUB_ENTRANCE,$08,$02 + db $0E,$1E,SCIENCE_CLUB_ENTRANCE,$0A,$02 + db $00,$00 + +FireClubEntranceWarpData: ; 1c293 (7:4293) + db $08,$10,OVERWORLD_MAP, $00,$00 + db $0A,$10,OVERWORLD_MAP, $00,$00 + db $00,$06,FIRE_CLUB_LOBBY,$18,$0A + db $00,$08,FIRE_CLUB_LOBBY,$18,$0C + db $08,$00,FIRE_CLUB, $0C,$1C + db $0A,$00,FIRE_CLUB, $0E,$1C + db $00,$00 + +FireClubLobbyWarpData: ; 1c2b3 (7:42b3) + db $1A,$0A,FIRE_CLUB_ENTRANCE,$02,$06 + db $1A,$0C,FIRE_CLUB_ENTRANCE,$02,$08 + db $00,$00 + +FireClubWarpData: ; 1c2bf (7:42bf) + db $0C,$1E,FIRE_CLUB_ENTRANCE,$08,$02 + db $0E,$1E,FIRE_CLUB_ENTRANCE,$0A,$02 + db $00,$00 + +ChallengeHallEntranceWarpData: ; 1c2cb (7:42cb) + db $08,$10,OVERWORLD_MAP, $00,$00 + db $0A,$10,OVERWORLD_MAP, $00,$00 + db $00,$06,CHALLENGE_HALL_LOBBY,$18,$0A + db $00,$08,CHALLENGE_HALL_LOBBY,$18,$0C + db $08,$00,CHALLENGE_HALL, $0E,$1C + db $0A,$00,CHALLENGE_HALL, $10,$1C + db $00,$00 + +ChallengeHallLobbyWarpData: ; 1c2eb (7:42eb) + db $1A,$0A,CHALLENGE_HALL_ENTRANCE,$02,$06 + db $1A,$0C,CHALLENGE_HALL_ENTRANCE,$02,$08 + db $00,$00 + +ChallengeHallWarpData: ; 1c2f7 (7:42f7) + db $0E,$1E,CHALLENGE_HALL_ENTRANCE,$08,$02 + db $10,$1E,CHALLENGE_HALL_ENTRANCE,$0A,$02 + db $00,$00 + +PokemonDomeEntranceWarpData: ; 1c303 (7:4303) + db $0E,$10,OVERWORLD_MAP,$00,$00 + db $10,$10,OVERWORLD_MAP,$00,$00 + db $16,$00,POKEMON_DOME, $0E,$1C + db $18,$00,POKEMON_DOME, $10,$1C + db $00,$00 + +PokemonDomeWarpData: ; 1c319 (7:4319) + db $0E,$1E,POKEMON_DOME_ENTRANCE,$16,$02 + db $10,$1E,POKEMON_DOME_ENTRANCE,$18,$02 + db $0E,$00,HALL_OF_HONOR, $0A,$16 + db $10,$00,HALL_OF_HONOR, $0C,$16 + db $00,$00 + +HallOfHonorWarpData: ; 1c32f (7:432f) + db $0A,$18,POKEMON_DOME,$0E,$02 + db $0C,$18,POKEMON_DOME,$10,$02 + db $00,$00
\ No newline at end of file diff --git a/engine/bank4.asm b/engine/bank4.asm index 282ed64..a541d62 100755 --- a/engine/bank4.asm +++ b/engine/bank4.asm @@ -177,25 +177,7 @@ LoadOverworldMapSelection: ; 10f61 (4:4f61) pop hl ret -; each entry in the overworld map is four bytes -; 1: map id -; 2: player's x coordinate when entering the map -; 2: player's y coordinate when entering the map -; 4: 00 -OverworldMapIndexes: ; 10f88 (4:4f88) - db $00,$00,$00,$00 - db MASON_LABORATORY, $0E,$1A,$00 - db ISHIHARAS_HOUSE, $08,$14,$00 - db FIGHTING_CLUB_ENTRANCE, $08,$0E,$00 - db ROCK_CLUB_ENTRANCE, $08,$0E,$00 - db WATER_CLUB_ENTRANCE, $08,$0E,$00 - db LIGHTNING_CLUB_ENTRANCE,$08,$0E,$00 - db GRASS_CLUB_ENTRANCE, $08,$0E,$00 - db PSYCHIC_CLUB_ENTRANCE, $08,$0E,$00 - db SCIENCE_CLUB_ENTRANCE, $08,$0E,$00 - db FIRE_CLUB_ENTRANCE, $08,$0E,$00 - db CHALLENGE_HALL_ENTRANCE,$08,$0E,$00 - db POKEMON_DOME_ENTRANCE, $0E,$0E,$00 +INCLUDE "data/overworld_indexes.asm" Func_10fbc: ; 10fbc (4:4fbc) ld a, $25 @@ -511,346 +493,7 @@ INCBIN "baserom.gbc",$11416,$11430 - $11416 Func_11430: ; 11430 (4:5430) INCBIN "baserom.gbc",$11430,$1162a - $11430 -MapHeaders: ; 1162a (4:562a) -; OVERWORLD_MAP - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $54ec - dw $0000 - dw $0000 - dw $0000 - -; MASON_LABORATORY - dw $772f - dw $0000 - dw $7b04 - dw $5565 - dw $5549 - dw $553b - dw $0000 - dw $555e - -; DECK_MACHINE_ROOM - dw $775a - dw $0000 - dw $7b4d - dw $0000 - dw $0000 - dw $589f - dw $0000 - dw $58ad - -; ISHIHARAS_HOUSE - dw $7773 - dw $0000 - dw $7c02 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - -; FIGHTING_CLUB_ENTRANCE - dw $7786 - dw $0000 - dw $0000 - dw $0000 - dw $6809 - dw $67f6 - dw $0000 - dw $0000 - -; FIGHTING_CLUB_LOBBY - dw $779f - dw $0000 - dw $7c6f - dw $0000 - dw $0000 - dw $5c68 - dw $0000 - dw $0000 - -; FIGHTING_CLUB - dw $77ca - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $5da3 - dw $0000 - dw $0000 - -; ROCK_CLUB_ENTRANCE - dw $77e3 - dw $0000 - dw $0000 - dw $0000 - dw $6809 - dw $67f6 - dw $0000 - dw $0000 - -; ROCK_CLUB_LOBBY - dw $77fc - dw $0000 - dw $7ca6 - dw $0000 - dw $0000 - dw $5ed5 - dw $0000 - dw $0000 - -; ROCK_CLUB - dw $7827 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $5fd6 - dw $0000 - dw $0000 - -; WATER_CLUB_ENTRANCE - dw $783a - dw $0000 - dw $0000 - dw $0000 - dw $6809 - dw $67f6 - dw $0000 - dw $0000 - -; WATER_CLUB_LOBBY - dw $7853 - dw $0000 - dw $7cdd - dw $0000 - dw $0000 - dw $60a2 - dw $0000 - dw $0000 - -; WATER_CLUB - dw $787e - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $6157 - dw $613f - dw $0000 - -; LIGHTNING_CLUB_ENTRANCE - dw $7897 - dw $0000 - dw $0000 - dw $0000 - dw $6809 - dw $67f6 - dw $0000 - dw $0000 - -; LIGHTNING_CLUB_LOBBY - dw $78b0 - dw $0000 - dw $7d14 - dw $0000 - dw $0000 - dw $636d - dw $0000 - dw $0000 - -; LIGHTNING_CLUB - dw $78d5 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $63e8 - dw $0000 - dw $0000 - -; GRASS_CLUB_ENTRANCE - dw $78ee - dw $0000 - dw $0000 - dw $0000 - dw $6809 - dw $6525 - dw $0000 - dw $0000 - -; GRASS_CLUB_LOBBY - dw $790d - dw $0000 - dw $7d4b - dw $0000 - dw $0000 - dw $65c4 - dw $0000 - dw $0000 - -; GRASS_CLUB - dw $7932 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $66e7 - dw $0000 - dw $0000 - -; PSYCHIC_CLUB_ENTRANCE - dw $7945 - dw $0000 - dw $0000 - dw $0000 - dw $6809 - dw $67f6 - dw $0000 - dw $0000 - -; PSYCHIC_CLUB_LOBBY - dw $7964 - dw $0000 - dw $7d82 - dw $0000 - dw $6971 - dw $6963 - dw $0000 - dw $0000 - -; PSYCHIC_CLUB - dw $798f - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $6a46 - dw $0000 - dw $0000 - -; SCIENCE_CLUB_ENTRANCE - dw $79a8 - dw $0000 - dw $0000 - dw $0000 - dw $6809 - dw $67f6 - dw $0000 - dw $0000 - -; SCIENCE_CLUB_LOBBY - dw $79c1 - dw $0000 - dw $7db9 - dw $0000 - dw $0000 - dw $6b57 - dw $0000 - dw $0000 - -; SCIENCE_CLUB - dw $79ec - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $6bf1 - dw $0000 - dw $0000 - -; FIRE_CLUB_ENTRANCE - dw $7a05 - dw $0000 - dw $0000 - dw $0000 - dw $6809 - dw $67f6 - dw $0000 - dw $0000 - -; FIRE_CLUB_LOBBY - dw $7a1e - dw $0000 - dw $7df0 - dw $6d57 - dw $0000 - dw $6d49 - dw $0000 - dw $0000 - -; FIRE_CLUB - dw $7a43 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $6e93 - dw $0000 - dw $0000 - -; CHALLENGE_HALL_ENTRANCE - dw $7a5c - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - -; CHALLENGE_HALL_LOBBY - dw $7a63 - dw $0000 - dw $7e27 - dw $0000 - dw $7088 - dw $0000 - dw $0000 - dw $0000 - -; CHALLENGE_HALL - dw $7a9a - dw $0000 - dw $0000 - dw $0000 - dw $7258 - dw $7239 - dw $0000 - dw $0000 - -; POKEMON_DOME_ENTRANCE - dw $7ab9 - dw $0000 - dw $7e5e - dw $0000 - dw $7607 - dw $0000 - dw $0000 - dw $762a - -; POKEMON_DOME - dw $7ac0 - dw $0000 - dw $0000 - dw $0000 - dw $7706 - dw $76e0 - dw $76c6 - dw $7718 - -; HALL_OF_HONOR - dw $7adf - dw $0000 - dw $7ec2 - dw $0000 - dw $7bdb - dw $0000 - dw $0000 - dw $0000 +INCLUDE "data/map_scripts.asm" INCBIN "baserom.gbc",$1184a,$11857 - $1184a diff --git a/engine/bank7.asm b/engine/bank7.asm index f8e5911..f57b8af 100755 --- a/engine/bank7.asm +++ b/engine/bank7.asm @@ -48,256 +48,7 @@ Func_1c056: ; 1c056 (7:4056) pop hl ret -WarpDataPointers: ; 1c099 (7:4099) - dw $0000 - dw MasonLaboratoryWarpData - dw DeckMachineRoomWarpData - dw IshiharasHouseWarpData - dw FightingClubEntranceWarpData - dw FightingClubLobbyWarpData - dw FightingClubWarpData - dw RockClubEntranceWarpData - dw RockClubLobbyWarpData - dw RockClubWarpData - dw WaterClubEntranceWarpData - dw WaterClubLobbyWarpData - dw WaterClubWarpData - dw LightningClubEntranceWarpData - dw LightningClubLobbyWarpData - dw LightningClubWarpData - dw GrassClubEntranceWarpData - dw GrassClubLobbyWarpData - dw GrassClubWarpData - dw PsychicClubEntranceWarpData - dw PsychicClubLobbyWarpData - dw PsychicClubWarpData - dw ScienceClubEntranceWarpData - dw ScienceClubLobbyWarpData - dw ScienceClubWarpData - dw FireClubEntranceWarpData - dw FireClubLobbyWarpData - dw FireClubWarpData - dw ChallengeHallEntranceWarpData - dw ChallengeHallLobbyWarpData - dw ChallengeHallWarpData - dw PokemonDomeEntranceWarpData - dw PokemonDomeWarpData - dw HallOfHonorWarpData - -; each warp is five bytes long -; coordinates are measured in tiles -; 1: x coordinate of current map -; 2: y coordinate of current map -; 3: id of connected map -; 4: x coordinate of connected map -; 5: y coordinate of connected map -; double null terminated -MasonLaboratoryWarpData: ; 1c0dd (7:40dd) - db $0E,$1C,OVERWORLD_MAP, $00,$00 - db $10,$1C,OVERWORLD_MAP, $00,$00 - db $1A,$0A,DECK_MACHINE_ROOM,$02,$0A - db $1A,$0C,DECK_MACHINE_ROOM,$02,$0C - db $00,$00 - -DeckMachineRoomWarpData: ; 1c0f3 (7:40f3) - db $00,$0A,MASON_LABORATORY,$18,$0A - db $00,$0C,MASON_LABORATORY,$18,$0C - db $00,$00 - -IshiharasHouseWarpData: ; 1c0ff (7:40ff) - db $08,$16,OVERWORLD_MAP,$00,$00 - db $0A,$16,OVERWORLD_MAP,$00,$00 - db $00,$00 - -FightingClubEntranceWarpData: ; 1c10b (7:410b) - db $08,$10,OVERWORLD_MAP, $00,$00 - db $0A,$10,OVERWORLD_MAP, $00,$00 - db $00,$06,FIGHTING_CLUB_LOBBY,$18,$0A - db $00,$08,FIGHTING_CLUB_LOBBY,$18,$0C - db $08,$00,FIGHTING_CLUB, $0A,$0E - db $0A,$00,FIGHTING_CLUB, $0C,$0E - db $00,$00 - -FightingClubLobbyWarpData: ; 1c12b (7:412b) - db $1A,$0A,FIGHTING_CLUB_ENTRANCE,$02,$06 - db $1A,$0C,FIGHTING_CLUB_ENTRANCE,$02,$08 - db $00,$00 - -FightingClubWarpData: ; 1c137 (7:4137) - db $0A,$10,FIGHTING_CLUB_ENTRANCE,$08,$02 - db $0C,$10,FIGHTING_CLUB_ENTRANCE,$0A,$02 - db $00,$00 - -RockClubEntranceWarpData: ; 1c143 (7:4143) - db $08,$10,OVERWORLD_MAP, $00,$00 - db $0A,$10,OVERWORLD_MAP, $00,$00 - db $00,$06,ROCK_CLUB_LOBBY,$18,$0A - db $00,$08,ROCK_CLUB_LOBBY,$18,$0C - db $08,$00,ROCK_CLUB, $0C,$1A - db $0A,$00,ROCK_CLUB, $0E,$1A - db $00,$00 - -RockClubLobbyWarpData: ; 1c163 (7:4163) - db $1A,$0A,ROCK_CLUB_ENTRANCE,$02,$06 - db $1A,$0C,ROCK_CLUB_ENTRANCE,$02,$08 - db $00,$00 - -RockClubWarpData: ; 1c16f (7:416f) - db $0C,$1C,ROCK_CLUB_ENTRANCE,$08,$02 - db $0E,$1C,ROCK_CLUB_ENTRANCE,$0A,$02 - db $00,$00 - -WaterClubEntranceWarpData: ; 1c17b (7:417b) - db $08,$10,OVERWORLD_MAP, $00,$00 - db $0A,$10,OVERWORLD_MAP, $00,$00 - db $00,$06,WATER_CLUB_LOBBY,$18,$0A - db $00,$08,WATER_CLUB_LOBBY,$18,$0C - db $08,$00,WATER_CLUB, $0C,$1C - db $0A,$00,WATER_CLUB, $0E,$1C - db $00,$00 - -WaterClubLobbyWarpData: ; 1c19b (7:419b) - db $1A,$0A,WATER_CLUB_ENTRANCE,$02,$06 - db $1A,$0C,WATER_CLUB_ENTRANCE,$02,$08 - db $00,$00 - -WaterClubWarpData: ; 1c1a7 (7:41a7) - db $0C,$1E,WATER_CLUB_ENTRANCE,$08,$02 - db $0E,$1E,WATER_CLUB_ENTRANCE,$0A,$02 - db $00,$00 - -LightningClubEntranceWarpData: ; 1c1b3 (7:41b3) - db $08,$10,OVERWORLD_MAP, $00,$00 - db $0A,$10,OVERWORLD_MAP, $00,$00 - db $00,$06,LIGHTNING_CLUB_LOBBY,$18,$0A - db $00,$08,LIGHTNING_CLUB_LOBBY,$18,$0C - db $08,$00,LIGHTNING_CLUB, $0C,$1C - db $0A,$00,LIGHTNING_CLUB, $0E,$1C - db $00,$00 - -LightningClubLobbyWarpData: ; 1c1d3 (7:41d3) - db $1A,$0A,LIGHTNING_CLUB_ENTRANCE,$02,$06 - db $1A,$0C,LIGHTNING_CLUB_ENTRANCE,$02,$08 - db $00,$00 - -LightningClubWarpData: ; 1c1df (7:41df) - db $0C,$1E,LIGHTNING_CLUB_ENTRANCE,$08,$02 - db $0E,$1E,LIGHTNING_CLUB_ENTRANCE,$0A,$02 - db $00,$00 - -GrassClubEntranceWarpData: ; 1c1eb (7:41eb) - db $08,$10,OVERWORLD_MAP, $00,$00 - db $0A,$10,OVERWORLD_MAP, $00,$00 - db $00,$06,GRASS_CLUB_LOBBY,$18,$0A - db $00,$08,GRASS_CLUB_LOBBY,$18,$0C - db $08,$00,GRASS_CLUB, $0C,$1C - db $0A,$00,GRASS_CLUB, $0E,$1C - db $00,$00 - -GrassClubLobbyWarpData: ; 1c20b (7:420b) - db $1A,$0A,GRASS_CLUB_ENTRANCE,$02,$06 - db $1A,$0C,GRASS_CLUB_ENTRANCE,$02,$08 - db $00,$00 - -GrassClubWarpData: ; 1c217 (7:4217) - db $0C,$1E,GRASS_CLUB_ENTRANCE,$08,$02 - db $0E,$1E,GRASS_CLUB_ENTRANCE,$0A,$02 - db $00,$00 - -PsychicClubEntranceWarpData: ; 1c223 (7:4223) - db $08,$10,OVERWORLD_MAP, $00,$00 - db $0A,$10,OVERWORLD_MAP, $00,$00 - db $00,$06,PSYCHIC_CLUB_LOBBY,$18,$0A - db $00,$08,PSYCHIC_CLUB_LOBBY,$18,$0C - db $08,$00,PSYCHIC_CLUB, $0C,$18 - db $0A,$00,PSYCHIC_CLUB, $0E,$18 - db $00,$00 - -PsychicClubLobbyWarpData: ; 1c243 (7:4243) - db $1A,$0A,PSYCHIC_CLUB_ENTRANCE,$02,$06 - db $1A,$0C,PSYCHIC_CLUB_ENTRANCE,$02,$08 - db $00,$00 - -PsychicClubWarpData: ; 1c24f (7:424f) - db $0C,$1A,PSYCHIC_CLUB_ENTRANCE,$08,$02 - db $0E,$1A,PSYCHIC_CLUB_ENTRANCE,$0A,$02 - db $00,$00 - -ScienceClubEntranceWarpData: ; 1c25b (7:425b) - db $08,$10,OVERWORLD_MAP, $00,$00 - db $0A,$10,OVERWORLD_MAP, $00,$00 - db $00,$06,SCIENCE_CLUB_LOBBY,$18,$0A - db $00,$08,SCIENCE_CLUB_LOBBY,$18,$0C - db $08,$00,SCIENCE_CLUB, $0C,$1C - db $0A,$00,SCIENCE_CLUB, $0E,$1C - db $00,$00 - -ScienceClubLobbyWarpData: ; 1c27b (7:427b) - db $1A,$0A,SCIENCE_CLUB_ENTRANCE,$02,$06 - db $1A,$0C,SCIENCE_CLUB_ENTRANCE,$02,$08 - db $00,$00 - -ScienceClubWarpData: ; 1c287 (7:4287) - db $0C,$1E,SCIENCE_CLUB_ENTRANCE,$08,$02 - db $0E,$1E,SCIENCE_CLUB_ENTRANCE,$0A,$02 - db $00,$00 - -FireClubEntranceWarpData: ; 1c293 (7:4293) - db $08,$10,OVERWORLD_MAP, $00,$00 - db $0A,$10,OVERWORLD_MAP, $00,$00 - db $00,$06,FIRE_CLUB_LOBBY,$18,$0A - db $00,$08,FIRE_CLUB_LOBBY,$18,$0C - db $08,$00,FIRE_CLUB, $0C,$1C - db $0A,$00,FIRE_CLUB, $0E,$1C - db $00,$00 - -FireClubLobbyWarpData: ; 1c2b3 (7:42b3) - db $1A,$0A,FIRE_CLUB_ENTRANCE,$02,$06 - db $1A,$0C,FIRE_CLUB_ENTRANCE,$02,$08 - db $00,$00 - -FireClubWarpData: ; 1c2bf (7:42bf) - db $0C,$1E,FIRE_CLUB_ENTRANCE,$08,$02 - db $0E,$1E,FIRE_CLUB_ENTRANCE,$0A,$02 - db $00,$00 - -ChallengeHallEntranceWarpData: ; 1c2cb (7:42cb) - db $08,$10,OVERWORLD_MAP, $00,$00 - db $0A,$10,OVERWORLD_MAP, $00,$00 - db $00,$06,CHALLENGE_HALL_LOBBY,$18,$0A - db $00,$08,CHALLENGE_HALL_LOBBY,$18,$0C - db $08,$00,CHALLENGE_HALL, $0E,$1C - db $0A,$00,CHALLENGE_HALL, $10,$1C - db $00,$00 - -ChallengeHallLobbyWarpData: ; 1c2eb (7:42eb) - db $1A,$0A,CHALLENGE_HALL_ENTRANCE,$02,$06 - db $1A,$0C,CHALLENGE_HALL_ENTRANCE,$02,$08 - db $00,$00 - -ChallengeHallWarpData: ; 1c2f7 (7:42f7) - db $0E,$1E,CHALLENGE_HALL_ENTRANCE,$08,$02 - db $10,$1E,CHALLENGE_HALL_ENTRANCE,$0A,$02 - db $00,$00 - -PokemonDomeEntranceWarpData: ; 1c303 (7:4303) - db $0E,$10,OVERWORLD_MAP,$00,$00 - db $10,$10,OVERWORLD_MAP,$00,$00 - db $16,$00,POKEMON_DOME, $0E,$1C - db $18,$00,POKEMON_DOME, $10,$1C - db $00,$00 - -PokemonDomeWarpData: ; 1c319 (7:4319) - db $0E,$1E,POKEMON_DOME_ENTRANCE,$16,$02 - db $10,$1E,POKEMON_DOME_ENTRANCE,$18,$02 - db $0E,$00,HALL_OF_HONOR, $0A,$16 - db $10,$00,HALL_OF_HONOR, $0C,$16 - db $00,$00 - -HallOfHonorWarpData: ; 1c32f (7:432f) - db $0A,$18,POKEMON_DOME,$0E,$02 - db $0C,$18,POKEMON_DOME,$10,$02 - db $00,$00 +INCLUDE "data/warp_data.asm" Func_1c33b: ; 1c33b (7:433b) push hl @@ -337,43 +88,7 @@ Func_1c33b: ; 1c33b (7:433b) pop hl ret -; todo: figure out the rest of the data for each map -; related to the table at 20:4e5d -MapSongs: ; 1c374 (7:4374) - db $00,$01,$00,$01,$01,MUSIC_OVERWORLD ; OVERWORLD_MAP - db $02,$03,$00,$02,$02,MUSIC_OVERWORLD ; MASON_LABORATORY - db $06,$07,$00,$02,$02,MUSIC_OVERWORLD ; DECK_MACHINE_ROOM - db $0A,$0B,$00,$03,$03,MUSIC_OVERWORLD ; ISHIHARAS_HOUSE - db $0C,$0D,$00,$03,$04,MUSIC_OVERWORLD ; FIGHTING_CLUB_ENTRANCE - db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; FIGHTING_CLUB_LOBBY - db $20,$21,$00,$04,$0D,MUSIC_CLUB3 ; FIGHTING_CLUB - db $0E,$0F,$00,$03,$05,MUSIC_OVERWORLD ; ROCK_CLUB_ENTRANCE - db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; ROCK_CLUB_LOBBY - db $22,$23,$00,$04,$0E,MUSIC_CLUB2 ; ROCK_CLUB - db $10,$11,$00,$03,$06,MUSIC_OVERWORLD ; WATER_CLUB_ENTRANCE - db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; WATER_CLUB_LOBBY - db $24,$25,$00,$02,$0F,MUSIC_CLUB2 ; WATER_CLUB - db $12,$13,$00,$03,$07,MUSIC_OVERWORLD ; LIGHTNING_CLUB_ENTRANCE - db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; LIGHTNING_CLUB_LOBBY - db $26,$27,$00,$05,$10,MUSIC_CLUB1 ; LIGHTNING_CLUB - db $14,$15,$00,$03,$08,MUSIC_OVERWORLD ; GRASS_CLUB_ENTRANCE - db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; GRASS_CLUB_LOBBY - db $28,$29,$00,$06,$11,MUSIC_CLUB1 ; GRASS_CLUB - db $16,$17,$00,$03,$09,MUSIC_OVERWORLD ; PSYCHIC_CLUB_ENTRANCE - db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; PSYCHIC_CLUB_LOBBY - db $2A,$2B,$00,$07,$12,MUSIC_CLUB2 ; PSYCHIC_CLUB - db $18,$19,$00,$03,$0A,MUSIC_OVERWORLD ; SCIENCE_CLUB_ENTRANCE - db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; SCIENCE_CLUB_LOBBY - db $2C,$2D,$00,$06,$13,MUSIC_CLUB3 ; SCIENCE_CLUB - db $1A,$1B,$00,$03,$0B,MUSIC_OVERWORLD ; FIRE_CLUB_ENTRANCE - db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; FIRE_CLUB_LOBBY - db $2E,$2F,$00,$08,$14,MUSIC_CLUB3 ; FIRE_CLUB - db $1C,$1D,$00,$03,$04,MUSIC_OVERWORLD ; CHALLENGE_HALL_ENTRANCE - db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; CHALLENGE_HALL_LOBBY - db $30,$31,$00,$09,$15,MUSIC_OVERWORLD ; CHALLENGE_HALL - db $32,$33,$00,$0A,$16,MUSIC_OVERWORLD ; POKEMON_DOME_ENTRANCE - db $36,$37,$00,$0A,$17,MUSIC_POKEMONDOME ; POKEMON_DOME - db $3A,$3B,$00,$0A,$18,MUSIC_HALLOFHONOR ; HALL_OF_HONOR +INCLUDE "data/map_songs.asm" Func_1c440: ; 1c440 (7:4440) INCBIN "baserom.gbc",$1c440,$1c485 - $1c440 diff --git a/engine/home.asm b/engine/home.asm index bf0a8e7..3ed129b 100755 --- a/engine/home.asm +++ b/engine/home.asm @@ -3952,14 +3952,14 @@ Func_3abd: ; 3abd (0:3abd) add hl, hl add hl, hl add hl, hl - ld bc, MapHeaders + ld bc, MapScripts add hl, bc pop bc ld b, $0 add hl, bc ld a, [$ff80] push af - ld a, BANK(MapHeaders) + ld a, BANK(MapScripts) call BankswitchHome ld a, [hli] ld h, [hl] |