diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-21 11:58:10 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-21 12:15:06 -0400 |
| commit | 9f2ef498fb319ab6a0b343f8165af49ad33b5c78 (patch) | |
| tree | 35eee5afd82436a5b5969e1c22c1f49f87926189 | |
| parent | f2118b1715e8ef29d6967e0a9ab24cb8cd1a8aa4 (diff) | |
Copy pokered map organization (maps/*.blk, scripts/*.asm, data/maps/objects/*.asm)
1144 files changed, 12958 insertions, 12502 deletions
@@ -2,7 +2,7 @@ ROM := pokegold-spaceworld.gb CORRECTEDROM := $(ROM:%.gb=%-correctheader.gb) BASEROM := baserom.gb -DIRS := home engine data audio maps +DIRS := home engine data audio maps scripts FILES := bin.asm gfx.asm vram.asm sram.asm wram.asm hram.asm BUILD := build diff --git a/data/maps/attributes/OldCityPokecenter2F.asm b/data/maps/attributes/OldCityPokecenter2F.asm deleted file mode 100644 index 2f6ab03..0000000 --- a/data/maps/attributes/OldCityPokecenter2F.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/OldCityPokecenter2F.asm", ROMX - map_attributes OldCityPokecenter2F, OLD_CITY_POKECENTER_2F, 0 - -OldCityPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 0, 7, 3, OLD_CITY_POKECENTER_1F, wOverworldMapBlocks + 57 - warp_event 5, 0, 1, OLD_CITY_POKECENTER_TRADE, wOverworldMapBlocks + 17 - warp_event 9, 0, 1, OLD_CITY_POKECENTER_BATTLE, wOverworldMapBlocks + 19 - warp_event 13, 2, 1, OLD_CITY_POKECENTER_TIME_MACHINE, wOverworldMapBlocks + 35 - - db 1 ; bg events - bg_event 1, 1, 0, 1 - - db 4 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 3, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityPokecenter2F_Blocks:: INCBIN "maps/blk/OldCityPokecenter2F.blk" diff --git a/data/maps/attributes/OldCityPokecenterBattle.asm b/data/maps/attributes/OldCityPokecenterBattle.asm deleted file mode 100644 index daae3ac..0000000 --- a/data/maps/attributes/OldCityPokecenterBattle.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/OldCityPokecenterBattle.asm", ROMX - map_attributes OldCityPokecenterBattle, OLD_CITY_POKECENTER_BATTLE, 0 - -OldCityPokecenterBattle_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 3, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityPokecenterBattle_Blocks:: INCBIN "maps/blk/OldCityPokecenterBattle.blk" diff --git a/data/maps/attributes/OldCityPokecenterTimeMachine.asm b/data/maps/attributes/OldCityPokecenterTimeMachine.asm deleted file mode 100644 index 312e633..0000000 --- a/data/maps/attributes/OldCityPokecenterTimeMachine.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/OldCityPokecenterTimeMachine.asm", ROMX - map_attributes OldCityPokecenterTimeMachine, OLD_CITY_POKECENTER_TIME_MACHINE, 0 - -OldCityPokecenterTimeMachine_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 2, 7, 4, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 58 - warp_event 3, 7, 4, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 58 - - db 1 ; bg events - bg_event 15, 3, 0, 1 - - db 1 ; person events - object_event 13, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityPokecenterTimeMachine_Blocks:: INCBIN "maps/blk/OldCityPokecenterTimeMachine.blk" diff --git a/data/maps/attributes/OldCityPokecenterTrade.asm b/data/maps/attributes/OldCityPokecenterTrade.asm deleted file mode 100644 index 7c3abe7..0000000 --- a/data/maps/attributes/OldCityPokecenterTrade.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/OldCityPokecenterTrade.asm", ROMX - map_attributes OldCityPokecenterTrade, OLD_CITY_POKECENTER_TRADE, 0 - -OldCityPokecenterTrade_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 2, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityPokecenterTrade_Blocks:: INCBIN "maps/blk/OldCityPokecenterTrade.blk" diff --git a/data/maps/attributes/PlayerHouse1F.asm b/data/maps/attributes/PlayerHouse1F.asm deleted file mode 100644 index a97559d..0000000 --- a/data/maps/attributes/PlayerHouse1F.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/PlayerHouse1F.asm", ROMX - map_attributes PlayerHouse1F, PLAYER_HOUSE_1F, 0 - -PlayerHouse1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 6, 7, 1, SILENT_HILL, wOverworldMapBlocks + 48 - warp_event 7, 7, 1, SILENT_HILL, wOverworldMapBlocks + 48 - warp_event 9, 0, 1, PLAYER_HOUSE_2F, wOverworldMapBlocks + 16 - - db 5 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 2, 1, 0, 3 - bg_event 4, 1, 0, 4 - bg_event 5, 1, 0, 5 - - db 1 ; person events - object_event 7, 3, SPRITE_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -PlayerHouse1F_Blocks:: INCBIN "maps/blk/PlayerHouse1F.blk" diff --git a/data/maps/attributes/PlayerHouse2F.asm b/data/maps/attributes/PlayerHouse2F.asm deleted file mode 100644 index 66be90b..0000000 --- a/data/maps/attributes/PlayerHouse2F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/PlayerHouse2F.asm", ROMX - map_attributes PlayerHouse2F, PLAYER_HOUSE_2F, 0 - -PlayerHouse2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 9, 0, 3, PLAYER_HOUSE_1F, wOverworldMapBlocks + 16 - - db 5 ; bg events - bg_event 1, 1, 0, 1 - bg_event 2, 1, 0, 2 - bg_event 3, 1, 0, 3 - bg_event 5, 1, 0, 4 - bg_event 7, 2, 0, 5 - - db 2 ; person events - object_event 8, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 1, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -PlayerHouse2F_Blocks:: INCBIN "maps/blk/PlayerHouse2F.blk" diff --git a/data/maps/attributes/Route1Gate1F.asm b/data/maps/attributes/Route1Gate1F.asm deleted file mode 100644 index 0329f21..0000000 --- a/data/maps/attributes/Route1Gate1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/Route1Gate1F.asm", ROMX - map_attributes Route1Gate1F, ROUTE_1_GATE_1F, 0 - -Route1Gate1F_MapEvents:: - dw $4000 ; unknown - - db 5 ; warp events - warp_event 4, 7, 1, ROUTE_1_P2, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, ROUTE_1_P2, wOverworldMapBlocks + 47 - warp_event 4, 0, 12, OLD_CITY, wOverworldMapBlocks + 14 - warp_event 5, 0, 13, OLD_CITY, wOverworldMapBlocks + 14 - warp_event 1, 0, 1, ROUTE_1_GATE_2F, wOverworldMapBlocks + 12 - - db 0 ; bg events - - db 2 ; person events - object_event 6, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Route1Gate1F_Blocks:: INCBIN "maps/blk/Route1Gate1F.blk" diff --git a/data/maps/attributes/Route1Gate2F.asm b/data/maps/attributes/Route1Gate2F.asm deleted file mode 100644 index dcfa07a..0000000 --- a/data/maps/attributes/Route1Gate2F.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/Route1Gate2F.asm", ROMX - map_attributes Route1Gate2F, ROUTE_1_GATE_2F, 0 - -Route1Gate2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 5, 0, 5, ROUTE_1_GATE_1F, wOverworldMapBlocks + 13 - - db 2 ; bg events - bg_event 1, 0, 0, 1 - bg_event 3, 0, 0, 2 - - db 2 ; person events - object_event 3, 3, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 4, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Route1Gate2F_Blocks:: INCBIN "maps/blk/Route1Gate2F.blk" diff --git a/data/maps/attributes/Route1P1.asm b/data/maps/attributes/Route1P1.asm deleted file mode 100644 index 8332b67..0000000 --- a/data/maps/attributes/Route1P1.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/Route1P1.asm", ROMX - map_attributes Route1P1, ROUTE_1_P1, WEST | EAST - connection west, Route1P2, ROUTE_1_P2, -3, 6, 12 - connection east, SilentHill, SILENT_HILL, 0, 0, 9 - -Route1P1_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 8, 8, 2, SHIZUKANA_OKA, wOverworldMapBlocks + 110 - warp_event 8, 9, 3, SHIZUKANA_OKA, wOverworldMapBlocks + 110 - - db 2 ; bg events - bg_event 12, 7, 0, 1 - bg_event 20, 8, 0, 2 - - db 2 ; person events - object_event 20, 5, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 18, 12, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - -Route1P1_Blocks:: INCBIN "maps/blk/Route1P1.blk" diff --git a/data/maps/attributes/Route1P2.asm b/data/maps/attributes/Route1P2.asm deleted file mode 100644 index 881d80e..0000000 --- a/data/maps/attributes/Route1P2.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/Route1P2.asm", ROMX - map_attributes Route1P2, ROUTE_1_P2, NORTH | EAST - connection north, OldCity, OLD_CITY, -3, 2, 16 - connection east, Route1P1, ROUTE_1_P1, 9, 0, 9 - -Route1P2_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 8, 5, 1, ROUTE_1_GATE_1F, wOverworldMapBlocks + 53 - warp_event 9, 5, 2, ROUTE_1_GATE_1F, wOverworldMapBlocks + 53 - warp_event 8, 25, 6, SHIZUKANA_OKA, wOverworldMapBlocks + 213 - warp_event 9, 25, 9, SHIZUKANA_OKA, wOverworldMapBlocks + 213 - - db 1 ; bg events - bg_event 10, 20, 0, 1 - - db 2 ; person events - object_event 8, 6, SPRITE_SILVER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 15, SPRITE_TEACHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - -Route1P2_Blocks:: INCBIN "maps/blk/Route1P2.blk" diff --git a/data/maps/attributes/ShizukanaOka.asm b/data/maps/attributes/ShizukanaOka.asm deleted file mode 100644 index 09978c1..0000000 --- a/data/maps/attributes/ShizukanaOka.asm +++ /dev/null @@ -1,33 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/ShizukanaOka.asm", ROMX - map_attributes ShizukanaOka, SHIZUKANA_OKA, 0 - -ShizukanaOka_MapEvents:: - dw $4000 ; unknown - - db 10 ; warp events - warp_event 49, 28, 1, ROUTE_1_P1, wOverworldMapBlocks + 490 - warp_event 49, 29, 1, ROUTE_1_P1, wOverworldMapBlocks + 490 - warp_event 49, 30, 2, ROUTE_1_P1, wOverworldMapBlocks + 521 - warp_event 49, 31, 2, ROUTE_1_P1, wOverworldMapBlocks + 521 - warp_event 4, 0, 3, ROUTE_1_P2, wOverworldMapBlocks + 34 - warp_event 5, 0, 3, ROUTE_1_P2, wOverworldMapBlocks + 34 - warp_event 6, 0, 3, ROUTE_1_P2, wOverworldMapBlocks + 35 - warp_event 7, 0, 4, ROUTE_1_P2, wOverworldMapBlocks + 35 - warp_event 8, 0, 4, ROUTE_1_P2, wOverworldMapBlocks + 36 - warp_event 9, 0, 4, ROUTE_1_P2, wOverworldMapBlocks + 36 - - db 2 ; bg events - bg_event 9, 2, 0, 1 - bg_event 47, 28, 0, 2 - - db 6 ; person events - object_event 41, 28, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 7, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 - object_event 41, 19, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 - object_event 27, 14, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 36, 16, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 - object_event 9, 25, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 - -ShizukanaOka_Blocks:: INCBIN "maps/blk/ShizukanaOka.blk" diff --git a/data/maps/attributes/SilentHill.asm b/data/maps/attributes/SilentHill.asm deleted file mode 100644 index b791c37..0000000 --- a/data/maps/attributes/SilentHill.asm +++ /dev/null @@ -1,32 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/SilentHill.asm", ROMX - map_attributes SilentHill, SILENT_HILL, NORTH | WEST | EAST - connection north, PrinceRoute, PRINCE_ROUTE, 0, 0, 10 - connection west, Route1P1, ROUTE_1_P1, 0, 0, 9 - connection east, RouteSilentEast, ROUTE_SILENT_EAST, 0, 0, 9 - -SilentHill_MapEvents:: - dw $4000 ; unknown - - db 5 ; warp events - warp_event 5, 4, 1, PLAYER_HOUSE_1F, wOverworldMapBlocks + 51 - warp_event 13, 4, 1, SILENT_HILL_POKECENTER, wOverworldMapBlocks + 55 - warp_event 3, 12, 1, SILENT_HILL_HOUSE, wOverworldMapBlocks + 114 - warp_event 14, 11, 1, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 104 - warp_event 15, 11, 2, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 104 - - db 5 ; bg events - bg_event 8, 4, 0, 1 - bg_event 14, 4, 0, 2 - bg_event 16, 5, 0, 3 - bg_event 10, 11, 0, 4 - bg_event 6, 12, 0, 5 - - db 4 ; person events - object_event 6, 10, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 9, SPRITE_BLUE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 6, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 13, SPRITE_SUPER_NERD, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SilentHill_Blocks:: INCBIN "maps/blk/SilentHill.blk" diff --git a/data/maps/attributes/SilentHillHouse.asm b/data/maps/attributes/SilentHillHouse.asm deleted file mode 100644 index 7aa6d92..0000000 --- a/data/maps/attributes/SilentHillHouse.asm +++ /dev/null @@ -1,25 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/SilentHillHouse.asm", ROMX - map_attributes SilentHillHouse, SILENT_HILL_HOUSE, 0 - -SilentHillHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 3, SILENT_HILL, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, SILENT_HILL, wOverworldMapBlocks + 47 - - db 6 ; bg events - bg_event 0, 1, 0, 1 - bg_event 4, 1, 0, 2 - bg_event 5, 1, 0, 3 - bg_event 9, 1, 0, 4 - bg_event 8, 1, 0, 5 - bg_event 2, 0, 0, 6 - - db 2 ; person events - object_event 5, 3, SPRITE_SILVERS_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SilentHillHouse_Blocks:: INCBIN "maps/blk/SilentHillHouse.blk" diff --git a/data/maps/attributes/SilentHillLabBack.asm b/data/maps/attributes/SilentHillLabBack.asm deleted file mode 100644 index fc069c4..0000000 --- a/data/maps/attributes/SilentHillLabBack.asm +++ /dev/null @@ -1,27 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/SilentHillLabBack.asm", ROMX - map_attributes SilentHillLabBack, SILENT_HILL_LAB_BACK, 0 - -SilentHillLabBack_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 3, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 42 - warp_event 4, 7, 3, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 43 - - db 5 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 2, 1, 0, 3 - bg_event 3, 1, 0, 4 - bg_event 6, 0, 0, 5 - - db 5 ; person events - object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 4, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SilentHillLabBack_Blocks:: INCBIN "maps/blk/SilentHillLabBack.blk" diff --git a/data/maps/attributes/SilentHillLabFront.asm b/data/maps/attributes/SilentHillLabFront.asm deleted file mode 100644 index fbae2f8..0000000 --- a/data/maps/attributes/SilentHillLabFront.asm +++ /dev/null @@ -1,44 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/SilentHillLabFront.asm", ROMX - map_attributes SilentHillLabFront, SILENT_HILL_LAB_FRONT, 0 - -SilentHillLabFront_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 3, 15, 4, SILENT_HILL, wOverworldMapBlocks + 82 - warp_event 4, 15, 5, SILENT_HILL, wOverworldMapBlocks + 83 - warp_event 4, 0, 2, SILENT_HILL_LAB_BACK, wOverworldMapBlocks + 13 - - db 15 ; bg events - bg_event 6, 1, 0, 1 - bg_event 2, 0, 0, 2 - bg_event 0, 7, 0, 3 - bg_event 1, 7, 0, 4 - bg_event 2, 7, 0, 5 - bg_event 5, 7, 0, 6 - bg_event 6, 7, 0, 7 - bg_event 7, 7, 0, 8 - bg_event 0, 11, 0, 9 - bg_event 1, 11, 0, 10 - bg_event 2, 11, 0, 11 - bg_event 5, 11, 0, 12 - bg_event 6, 11, 0, 13 - bg_event 7, 11, 0, 14 - bg_event 4, 0, 0, 15 - - db 11 ; person events - object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 0, SPRITE_OKIDO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 4, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 0, SPRITE_SILVER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 14, SPRITE_BLUE, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 3, SPRITE_BLUE, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 13, SPRITE_NANAMI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 8, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 12, SPRITE_SCIENTIST, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SilentHillLabFront_Blocks:: INCBIN "maps/blk/SilentHillLabFront.blk" diff --git a/data/maps/attributes/SilentHillPokecenter.asm b/data/maps/attributes/SilentHillPokecenter.asm deleted file mode 100644 index 1f1bad8..0000000 --- a/data/maps/attributes/SilentHillPokecenter.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/SilentHillPokecenter.asm", ROMX - map_attributes SilentHillPokecenter, SILENT_HILL_POKECENTER, 0 - -SilentHillPokecenter_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 5, 7, 2, SILENT_HILL, wOverworldMapBlocks + 59 - warp_event 6, 7, 2, SILENT_HILL, wOverworldMapBlocks + 60 - - db 1 ; bg events - bg_event 13, 1, 0, 1 - - db 5 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 4, SPRITE_24, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_SIDON, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SilentHillPokecenter_Blocks:: INCBIN "maps/blk/SilentHillPokecenter.blk" diff --git a/data/maps/attributes/UnusedMap13.asm b/data/maps/attributes/UnusedMap13.asm deleted file mode 100644 index e178b08..0000000 --- a/data/maps/attributes/UnusedMap13.asm +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/UnusedMap13.asm", ROMX - map_attributes UnusedMap13, UNUSED_MAP_13, 0 - -UnusedMap13_MapEvents:: -UnusedMap13_Blocks:: INCBIN "maps/blk/UnusedMap13.blk" diff --git a/data/maps/attributes/placeholder/Baadon.asm b/data/maps/attributes/placeholder/Baadon.asm deleted file mode 100644 index c6d8472..0000000 --- a/data/maps/attributes/placeholder/Baadon.asm +++ /dev/null @@ -1,34 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Baadon.asm", ROMX - map_attributes Baadon, BAADON, NORTH | SOUTH | EAST - connection north, FontoRoute4, FONTO_ROUTE_4, 0, 0, 10 - connection south, BaadonRoute1, BAADON_ROUTE_1, 0, 0, 10 - connection east, BaadonRoute2, BAADON_ROUTE_2, 0, 0, 9 - -Baadon_MapEvents:: - dw $4000 ; unknown - - db 9 ; warp events - warp_event 3, 4, 1, BAADON_MART, wOverworldMapBlocks + 50 - warp_event 15, 4, 1, BAADON_POKECENTER_1F, wOverworldMapBlocks + 56 - warp_event 4, 9, 1, BAADON_HOUSE_1, wOverworldMapBlocks + 83 - warp_event 3, 13, 1, BAADON_WALLPAPER_HOUSE, wOverworldMapBlocks + 114 - warp_event 9, 13, 1, BAADON_HOUSE_2, wOverworldMapBlocks + 117 - warp_event 14, 15, 1, BAADON_LEAGUE_1F, wOverworldMapBlocks + 136 - warp_event 15, 15, 2, BAADON_LEAGUE_1F, wOverworldMapBlocks + 136 - warp_event 8, 5, 1, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 53 - warp_event 9, 5, 2, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 53 - - db 4 ; bg events - bg_event 4, 4, 0, 1 - bg_event 16, 4, 0, 2 - bg_event 11, 10, 0, 3 - bg_event 6, 14, 0, 4 - - db 3 ; person events - object_event 14, 8, SPRITE_SUPER_NERD, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 9, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 14, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Baadon_Blocks:: INCBIN "maps/placeholder/blk/Baadon.blk" diff --git a/data/maps/attributes/placeholder/BaadonHouse1.asm b/data/maps/attributes/placeholder/BaadonHouse1.asm deleted file mode 100644 index df97af6..0000000 --- a/data/maps/attributes/placeholder/BaadonHouse1.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonHouse1.asm", ROMX - map_attributes BaadonHouse1, BAADON_HOUSE_1, 0 - -BaadonHouse1_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 3, BAADON, wOverworldMapBlocks + 42 - warp_event 4, 7, 3, BAADON, wOverworldMapBlocks + 43 - - db 0 ; bg events - - db 1 ; person events - object_event 2, 3, SPRITE_ELDER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BaadonHouse1_Blocks:: INCBIN "maps/placeholder/blk/BaadonHouse1.blk" diff --git a/data/maps/attributes/placeholder/BaadonHouse2.asm b/data/maps/attributes/placeholder/BaadonHouse2.asm deleted file mode 100644 index 0cd6f84..0000000 --- a/data/maps/attributes/placeholder/BaadonHouse2.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonHouse2.asm", ROMX - map_attributes BaadonHouse2, BAADON_HOUSE_2, 0 - -BaadonHouse2_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 5, BAADON, wOverworldMapBlocks + 47 - warp_event 5, 7, 5, BAADON, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 7, 5, SPRITE_GRANNY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BaadonHouse2_Blocks:: INCBIN "maps/placeholder/blk/BaadonHouse2.blk" diff --git a/data/maps/attributes/placeholder/BaadonLeague1F.asm b/data/maps/attributes/placeholder/BaadonLeague1F.asm deleted file mode 100644 index cd94f09..0000000 --- a/data/maps/attributes/placeholder/BaadonLeague1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonLeague1F.asm", ROMX - map_attributes BaadonLeague1F, BAADON_LEAGUE_1F, 0 - -BaadonLeague1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 3, 15, 6, BAADON, wOverworldMapBlocks + 82 - warp_event 4, 15, 7, BAADON, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, BAADON_LEAGUE_2F, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -BaadonLeague1F_Blocks:: INCBIN "maps/placeholder/blk/BaadonLeague1F.blk" diff --git a/data/maps/attributes/placeholder/BaadonLeague2F.asm b/data/maps/attributes/placeholder/BaadonLeague2F.asm deleted file mode 100644 index 0e49595..0000000 --- a/data/maps/attributes/placeholder/BaadonLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonLeague2F.asm", ROMX - map_attributes BaadonLeague2F, BAADON_LEAGUE_2F, 0 - -BaadonLeague2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 7, 15, 3, BAADON_LEAGUE_1F, wOverworldMapBlocks + 92 - - db 0 ; bg events - - db 5 ; person events - object_event 4, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 2, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 1, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 9, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 11, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BaadonLeague2F_Blocks:: INCBIN "maps/placeholder/blk/BaadonLeague2F.blk" diff --git a/data/maps/attributes/placeholder/BaadonMart.asm b/data/maps/attributes/placeholder/BaadonMart.asm deleted file mode 100644 index 2d680c6..0000000 --- a/data/maps/attributes/placeholder/BaadonMart.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonMart.asm", ROMX - map_attributes BaadonMart, BAADON_MART, 0 - -BaadonMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 1, BAADON, wOverworldMapBlocks + 59 - warp_event 5, 7, 1, BAADON, wOverworldMapBlocks + 59 - - db 0 ; bg events - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BaadonMart_Blocks:: INCBIN "maps/placeholder/blk/BaadonMart.blk" diff --git a/data/maps/attributes/placeholder/BaadonPokecenter1F.asm b/data/maps/attributes/placeholder/BaadonPokecenter1F.asm deleted file mode 100644 index 47bd993..0000000 --- a/data/maps/attributes/placeholder/BaadonPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonPokecenter1F.asm", ROMX - map_attributes BaadonPokecenter1F, BAADON_POKECENTER_1F, 0 - -BaadonPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 2, BAADON, wOverworldMapBlocks + 59 - warp_event 6, 7, 2, BAADON, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, BAADON_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 14, 6, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BaadonPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/BaadonPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/BaadonPokecenter2F.asm b/data/maps/attributes/placeholder/BaadonPokecenter2F.asm deleted file mode 100644 index d6fd1a8..0000000 --- a/data/maps/attributes/placeholder/BaadonPokecenter2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonPokecenter2F.asm", ROMX - map_attributes BaadonPokecenter2F, BAADON_POKECENTER_2F, 0 - -BaadonPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, BAADON_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BaadonPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/BaadonPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/BaadonRoute1.asm b/data/maps/attributes/placeholder/BaadonRoute1.asm deleted file mode 100644 index 48c3a54..0000000 --- a/data/maps/attributes/placeholder/BaadonRoute1.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonRoute1.asm", ROMX - map_attributes BaadonRoute1, BAADON_ROUTE_1, NORTH | SOUTH - connection north, Baadon, BAADON, 0, 0, 10 - connection south, West, WEST, -3, 2, 16 - -BaadonRoute1_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 12, 48, 3, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 407 - warp_event 13, 48, 4, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 407 - - db 0 ; bg events - - db 0 ; person events - -BaadonRoute1_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute1.blk" diff --git a/data/maps/attributes/placeholder/BaadonRoute2.asm b/data/maps/attributes/placeholder/BaadonRoute2.asm deleted file mode 100644 index cb5d9bc..0000000 --- a/data/maps/attributes/placeholder/BaadonRoute2.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonRoute2.asm", ROMX - map_attributes BaadonRoute2, BAADON_ROUTE_2, WEST | EAST - connection west, Baadon, BAADON, 0, 0, 9 - connection east, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 12 - -BaadonRoute2_MapEvents:: - dw $4000 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -BaadonRoute2_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute2.blk" diff --git a/data/maps/attributes/placeholder/BaadonRoute3.asm b/data/maps/attributes/placeholder/BaadonRoute3.asm deleted file mode 100644 index d0e468d..0000000 --- a/data/maps/attributes/placeholder/BaadonRoute3.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonRoute3.asm", ROMX - map_attributes BaadonRoute3, BAADON_ROUTE_3, SOUTH | WEST - connection south, Route15, ROUTE_15, 0, 0, 13 - connection west, BaadonRoute2, BAADON_ROUTE_2, 0, 0, 9 - -BaadonRoute3_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 8, 30, 3, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 261 - warp_event 9, 30, 4, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 261 - - db 0 ; bg events - - db 0 ; person events - -BaadonRoute3_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute3.blk" diff --git a/data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm b/data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm deleted file mode 100644 index d144ca5..0000000 --- a/data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm", ROMX - map_attributes BaadonRouteGateNewtype, BAADON_ROUTE_GATE_NEWTYPE, 0 - -BaadonRouteGateNewtype_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 4, 7, 1, ROUTE_15, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, ROUTE_15, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, BAADON_ROUTE_3, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, BAADON_ROUTE_3, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 0 ; person events - -BaadonRouteGateNewtype_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateNewtype.blk" diff --git a/data/maps/attributes/placeholder/BaadonRouteGateWest.asm b/data/maps/attributes/placeholder/BaadonRouteGateWest.asm deleted file mode 100644 index 7763028..0000000 --- a/data/maps/attributes/placeholder/BaadonRouteGateWest.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonRouteGateWest.asm", ROMX - map_attributes BaadonRouteGateWest, BAADON_ROUTE_GATE_WEST, 0 - -BaadonRouteGateWest_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 4, 7, 11, WEST, wOverworldMapBlocks + 47 - warp_event 5, 7, 12, WEST, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, BAADON_ROUTE_1, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, BAADON_ROUTE_1, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 0 ; person events - -BaadonRouteGateWest_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateWest.blk" diff --git a/data/maps/attributes/placeholder/BaadonWallpaperHouse.asm b/data/maps/attributes/placeholder/BaadonWallpaperHouse.asm deleted file mode 100644 index 5a4d361..0000000 --- a/data/maps/attributes/placeholder/BaadonWallpaperHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BaadonWallpaperHouse.asm", ROMX - map_attributes BaadonWallpaperHouse, BAADON_WALLPAPER_HOUSE, 0 - -BaadonWallpaperHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 2, 7, 4, BAADON, wOverworldMapBlocks + 42 - warp_event 3, 7, 4, BAADON, wOverworldMapBlocks + 42 - - db 0 ; bg events - - db 0 ; person events - -BaadonWallpaperHouse_Blocks:: INCBIN "maps/placeholder/blk/BaadonWallpaperHouse.blk" diff --git a/data/maps/attributes/placeholder/BullForest.asm b/data/maps/attributes/placeholder/BullForest.asm deleted file mode 100644 index 9900661..0000000 --- a/data/maps/attributes/placeholder/BullForest.asm +++ /dev/null @@ -1,34 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullForest.asm", ROMX - map_attributes BullForest, BULL_FOREST, NORTH | SOUTH | WEST - connection north, BullForestRoute3, BULL_FOREST_ROUTE_3, 5, 0, 10 - connection south, BullForestRoute2, BULL_FOREST_ROUTE_2, 5, 0, 10 - connection west, BullForestRoute1, BULL_FOREST_ROUTE_1, 9, 0, 9 - -BullForest_MapEvents:: - dw $4000 ; unknown - - db 8 ; warp events - warp_event 25, 6, 1, BULL_MART, wOverworldMapBlocks + 117 - warp_event 9, 9, 1, BULL_HOUSE_1, wOverworldMapBlocks + 135 - warp_event 27, 11, 1, BULL_HOUSE_2, wOverworldMapBlocks + 170 - warp_event 19, 13, 1, BULL_HOUSE_3, wOverworldMapBlocks + 192 - warp_event 13, 18, 1, BULL_POKECENTER_1F, wOverworldMapBlocks + 267 - warp_event 26, 21, 1, BULL_LEAGUE_1F, wOverworldMapBlocks + 300 - warp_event 27, 21, 2, BULL_LEAGUE_1F, wOverworldMapBlocks + 300 - warp_event 3, 22, 1, BULL_HOUSE_4, wOverworldMapBlocks + 314 - - db 3 ; bg events - bg_event 26, 6, 0, 1 - bg_event 2, 16, 0, 2 - bg_event 14, 18, 0, 3 - - db 5 ; person events - object_event 21, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 11, 12, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 16, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 20, 19, SPRITE_TEACHER, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 20, 29, SPRITE_BUG_CATCHER_BOY, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -BullForest_Blocks:: INCBIN "maps/placeholder/blk/BullForest.blk" diff --git a/data/maps/attributes/placeholder/BullForestRoute1.asm b/data/maps/attributes/placeholder/BullForestRoute1.asm deleted file mode 100644 index 7df21a6..0000000 --- a/data/maps/attributes/placeholder/BullForestRoute1.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullForestRoute1.asm", ROMX - map_attributes BullForestRoute1, BULL_FOREST_ROUTE_1, SOUTH | EAST - connection south, Route18, ROUTE_18, 0, 0, 10 - connection east, BullForest, BULL_FOREST, -3, 6, 12 - -BullForestRoute1_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 8, 12, 3, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 222 - warp_event 9, 12, 4, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 222 - warp_event 9, 5, 1, BULL_FOREST_ROUTE_1_HOUSE, wOverworldMapBlocks + 98 - - db 0 ; bg events - - db 0 ; person events - -BullForestRoute1_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1.blk" diff --git a/data/maps/attributes/placeholder/BullForestRoute1House.asm b/data/maps/attributes/placeholder/BullForestRoute1House.asm deleted file mode 100644 index a6bafc4..0000000 --- a/data/maps/attributes/placeholder/BullForestRoute1House.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullForestRoute1House.asm", ROMX - map_attributes BullForestRoute1House, BULL_FOREST_ROUTE_1_HOUSE, 0 - -BullForestRoute1House_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 3, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 1, 5, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BullForestRoute1House_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1House.blk" diff --git a/data/maps/attributes/placeholder/BullForestRoute2.asm b/data/maps/attributes/placeholder/BullForestRoute2.asm deleted file mode 100644 index cd1fc03..0000000 --- a/data/maps/attributes/placeholder/BullForestRoute2.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullForestRoute2.asm", ROMX - map_attributes BullForestRoute2, BULL_FOREST_ROUTE_2, NORTH | SOUTH - connection north, BullForest, BULL_FOREST, -3, 2, 16 - connection south, Stand, STAND, -3, 7, 13 - -BullForestRoute2_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 8, 48, 3, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 405 - warp_event 9, 48, 4, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 405 - - db 0 ; bg events - - db 0 ; person events - -BullForestRoute2_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute2.blk" diff --git a/data/maps/attributes/placeholder/BullForestRoute3.asm b/data/maps/attributes/placeholder/BullForestRoute3.asm deleted file mode 100644 index b014dcf..0000000 --- a/data/maps/attributes/placeholder/BullForestRoute3.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullForestRoute3.asm", ROMX - map_attributes BullForestRoute3, BULL_FOREST_ROUTE_3, NORTH | SOUTH - connection north, North, NORTH, 0, 0, 10 - connection south, BullForest, BULL_FOREST, -3, 2, 16 - -BullForestRoute3_MapEvents:: - dw $4000 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -BullForestRoute3_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute3.blk" diff --git a/data/maps/attributes/placeholder/BullForestRouteGateStand.asm b/data/maps/attributes/placeholder/BullForestRouteGateStand.asm deleted file mode 100644 index b7c56a4..0000000 --- a/data/maps/attributes/placeholder/BullForestRouteGateStand.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullForestRouteGateStand.asm", ROMX - map_attributes BullForestRouteGateStand, BULL_FOREST_ROUTE_GATE_STAND, 0 - -BullForestRouteGateStand_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 4, 7, 9, STAND, wOverworldMapBlocks + 47 - warp_event 5, 7, 10, STAND, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, BULL_FOREST_ROUTE_2, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, BULL_FOREST_ROUTE_2, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 0 ; person events - -BullForestRouteGateStand_Blocks:: INCBIN "maps/placeholder/blk/BullForestRouteGateStand.blk" diff --git a/data/maps/attributes/placeholder/BullHouse1.asm b/data/maps/attributes/placeholder/BullHouse1.asm deleted file mode 100644 index 68fbd68..0000000 --- a/data/maps/attributes/placeholder/BullHouse1.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullHouse1.asm", ROMX - map_attributes BullHouse1, BULL_HOUSE_1, 0 - -BullHouse1_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 2, BULL_FOREST, wOverworldMapBlocks + 42 - warp_event 4, 7, 2, BULL_FOREST, wOverworldMapBlocks + 43 - - db 0 ; bg events - - db 1 ; person events - object_event 2, 3, SPRITE_KIKUKO, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BullHouse1_Blocks:: INCBIN "maps/placeholder/blk/BullHouse1.blk" diff --git a/data/maps/attributes/placeholder/BullHouse2.asm b/data/maps/attributes/placeholder/BullHouse2.asm deleted file mode 100644 index 116e167..0000000 --- a/data/maps/attributes/placeholder/BullHouse2.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullHouse2.asm", ROMX - map_attributes BullHouse2, BULL_HOUSE_2, 0 - -BullHouse2_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 3, BULL_FOREST, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, BULL_FOREST, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 8, 4, SPRITE_GRANNY, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 - -BullHouse2_Blocks:: INCBIN "maps/placeholder/blk/BullHouse2.blk" diff --git a/data/maps/attributes/placeholder/BullHouse3.asm b/data/maps/attributes/placeholder/BullHouse3.asm deleted file mode 100644 index 95f6f63..0000000 --- a/data/maps/attributes/placeholder/BullHouse3.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullHouse3.asm", ROMX - map_attributes BullHouse3, BULL_HOUSE_3, 0 - -BullHouse3_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 4, BULL_FOREST, wOverworldMapBlocks + 47 - warp_event 5, 7, 4, BULL_FOREST, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BullHouse3_Blocks:: INCBIN "maps/placeholder/blk/BullHouse3.blk" diff --git a/data/maps/attributes/placeholder/BullHouse4.asm b/data/maps/attributes/placeholder/BullHouse4.asm deleted file mode 100644 index 4f54fd9..0000000 --- a/data/maps/attributes/placeholder/BullHouse4.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullHouse4.asm", ROMX - map_attributes BullHouse4, BULL_HOUSE_4, 0 - -BullHouse4_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 8, BULL_FOREST, wOverworldMapBlocks + 47 - warp_event 5, 7, 8, BULL_FOREST, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 0 ; person events - -BullHouse4_Blocks:: INCBIN "maps/placeholder/blk/BullHouse4.blk" diff --git a/data/maps/attributes/placeholder/BullLeague1F.asm b/data/maps/attributes/placeholder/BullLeague1F.asm deleted file mode 100644 index 49f4480..0000000 --- a/data/maps/attributes/placeholder/BullLeague1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullLeague1F.asm", ROMX - map_attributes BullLeague1F, BULL_LEAGUE_1F, 0 - -BullLeague1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 3, 15, 6, BULL_FOREST, wOverworldMapBlocks + 82 - warp_event 4, 15, 7, BULL_FOREST, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, BULL_LEAGUE_2F, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -BullLeague1F_Blocks:: INCBIN "maps/placeholder/blk/BullLeague1F.blk" diff --git a/data/maps/attributes/placeholder/BullLeague2F.asm b/data/maps/attributes/placeholder/BullLeague2F.asm deleted file mode 100644 index 88195ba..0000000 --- a/data/maps/attributes/placeholder/BullLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullLeague2F.asm", ROMX - map_attributes BullLeague2F, BULL_LEAGUE_2F, 0 - -BullLeague2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 7, 15, 3, BULL_LEAGUE_1F, wOverworldMapBlocks + 92 - - db 0 ; bg events - - db 5 ; person events - object_event 4, 4, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 9, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 9, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BullLeague2F_Blocks:: INCBIN "maps/placeholder/blk/BullLeague2F.blk" diff --git a/data/maps/attributes/placeholder/BullMart.asm b/data/maps/attributes/placeholder/BullMart.asm deleted file mode 100644 index ab6406d..0000000 --- a/data/maps/attributes/placeholder/BullMart.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullMart.asm", ROMX - map_attributes BullMart, BULL_MART, 0 - -BullMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 1, BULL_FOREST, wOverworldMapBlocks + 59 - warp_event 5, 7, 1, BULL_FOREST, wOverworldMapBlocks + 59 - - db 0 ; bg events - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_FISHER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BullMart_Blocks:: INCBIN "maps/placeholder/blk/BullMart.blk" diff --git a/data/maps/attributes/placeholder/BullPokecenter1F.asm b/data/maps/attributes/placeholder/BullPokecenter1F.asm deleted file mode 100644 index 8b1d201..0000000 --- a/data/maps/attributes/placeholder/BullPokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullPokecenter1F.asm", ROMX - map_attributes BullPokecenter1F, BULL_POKECENTER_1F, 0 - -BullPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 5, BULL_FOREST, wOverworldMapBlocks + 59 - warp_event 6, 7, 5, BULL_FOREST, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, BULL_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BullPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/BullPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/BullPokecenter2F.asm b/data/maps/attributes/placeholder/BullPokecenter2F.asm deleted file mode 100644 index 7a3960e..0000000 --- a/data/maps/attributes/placeholder/BullPokecenter2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/BullPokecenter2F.asm", ROMX - map_attributes BullPokecenter2F, BULL_POKECENTER_2F, 0 - -BullPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, BULL_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BullPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/BullPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts1.asm b/data/maps/attributes/placeholder/CaveMinecarts1.asm deleted file mode 100644 index 5671702..0000000 --- a/data/maps/attributes/placeholder/CaveMinecarts1.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/CaveMinecarts1.asm", ROMX - map_attributes CaveMinecarts1, CAVE_MINECARTS_1, 0 - -CaveMinecarts1_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -CaveMinecarts1_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts1.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts2.asm b/data/maps/attributes/placeholder/CaveMinecarts2.asm deleted file mode 100644 index fd6af2e..0000000 --- a/data/maps/attributes/placeholder/CaveMinecarts2.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/CaveMinecarts2.asm", ROMX - map_attributes CaveMinecarts2, CAVE_MINECARTS_2, 0 - -CaveMinecarts2_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -CaveMinecarts2_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts2.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts3.asm b/data/maps/attributes/placeholder/CaveMinecarts3.asm deleted file mode 100644 index 4cca968..0000000 --- a/data/maps/attributes/placeholder/CaveMinecarts3.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/CaveMinecarts3.asm", ROMX - map_attributes CaveMinecarts3, CAVE_MINECARTS_3, 0 - -CaveMinecarts3_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -CaveMinecarts3_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts3.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts4.asm b/data/maps/attributes/placeholder/CaveMinecarts4.asm deleted file mode 100644 index 315527b..0000000 --- a/data/maps/attributes/placeholder/CaveMinecarts4.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/CaveMinecarts4.asm", ROMX - map_attributes CaveMinecarts4, CAVE_MINECARTS_4, 0 - -CaveMinecarts4_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -CaveMinecarts4_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts4.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts5.asm b/data/maps/attributes/placeholder/CaveMinecarts5.asm deleted file mode 100644 index ba07065..0000000 --- a/data/maps/attributes/placeholder/CaveMinecarts5.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/CaveMinecarts5.asm", ROMX - map_attributes CaveMinecarts5, CAVE_MINECARTS_5, 0 - -CaveMinecarts5_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -CaveMinecarts5_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts5.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts6.asm b/data/maps/attributes/placeholder/CaveMinecarts6.asm deleted file mode 100644 index c4d435d..0000000 --- a/data/maps/attributes/placeholder/CaveMinecarts6.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/CaveMinecarts6.asm", ROMX - map_attributes CaveMinecarts6, CAVE_MINECARTS_6, 0 - -CaveMinecarts6_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -CaveMinecarts6_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts6.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts7.asm b/data/maps/attributes/placeholder/CaveMinecarts7.asm deleted file mode 100644 index c411e1b..0000000 --- a/data/maps/attributes/placeholder/CaveMinecarts7.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/CaveMinecarts7.asm", ROMX - map_attributes CaveMinecarts7, CAVE_MINECARTS_7, 0 - -CaveMinecarts7_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -CaveMinecarts7_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts7.blk" diff --git a/data/maps/attributes/placeholder/Fonto.asm b/data/maps/attributes/placeholder/Fonto.asm deleted file mode 100644 index 278eba1..0000000 --- a/data/maps/attributes/placeholder/Fonto.asm +++ /dev/null @@ -1,32 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Fonto.asm", ROMX - map_attributes Fonto, FONTO, NORTH | WEST | EAST - connection north, FontoRoute2, FONTO_ROUTE_2, 0, 0, 10 - connection west, FontoRoute1, FONTO_ROUTE_1, 0, 0, 9 - connection east, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9 - -Fonto_MapEvents:: - dw $4000 ; unknown - - db 5 ; warp events - warp_event 4, 3, 1, FONTO_ROCKET_HOUSE, wOverworldMapBlocks + 35 - warp_event 15, 4, 1, FONTO_MART, wOverworldMapBlocks + 56 - warp_event 3, 7, 1, FONTO_HOUSE, wOverworldMapBlocks + 66 - warp_event 3, 12, 1, FONTO_POKECENTER_1F, wOverworldMapBlocks + 114 - warp_event 16, 13, 1, FONTO_LAB, wOverworldMapBlocks + 121 - - db 5 ; bg events - bg_event 15, 4, 0, 1 - bg_event 14, 6, 0, 2 - bg_event 4, 12, 0, 3 - bg_event 6, 12, 0, 4 - bg_event 10, 12, 0, 5 - - db 4 ; person events - object_event 2, 4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_SIDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 16, 8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - -Fonto_Blocks:: INCBIN "maps/placeholder/blk/Fonto.blk" diff --git a/data/maps/attributes/placeholder/FontoHouse.asm b/data/maps/attributes/placeholder/FontoHouse.asm deleted file mode 100644 index 6a3bcf8..0000000 --- a/data/maps/attributes/placeholder/FontoHouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoHouse.asm", ROMX - map_attributes FontoHouse, FONTO_HOUSE, 0 - -FontoHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 3, FONTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, FONTO, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 8, 4, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 - -FontoHouse_Blocks:: INCBIN "maps/placeholder/blk/FontoHouse.blk" diff --git a/data/maps/attributes/placeholder/FontoLab.asm b/data/maps/attributes/placeholder/FontoLab.asm deleted file mode 100644 index ae79e99..0000000 --- a/data/maps/attributes/placeholder/FontoLab.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoLab.asm", ROMX - map_attributes FontoLab, FONTO_LAB, 0 - -FontoLab_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 5, FONTO, wOverworldMapBlocks + 46 - warp_event 4, 7, 5, FONTO, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 2 ; person events - object_event 2, 2, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 5, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -FontoLab_Blocks:: INCBIN "maps/placeholder/blk/FontoLab.blk" diff --git a/data/maps/attributes/placeholder/FontoMart.asm b/data/maps/attributes/placeholder/FontoMart.asm deleted file mode 100644 index 76572c3..0000000 --- a/data/maps/attributes/placeholder/FontoMart.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoMart.asm", ROMX - map_attributes FontoMart, FONTO_MART, 0 - -FontoMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 2, FONTO, wOverworldMapBlocks + 59 - warp_event 5, 7, 2, FONTO, wOverworldMapBlocks + 59 - - db 0 ; bg events - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -FontoMart_Blocks:: INCBIN "maps/placeholder/blk/FontoMart.blk" diff --git a/data/maps/attributes/placeholder/FontoPokecenter1F.asm b/data/maps/attributes/placeholder/FontoPokecenter1F.asm deleted file mode 100644 index 10a0302..0000000 --- a/data/maps/attributes/placeholder/FontoPokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoPokecenter1F.asm", ROMX - map_attributes FontoPokecenter1F, FONTO_POKECENTER_1F, 0 - -FontoPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 4, FONTO, wOverworldMapBlocks + 59 - warp_event 6, 7, 4, FONTO, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, FONTO_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -FontoPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/FontoPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/FontoPokecenter2F.asm b/data/maps/attributes/placeholder/FontoPokecenter2F.asm deleted file mode 100644 index 6d6ff94..0000000 --- a/data/maps/attributes/placeholder/FontoPokecenter2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoPokecenter2F.asm", ROMX - map_attributes FontoPokecenter2F, FONTO_POKECENTER_2F, 0 - -FontoPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, FONTO_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -FontoPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/FontoPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/FontoRocketHouse.asm b/data/maps/attributes/placeholder/FontoRocketHouse.asm deleted file mode 100644 index a291669..0000000 --- a/data/maps/attributes/placeholder/FontoRocketHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoRocketHouse.asm", ROMX - map_attributes FontoRocketHouse, FONTO_ROCKET_HOUSE, 0 - -FontoRocketHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 12, 7, 1, FONTO, wOverworldMapBlocks + 63 - warp_event 13, 7, 1, FONTO, wOverworldMapBlocks + 63 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 2, SPRITE_ROCKET_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 12, 2, SPRITE_POPPO, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -FontoRocketHouse_Blocks:: INCBIN "maps/placeholder/blk/FontoRocketHouse.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute1.asm b/data/maps/attributes/placeholder/FontoRoute1.asm deleted file mode 100644 index 7d7831a..0000000 --- a/data/maps/attributes/placeholder/FontoRoute1.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoRoute1.asm", ROMX - map_attributes FontoRoute1, FONTO_ROUTE_1, WEST | EAST - connection west, South, SOUTH, 0, 0, 12 - connection east, Fonto, FONTO, 0, 0, 9 - -FontoRoute1_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 6, 9, 3, FONTO_ROUTE_GATE_1, wOverworldMapBlocks + 209 - - db 0 ; bg events - - db 0 ; person events - -FontoRoute1_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute1.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute2.asm b/data/maps/attributes/placeholder/FontoRoute2.asm deleted file mode 100644 index 10957aa..0000000 --- a/data/maps/attributes/placeholder/FontoRoute2.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoRoute2.asm", ROMX - map_attributes FontoRoute2, FONTO_ROUTE_2, SOUTH | WEST - connection south, Fonto, FONTO, 0, 0, 10 - connection west, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9 - -FontoRoute2_MapEvents:: - dw $4000 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -FontoRoute2_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute2.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute3.asm b/data/maps/attributes/placeholder/FontoRoute3.asm deleted file mode 100644 index a288f0b..0000000 --- a/data/maps/attributes/placeholder/FontoRoute3.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoRoute3.asm", ROMX - map_attributes FontoRoute3, FONTO_ROUTE_3, WEST | EAST - connection west, Fonto, FONTO, 0, 0, 9 - connection east, FontoRoute4, FONTO_ROUTE_4, 0, 0, 12 - -FontoRoute3_MapEvents:: - dw $4000 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -FontoRoute3_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute3.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute4.asm b/data/maps/attributes/placeholder/FontoRoute4.asm deleted file mode 100644 index 496c613..0000000 --- a/data/maps/attributes/placeholder/FontoRoute4.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoRoute4.asm", ROMX - map_attributes FontoRoute4, FONTO_ROUTE_4, SOUTH | WEST - connection south, Baadon, BAADON, 0, 0, 10 - connection west, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9 - -FontoRoute4_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 8, 30, 3, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 261 - warp_event 9, 30, 4, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 261 - - db 0 ; bg events - - db 0 ; person events - -FontoRoute4_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute4.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute5.asm b/data/maps/attributes/placeholder/FontoRoute5.asm deleted file mode 100644 index 85bb2f8..0000000 --- a/data/maps/attributes/placeholder/FontoRoute5.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoRoute5.asm", ROMX - map_attributes FontoRoute5, FONTO_ROUTE_5, SOUTH | EAST - connection south, South, SOUTH, -3, 7, 13 - connection east, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9 - -FontoRoute5_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 8, 30, 3, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 261 - warp_event 9, 30, 4, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 261 - - db 0 ; bg events - - db 0 ; person events - -FontoRoute5_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute5.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute6.asm b/data/maps/attributes/placeholder/FontoRoute6.asm deleted file mode 100644 index 523f6d2..0000000 --- a/data/maps/attributes/placeholder/FontoRoute6.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoRoute6.asm", ROMX - map_attributes FontoRoute6, FONTO_ROUTE_6, WEST | EAST - connection west, FontoRoute5, FONTO_ROUTE_5, 0, 0, 12 - connection east, FontoRoute2, FONTO_ROUTE_2, 0, 0, 12 - -FontoRoute6_MapEvents:: - dw $4000 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -FontoRoute6_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute6.blk" diff --git a/data/maps/attributes/placeholder/FontoRouteGate1.asm b/data/maps/attributes/placeholder/FontoRouteGate1.asm deleted file mode 100644 index 7276e60..0000000 --- a/data/maps/attributes/placeholder/FontoRouteGate1.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoRouteGate1.asm", ROMX - map_attributes FontoRouteGate1, FONTO_ROUTE_GATE_1, 0 - -FontoRouteGate1_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 0, 7, 7, SOUTH, wOverworldMapBlocks + 45 - warp_event 1, 7, 7, SOUTH, wOverworldMapBlocks + 45 - warp_event 8, 7, 1, FONTO_ROUTE_1, wOverworldMapBlocks + 49 - warp_event 9, 7, 1, FONTO_ROUTE_1, wOverworldMapBlocks + 49 - - db 0 ; bg events - - db 0 ; person events - -FontoRouteGate1_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate1.blk" diff --git a/data/maps/attributes/placeholder/FontoRouteGate2.asm b/data/maps/attributes/placeholder/FontoRouteGate2.asm deleted file mode 100644 index 6180a67..0000000 --- a/data/maps/attributes/placeholder/FontoRouteGate2.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoRouteGate2.asm", ROMX - map_attributes FontoRouteGate2, FONTO_ROUTE_GATE_2, 0 - -FontoRouteGate2_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 4, 7, 8, BAADON, wOverworldMapBlocks + 47 - warp_event 5, 7, 9, BAADON, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, FONTO_ROUTE_4, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, FONTO_ROUTE_4, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 0 ; person events - -FontoRouteGate2_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate2.blk" diff --git a/data/maps/attributes/placeholder/FontoRouteGate3.asm b/data/maps/attributes/placeholder/FontoRouteGate3.asm deleted file mode 100644 index ff3341d..0000000 --- a/data/maps/attributes/placeholder/FontoRouteGate3.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/FontoRouteGate3.asm", ROMX - map_attributes FontoRouteGate3, FONTO_ROUTE_GATE_3, 0 - -FontoRouteGate3_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 4, 7, 5, SOUTH, wOverworldMapBlocks + 47 - warp_event 5, 7, 6, SOUTH, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, FONTO_ROUTE_5, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, FONTO_ROUTE_5, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 0 ; person events - -FontoRouteGate3_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate3.blk" diff --git a/data/maps/attributes/placeholder/Haiteku.asm b/data/maps/attributes/placeholder/Haiteku.asm deleted file mode 100644 index 211fccb..0000000 --- a/data/maps/attributes/placeholder/Haiteku.asm +++ /dev/null @@ -1,38 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Haiteku.asm", ROMX - map_attributes Haiteku, HAITEKU, WEST - connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0, 0, 9 - -Haiteku_MapEvents:: - dw $4000 ; unknown - - db 9 ; warp events - warp_event 31, 10, 1, HAITEKU_POKECENTER_1F, wOverworldMapBlocks + 172 - warp_event 10, 11, 1, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 162 - warp_event 11, 11, 2, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 162 - warp_event 31, 16, 1, HAITEKU_MART, wOverworldMapBlocks + 250 - warp_event 7, 17, 1, HAITEKU_HOUSE_1, wOverworldMapBlocks + 238 - warp_event 15, 17, 1, HAITEKU_HOUSE_2, wOverworldMapBlocks + 242 - warp_event 33, 20, 1, HAITEKU_IMPOSTER_OAK_HOUSE, wOverworldMapBlocks + 303 - warp_event 6, 27, 1, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 368 - warp_event 7, 27, 2, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 368 - - db 8 ; bg events - bg_event 24, 7, 0, 1 - bg_event 12, 12, 0, 2 - bg_event 32, 10, 0, 3 - bg_event 10, 17, 0, 4 - bg_event 32, 16, 0, 5 - bg_event 10, 27, 0, 6 - bg_event 30, 25, 0, 7 - bg_event 24, 28, 0, 8 - - db 5 ; person events - object_event 22, 15, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 23, 14, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 23, 24, SPRITE_SAILOR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 26, 10, SPRITE_SAILOR, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 14, SPRITE_GENTLEMAN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Haiteku_Blocks:: INCBIN "maps/placeholder/blk/Haiteku.blk" diff --git a/data/maps/attributes/placeholder/HaitekuAquarium1F.asm b/data/maps/attributes/placeholder/HaitekuAquarium1F.asm deleted file mode 100644 index 9eddea5..0000000 --- a/data/maps/attributes/placeholder/HaitekuAquarium1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuAquarium1F.asm", ROMX - map_attributes HaitekuAquarium1F, HAITEKU_AQUARIUM_1F, 0 - -HaitekuAquarium1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 12, 7, 8, HAITEKU, wOverworldMapBlocks + 63 - warp_event 13, 7, 9, HAITEKU, wOverworldMapBlocks + 63 - warp_event 0, 7, 1, HAITEKU_AQUARIUM_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 15, 5, SPRITE_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 12, 2, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 5, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuAquarium1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuAquarium1F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuAquarium2F.asm b/data/maps/attributes/placeholder/HaitekuAquarium2F.asm deleted file mode 100644 index 1b675f2..0000000 --- a/data/maps/attributes/placeholder/HaitekuAquarium2F.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuAquarium2F.asm", ROMX - map_attributes HaitekuAquarium2F, HAITEKU_AQUARIUM_2F, 0 - -HaitekuAquarium2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 2 ; person events - object_event 7, 6, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 4, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuAquarium2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuAquarium2F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuHouse1.asm b/data/maps/attributes/placeholder/HaitekuHouse1.asm deleted file mode 100644 index 11c2bc0..0000000 --- a/data/maps/attributes/placeholder/HaitekuHouse1.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuHouse1.asm", ROMX - map_attributes HaitekuHouse1, HAITEKU_HOUSE_1, 0 - -HaitekuHouse1_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 5, HAITEKU, wOverworldMapBlocks + 47 - warp_event 5, 7, 5, HAITEKU, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 7, 3, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuHouse1_Blocks:: INCBIN "maps/placeholder/blk/HaitekuHouse1.blk" diff --git a/data/maps/attributes/placeholder/HaitekuHouse2.asm b/data/maps/attributes/placeholder/HaitekuHouse2.asm deleted file mode 100644 index d254e09..0000000 --- a/data/maps/attributes/placeholder/HaitekuHouse2.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuHouse2.asm", ROMX - map_attributes HaitekuHouse2, HAITEKU_HOUSE_2, 0 - -HaitekuHouse2_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 6, HAITEKU, wOverworldMapBlocks + 47 - warp_event 5, 7, 6, HAITEKU, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 7, 3, SPRITE_SAILOR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuHouse2_Blocks:: INCBIN "maps/placeholder/blk/HaitekuHouse2.blk" diff --git a/data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm b/data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm deleted file mode 100644 index 68c7eaf..0000000 --- a/data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm", ROMX - map_attributes HaitekuImposterOakHouse, HAITEKU_IMPOSTER_OAK_HOUSE, 0 - -HaitekuImposterOakHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 7, HAITEKU, wOverworldMapBlocks + 47 - warp_event 5, 7, 7, HAITEKU, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 2 ; person events - object_event 7, 3, SPRITE_EVIL_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 2, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuImposterOakHouse_Blocks:: INCBIN "maps/placeholder/blk/HaitekuImposterOakHouse.blk" diff --git a/data/maps/attributes/placeholder/HaitekuLeague1F.asm b/data/maps/attributes/placeholder/HaitekuLeague1F.asm deleted file mode 100644 index c45aba7..0000000 --- a/data/maps/attributes/placeholder/HaitekuLeague1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuLeague1F.asm", ROMX - map_attributes HaitekuLeague1F, HAITEKU_LEAGUE_1F, 0 - -HaitekuLeague1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 3, 15, 2, HAITEKU, wOverworldMapBlocks + 82 - warp_event 4, 15, 3, HAITEKU, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, HAITEKU_LEAGUE_2F, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuLeague1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuLeague1F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuLeague2F.asm b/data/maps/attributes/placeholder/HaitekuLeague2F.asm deleted file mode 100644 index c868dd5..0000000 --- a/data/maps/attributes/placeholder/HaitekuLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuLeague2F.asm", ROMX - map_attributes HaitekuLeague2F, HAITEKU_LEAGUE_2F, 0 - -HaitekuLeague2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 7, 15, 3, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 92 - - db 0 ; bg events - - db 5 ; person events - object_event 4, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 12, SPRITE_COOLTRAINER_F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 10, SPRITE_24, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 7, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuLeague2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuLeague2F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuMart.asm b/data/maps/attributes/placeholder/HaitekuMart.asm deleted file mode 100644 index 53cd2dd..0000000 --- a/data/maps/attributes/placeholder/HaitekuMart.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuMart.asm", ROMX - map_attributes HaitekuMart, HAITEKU_MART, 0 - -HaitekuMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 4, HAITEKU, wOverworldMapBlocks + 51 - warp_event 5, 7, 4, HAITEKU, wOverworldMapBlocks + 51 - - db 0 ; bg events - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuMart_Blocks:: INCBIN "maps/placeholder/blk/HaitekuMart.blk" diff --git a/data/maps/attributes/placeholder/HaitekuPokecenter1F.asm b/data/maps/attributes/placeholder/HaitekuPokecenter1F.asm deleted file mode 100644 index a015908..0000000 --- a/data/maps/attributes/placeholder/HaitekuPokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuPokecenter1F.asm", ROMX - map_attributes HaitekuPokecenter1F, HAITEKU_POKECENTER_1F, 0 - -HaitekuPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 1, HAITEKU, wOverworldMapBlocks + 59 - warp_event 6, 7, 1, HAITEKU, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, HAITEKU_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuPokecenter2F.asm b/data/maps/attributes/placeholder/HaitekuPokecenter2F.asm deleted file mode 100644 index 0b88113..0000000 --- a/data/maps/attributes/placeholder/HaitekuPokecenter2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuPokecenter2F.asm", ROMX - map_attributes HaitekuPokecenter2F, HAITEKU_POKECENTER_2F, 0 - -HaitekuPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, HAITEKU_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuWestRoute.asm b/data/maps/attributes/placeholder/HaitekuWestRoute.asm deleted file mode 100644 index 8806407..0000000 --- a/data/maps/attributes/placeholder/HaitekuWestRoute.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuWestRoute.asm", ROMX - map_attributes HaitekuWestRoute, HAITEKU_WEST_ROUTE, WEST | EAST - connection west, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, -3, 15, 12 - connection east, Haiteku, HAITEKU, 0, 0, 12 - -HaitekuWestRoute_MapEvents:: - dw $4000 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -HaitekuWestRoute_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRoute.blk" diff --git a/data/maps/attributes/placeholder/HaitekuWestRouteGate.asm b/data/maps/attributes/placeholder/HaitekuWestRouteGate.asm deleted file mode 100644 index 4a41b3b..0000000 --- a/data/maps/attributes/placeholder/HaitekuWestRouteGate.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuWestRouteGate.asm", ROMX - map_attributes HaitekuWestRouteGate, HAITEKU_WEST_ROUTE_GATE, 0 - -HaitekuWestRouteGate_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 4, 7, 1, HAITEKU_WEST_ROUTE_OCEAN, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, HAITEKU_WEST_ROUTE_OCEAN, wOverworldMapBlocks + 47 - warp_event 4, 0, 8, SOUTH, wOverworldMapBlocks + 14 - warp_event 5, 0, 9, SOUTH, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 0 ; person events - -HaitekuWestRouteGate_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRouteGate.blk" diff --git a/data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm b/data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm deleted file mode 100644 index 931bef6..0000000 --- a/data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm", ROMX - map_attributes HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, NORTH | EAST - connection north, South, SOUTH, -3, 7, 13 - connection east, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 18, 0, 9 - -HaitekuWestRouteOcean_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 10, 9, 1, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 86 - warp_event 11, 9, 2, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 86 - - db 0 ; bg events - - db 0 ; person events - -HaitekuWestRouteOcean_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRouteOcean.blk" diff --git a/data/maps/attributes/placeholder/Kanto.asm b/data/maps/attributes/placeholder/Kanto.asm deleted file mode 100644 index 657a2f6..0000000 --- a/data/maps/attributes/placeholder/Kanto.asm +++ /dev/null @@ -1,59 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Kanto.asm", ROMX - map_attributes Kanto, KANTO, WEST | EAST - connection west, RouteSilentEast, ROUTE_SILENT_EAST, 9, 0, 9 - connection east, KantoEastRoute, KANTO_EAST_ROUTE, 9, 0, 9 - -Kanto_MapEvents:: - dw $4000 ; unknown - - db 30 ; warp events - warp_event 40, 3, 1, KANTO_CERULEAN_HOUSE, wOverworldMapBlocks + 93 - warp_event 13, 4, 1, KANTO_POKECENTER_1F, wOverworldMapBlocks + 115 - warp_event 4, 5, 1, KANTO_LEAGUE_1F, wOverworldMapBlocks + 111 - warp_event 5, 5, 2, KANTO_LEAGUE_1F, wOverworldMapBlocks + 111 - warp_event 51, 11, 1, KANTO_LAVENDER_HOUSE, wOverworldMapBlocks + 242 - warp_event 14, 17, 1, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 332 - warp_event 15, 17, 1, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 332 - warp_event 3, 18, 1, KANTO_MART, wOverworldMapBlocks + 362 - warp_event 22, 19, 1, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 372 - warp_event 23, 19, 2, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 372 - warp_event 30, 19, 1, KANTO_SILPH_CO, wOverworldMapBlocks + 376 - warp_event 31, 19, 2, KANTO_SILPH_CO, wOverworldMapBlocks + 376 - warp_event 16, 23, 1, KANTO_VIRIDIAN_HOUSE, wOverworldMapBlocks + 441 - warp_event 29, 23, 1, KANTO_GAME_CORNER, wOverworldMapBlocks + 447 - warp_event 34, 23, 1, KANTO_GAME_CORNER_PRIZES, wOverworldMapBlocks + 450 - warp_event 40, 23, 1, KANTO_DINER, wOverworldMapBlocks + 453 - warp_event 52, 23, 1, KANTO_SCHOOL, wOverworldMapBlocks + 459 - warp_event 53, 23, 2, KANTO_SCHOOL, wOverworldMapBlocks + 459 - warp_event 38, 29, 1, KANTO_HOSPITAL, wOverworldMapBlocks + 560 - warp_event 49, 30, 1, KANTO_POKECENTER_2_1F, wOverworldMapBlocks + 601 - warp_event 5, 38, 1, KANTO_REDS_HOUSE, wOverworldMapBlocks + 723 - warp_event 13, 38, 1, KANTO_GREENS_HOUSE_1F, wOverworldMapBlocks + 727 - warp_event 39, 38, 1, KANTO_ELDERS_HOUSE, wOverworldMapBlocks + 740 - warp_event 12, 43, 1, KANTO_OAKS_LAB, wOverworldMapBlocks + 799 - warp_event 13, 43, 2, KANTO_OAKS_LAB, wOverworldMapBlocks + 799 - warp_event 52, 45, 1, KANTO_LEAGUE_2_1F, wOverworldMapBlocks + 855 - warp_event 53, 45, 2, KANTO_LEAGUE_2_1F, wOverworldMapBlocks + 855 - warp_event 45, 46, 1, KANTO_FISHING_GURU, wOverworldMapBlocks + 887 - warp_event 6, 27, 3, ROUTE_SILENT_EAST_GATE, wOverworldMapBlocks + 508 - warp_event 21, 13, 5, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 263 - - db 12 ; bg events - bg_event 14, 4, 0, 1 - bg_event 42, 4, 0, 2 - bg_event 54, 8, 0, 3 - bg_event 4, 18, 0, 4 - bg_event 18, 18, 0, 5 - bg_event 26, 19, 0, 6 - bg_event 46, 18, 0, 7 - bg_event 8, 38, 0, 8 - bg_event 16, 38, 0, 9 - bg_event 6, 41, 0, 10 - bg_event 12, 45, 0, 11 - bg_event 50, 30, 0, 12 - - db 0 ; person events - -Kanto_Blocks:: INCBIN "maps/placeholder/blk/Kanto.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonElevator.asm b/data/maps/attributes/placeholder/KantoCeladonElevator.asm deleted file mode 100644 index b08d35d..0000000 --- a/data/maps/attributes/placeholder/KantoCeladonElevator.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoCeladonElevator.asm", ROMX - map_attributes KantoCeladonElevator, KANTO_CELADON_ELEVATOR, 0 - -KantoCeladonElevator_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 1, 3, 4, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 17 - warp_event 2, 3, 4, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 18 - - db 0 ; bg events - - db 0 ; person events - -KantoCeladonElevator_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonElevator.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonMart1F.asm b/data/maps/attributes/placeholder/KantoCeladonMart1F.asm deleted file mode 100644 index 540b834..0000000 --- a/data/maps/attributes/placeholder/KantoCeladonMart1F.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoCeladonMart1F.asm", ROMX - map_attributes KantoCeladonMart1F, KANTO_CELADON_MART_1F, 0 - -KantoCeladonMart1F_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 13, 7, 6, KANTO, wOverworldMapBlocks + 63 - warp_event 14, 7, 7, KANTO, wOverworldMapBlocks + 64 - warp_event 15, 0, 2, KANTO_CELADON_MART_2F, wOverworldMapBlocks + 22 - warp_event 2, 0, 2, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 - - db 0 ; bg events - - db 1 ; person events - object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoCeladonMart1F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart1F.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonMart2F.asm b/data/maps/attributes/placeholder/KantoCeladonMart2F.asm deleted file mode 100644 index e682e50..0000000 --- a/data/maps/attributes/placeholder/KantoCeladonMart2F.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoCeladonMart2F.asm", ROMX - map_attributes KantoCeladonMart2F, KANTO_CELADON_MART_2F, 0 - -KantoCeladonMart2F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 12, 0, 1, KANTO_CELADON_MART_3F, wOverworldMapBlocks + 21 - warp_event 15, 0, 3, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 - - db 0 ; bg events - - db 2 ; person events - object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 5, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoCeladonMart2F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart2F.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonMart3F.asm b/data/maps/attributes/placeholder/KantoCeladonMart3F.asm deleted file mode 100644 index 1c0bf1c..0000000 --- a/data/maps/attributes/placeholder/KantoCeladonMart3F.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoCeladonMart3F.asm", ROMX - map_attributes KantoCeladonMart3F, KANTO_CELADON_MART_3F, 0 - -KantoCeladonMart3F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 12, 0, 1, KANTO_CELADON_MART_2F, wOverworldMapBlocks + 21 - warp_event 15, 0, 2, KANTO_CELADON_MART_4F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 - - db 0 ; bg events - - db 2 ; person events - object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 5, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoCeladonMart3F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart3F.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonMart4F.asm b/data/maps/attributes/placeholder/KantoCeladonMart4F.asm deleted file mode 100644 index 0cc7099..0000000 --- a/data/maps/attributes/placeholder/KantoCeladonMart4F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoCeladonMart4F.asm", ROMX - map_attributes KantoCeladonMart4F, KANTO_CELADON_MART_4F, 0 - -KantoCeladonMart4F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 12, 0, 1, KANTO_CELADON_MART_5F, wOverworldMapBlocks + 21 - warp_event 15, 0, 2, KANTO_CELADON_MART_3F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 - - db 0 ; bg events - - db 3 ; person events - object_event 14, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoCeladonMart4F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart4F.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonMart5F.asm b/data/maps/attributes/placeholder/KantoCeladonMart5F.asm deleted file mode 100644 index 6727d30..0000000 --- a/data/maps/attributes/placeholder/KantoCeladonMart5F.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoCeladonMart5F.asm", ROMX - map_attributes KantoCeladonMart5F, KANTO_CELADON_MART_5F, 0 - -KantoCeladonMart5F_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 13, 0, 1, KANTO_CELADON_MART_4F, wOverworldMapBlocks + 21 - warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 - - db 0 ; bg events - - db 3 ; person events - object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 3, SPRITE_SIDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoCeladonMart5F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart5F.blk" diff --git a/data/maps/attributes/placeholder/KantoCeruleanHouse.asm b/data/maps/attributes/placeholder/KantoCeruleanHouse.asm deleted file mode 100644 index 7570123..0000000 --- a/data/maps/attributes/placeholder/KantoCeruleanHouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoCeruleanHouse.asm", ROMX - map_attributes KantoCeruleanHouse, KANTO_CERULEAN_HOUSE, 0 - -KantoCeruleanHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 1, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 1, KANTO, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 3, 3, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoCeruleanHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoCeruleanHouse.blk" diff --git a/data/maps/attributes/placeholder/KantoDiner.asm b/data/maps/attributes/placeholder/KantoDiner.asm deleted file mode 100644 index 9906d4b..0000000 --- a/data/maps/attributes/placeholder/KantoDiner.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoDiner.asm", ROMX - map_attributes KantoDiner, KANTO_DINER, 0 - -KantoDiner_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 16, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 16, KANTO, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 0 ; person events - -KantoDiner_Blocks:: INCBIN "maps/placeholder/blk/KantoDiner.blk" diff --git a/data/maps/attributes/placeholder/KantoEastRoute.asm b/data/maps/attributes/placeholder/KantoEastRoute.asm deleted file mode 100644 index f338935..0000000 --- a/data/maps/attributes/placeholder/KantoEastRoute.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoEastRoute.asm", ROMX - map_attributes KantoEastRoute, KANTO_EAST_ROUTE, NORTH | WEST - connection north, StandRoute, STAND_ROUTE, 10, 0, 10 - connection west, Kanto, KANTO, -3, 6, 15 - -KantoEastRoute_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 28, 5, 1, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 93 - warp_event 29, 5, 2, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 93 - - db 0 ; bg events - - db 0 ; person events - -KantoEastRoute_Blocks:: INCBIN "maps/placeholder/blk/KantoEastRoute.blk" diff --git a/data/maps/attributes/placeholder/KantoEldersHouse.asm b/data/maps/attributes/placeholder/KantoEldersHouse.asm deleted file mode 100644 index 9587fd0..0000000 --- a/data/maps/attributes/placeholder/KantoEldersHouse.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoEldersHouse.asm", ROMX - map_attributes KantoEldersHouse, KANTO_ELDERS_HOUSE, 0 - -KantoEldersHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 23, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 23, KANTO, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 2 ; person events - object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_GRANNY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoEldersHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoEldersHouse.blk" diff --git a/data/maps/attributes/placeholder/KantoFishingGuru.asm b/data/maps/attributes/placeholder/KantoFishingGuru.asm deleted file mode 100644 index dd71611..0000000 --- a/data/maps/attributes/placeholder/KantoFishingGuru.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoFishingGuru.asm", ROMX - map_attributes KantoFishingGuru, KANTO_FISHING_GURU, 0 - -KantoFishingGuru_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 28, KANTO, wOverworldMapBlocks + 46 - warp_event 4, 7, 28, KANTO, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 4, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoFishingGuru_Blocks:: INCBIN "maps/placeholder/blk/KantoFishingGuru.blk" diff --git a/data/maps/attributes/placeholder/KantoGameCorner.asm b/data/maps/attributes/placeholder/KantoGameCorner.asm deleted file mode 100644 index 61c4092..0000000 --- a/data/maps/attributes/placeholder/KantoGameCorner.asm +++ /dev/null @@ -1,29 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoGameCorner.asm", ROMX - map_attributes KantoGameCorner, KANTO_GAME_CORNER, 0 - -KantoGameCorner_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 8, 13, 14, KANTO, wOverworldMapBlocks + 117 - warp_event 9, 13, 14, KANTO, wOverworldMapBlocks + 117 - warp_event 10, 13, 14, KANTO, wOverworldMapBlocks + 118 - warp_event 11, 13, 14, KANTO, wOverworldMapBlocks + 118 - - db 0 ; bg events - - db 10 ; person events - object_event 3, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 6, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 7, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 8, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 11, 6, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 11, 8, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_FISHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 17, 9, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoGameCorner_Blocks:: INCBIN "maps/placeholder/blk/KantoGameCorner.blk" diff --git a/data/maps/attributes/placeholder/KantoGameCornerPrizes.asm b/data/maps/attributes/placeholder/KantoGameCornerPrizes.asm deleted file mode 100644 index 62a312e..0000000 --- a/data/maps/attributes/placeholder/KantoGameCornerPrizes.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoGameCornerPrizes.asm", ROMX - map_attributes KantoGameCornerPrizes, KANTO_GAME_CORNER_PRIZES, 0 - -KantoGameCornerPrizes_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 15, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 15, KANTO, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 3 ; person events - object_event 2, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoGameCornerPrizes_Blocks:: INCBIN "maps/placeholder/blk/KantoGameCornerPrizes.blk" diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ1.asm b/data/maps/attributes/placeholder/KantoGamefreakHQ1.asm deleted file mode 100644 index 91158b4..0000000 --- a/data/maps/attributes/placeholder/KantoGamefreakHQ1.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoGamefreakHQ1.asm", ROMX - map_attributes KantoGamefreakHQ1, KANTO_GAMEFREAK_HQ_1, 0 - -KantoGamefreakHQ1_MapEvents:: - dw $4000 ; unknown - - db 5 ; warp events - warp_event 4, 11, 9, KANTO, wOverworldMapBlocks + 63 - warp_event 5, 11, 10, KANTO, wOverworldMapBlocks + 63 - warp_event 7, 1, 2, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 14 - warp_event 2, 1, 3, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 12 - warp_event 4, 0, 30, KANTO, wOverworldMapBlocks + 13 - - db 0 ; bg events - - db 4 ; person events - object_event 1, 5, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 5, SPRITE_SIDON, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 8, SPRITE_PIPPI, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 7, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoGamefreakHQ1_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ1.blk" diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ2.asm b/data/maps/attributes/placeholder/KantoGamefreakHQ2.asm deleted file mode 100644 index da4f3bc..0000000 --- a/data/maps/attributes/placeholder/KantoGamefreakHQ2.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoGamefreakHQ2.asm", ROMX - map_attributes KantoGamefreakHQ2, KANTO_GAMEFREAK_HQ_2, 0 - -KantoGamefreakHQ2_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 6, 1, 1, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 14 - warp_event 7, 1, 3, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 14 - warp_event 2, 1, 4, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 12 - warp_event 4, 1, 4, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 13 - - db 0 ; bg events - - db 1 ; person events - object_event 2, 4, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoGamefreakHQ2_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ2.blk" diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ3.asm b/data/maps/attributes/placeholder/KantoGamefreakHQ3.asm deleted file mode 100644 index 8844533..0000000 --- a/data/maps/attributes/placeholder/KantoGamefreakHQ3.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoGamefreakHQ3.asm", ROMX - map_attributes KantoGamefreakHQ3, KANTO_GAMEFREAK_HQ_3, 0 - -KantoGamefreakHQ3_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 6, 1, 1, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 14 - warp_event 7, 1, 2, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 14 - warp_event 2, 1, 3, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 12 - warp_event 4, 1, 4, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 13 - - db 0 ; bg events - - db 3 ; person events - object_event 0, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 7, SPRITE_BURGLAR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 7, SPRITE_FISHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoGamefreakHQ3_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ3.blk" diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ4.asm b/data/maps/attributes/placeholder/KantoGamefreakHQ4.asm deleted file mode 100644 index 8004d0d..0000000 --- a/data/maps/attributes/placeholder/KantoGamefreakHQ4.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoGamefreakHQ4.asm", ROMX - map_attributes KantoGamefreakHQ4, KANTO_GAMEFREAK_HQ_4, 0 - -KantoGamefreakHQ4_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 2, 7, 1, KANTO_GAMEFREAK_HQ_5, wOverworldMapBlocks + 42 - warp_event 6, 1, 2, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 14 - warp_event 2, 1, 3, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 12 - - db 0 ; bg events - - db 0 ; person events - -KantoGamefreakHQ4_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ4.blk" diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ5.asm b/data/maps/attributes/placeholder/KantoGamefreakHQ5.asm deleted file mode 100644 index 4f9765b..0000000 --- a/data/maps/attributes/placeholder/KantoGamefreakHQ5.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoGamefreakHQ5.asm", ROMX - map_attributes KantoGamefreakHQ5, KANTO_GAMEFREAK_HQ_5, 0 - -KantoGamefreakHQ5_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 1, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 42 - warp_event 4, 7, 1, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 43 - - db 0 ; bg events - - db 0 ; person events - -KantoGamefreakHQ5_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ5.blk" diff --git a/data/maps/attributes/placeholder/KantoGreensHouse1F.asm b/data/maps/attributes/placeholder/KantoGreensHouse1F.asm deleted file mode 100644 index 728448f..0000000 --- a/data/maps/attributes/placeholder/KantoGreensHouse1F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoGreensHouse1F.asm", ROMX - map_attributes KantoGreensHouse1F, KANTO_GREENS_HOUSE_1F, 0 - -KantoGreensHouse1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 2, 7, 22, KANTO, wOverworldMapBlocks + 42 - warp_event 3, 7, 22, KANTO, wOverworldMapBlocks + 42 - warp_event 7, 1, 1, KANTO_GREENS_HOUSE_2F, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 1 ; person events - object_event 5, 3, SPRITE_0F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoGreensHouse1F_Blocks:: INCBIN "maps/placeholder/blk/KantoGreensHouse1F.blk" diff --git a/data/maps/attributes/placeholder/KantoGreensHouse2F.asm b/data/maps/attributes/placeholder/KantoGreensHouse2F.asm deleted file mode 100644 index b01b313..0000000 --- a/data/maps/attributes/placeholder/KantoGreensHouse2F.asm +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoGreensHouse2F.asm", ROMX - map_attributes KantoGreensHouse2F, KANTO_GREENS_HOUSE_2F, 0 - -KantoGreensHouse2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 7, 1, 3, KANTO_GREENS_HOUSE_1F, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 0 ; person events - -KantoGreensHouse2F_Blocks:: INCBIN "maps/placeholder/blk/KantoGreensHouse2F.blk" diff --git a/data/maps/attributes/placeholder/KantoHospital.asm b/data/maps/attributes/placeholder/KantoHospital.asm deleted file mode 100644 index 9840695..0000000 --- a/data/maps/attributes/placeholder/KantoHospital.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoHospital.asm", ROMX - map_attributes KantoHospital, KANTO_HOSPITAL, 0 - -KantoHospital_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 1, 7, 19, KANTO, wOverworldMapBlocks + 57 - warp_event 2, 7, 19, KANTO, wOverworldMapBlocks + 58 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 6, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 12, 6, SPRITE_GIRL, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoHospital_Blocks:: INCBIN "maps/placeholder/blk/KantoHospital.blk" diff --git a/data/maps/attributes/placeholder/KantoLavenderHouse.asm b/data/maps/attributes/placeholder/KantoLavenderHouse.asm deleted file mode 100644 index 3e8109d..0000000 --- a/data/maps/attributes/placeholder/KantoLavenderHouse.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoLavenderHouse.asm", ROMX - map_attributes KantoLavenderHouse, KANTO_LAVENDER_HOUSE, 0 - -KantoLavenderHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 5, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 5, KANTO, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 2 ; person events - object_event 7, 3, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_POKEFAN_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoLavenderHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoLavenderHouse.blk" diff --git a/data/maps/attributes/placeholder/KantoLeague1F.asm b/data/maps/attributes/placeholder/KantoLeague1F.asm deleted file mode 100644 index 5790403..0000000 --- a/data/maps/attributes/placeholder/KantoLeague1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoLeague1F.asm", ROMX - map_attributes KantoLeague1F, KANTO_LEAGUE_1F, 0 - -KantoLeague1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 3, 15, 3, KANTO, wOverworldMapBlocks + 82 - warp_event 4, 15, 4, KANTO, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, KANTO_LEAGUE_2F, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoLeague1F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague1F.blk" diff --git a/data/maps/attributes/placeholder/KantoLeague21F.asm b/data/maps/attributes/placeholder/KantoLeague21F.asm deleted file mode 100644 index b09f1bd..0000000 --- a/data/maps/attributes/placeholder/KantoLeague21F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoLeague21F.asm", ROMX - map_attributes KantoLeague21F, KANTO_LEAGUE_2_1F, 0 - -KantoLeague21F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 3, 15, 26, KANTO, wOverworldMapBlocks + 82 - warp_event 4, 15, 27, KANTO, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, KANTO_LEAGUE_2_2F, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoLeague21F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague21F.blk" diff --git a/data/maps/attributes/placeholder/KantoLeague22F.asm b/data/maps/attributes/placeholder/KantoLeague22F.asm deleted file mode 100644 index f7c0061..0000000 --- a/data/maps/attributes/placeholder/KantoLeague22F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoLeague22F.asm", ROMX - map_attributes KantoLeague22F, KANTO_LEAGUE_2_2F, 0 - -KantoLeague22F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 7, 15, 3, KANTO_LEAGUE_2_1F, wOverworldMapBlocks + 92 - - db 0 ; bg events - - db 5 ; person events - object_event 4, 7, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoLeague22F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague22F.blk" diff --git a/data/maps/attributes/placeholder/KantoLeague2F.asm b/data/maps/attributes/placeholder/KantoLeague2F.asm deleted file mode 100644 index d3c8b48..0000000 --- a/data/maps/attributes/placeholder/KantoLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoLeague2F.asm", ROMX - map_attributes KantoLeague2F, KANTO_LEAGUE_2F, 0 - -KantoLeague2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 7, 15, 3, KANTO_LEAGUE_1F, wOverworldMapBlocks + 92 - - db 0 ; bg events - - db 5 ; person events - object_event 4, 7, SPRITE_RED, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoLeague2F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague2F.blk" diff --git a/data/maps/attributes/placeholder/KantoMart.asm b/data/maps/attributes/placeholder/KantoMart.asm deleted file mode 100644 index a45bb75..0000000 --- a/data/maps/attributes/placeholder/KantoMart.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoMart.asm", ROMX - map_attributes KantoMart, KANTO_MART, 0 - -KantoMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 8, KANTO, wOverworldMapBlocks + 59 - warp_event 5, 7, 8, KANTO, wOverworldMapBlocks + 59 - - db 0 ; bg events - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_TWIN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_GRAMPS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoMart_Blocks:: INCBIN "maps/placeholder/blk/KantoMart.blk" diff --git a/data/maps/attributes/placeholder/KantoOaksLab.asm b/data/maps/attributes/placeholder/KantoOaksLab.asm deleted file mode 100644 index 534f8a4..0000000 --- a/data/maps/attributes/placeholder/KantoOaksLab.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoOaksLab.asm", ROMX - map_attributes KantoOaksLab, KANTO_OAKS_LAB, 0 - -KantoOaksLab_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 24, KANTO, wOverworldMapBlocks + 42 - warp_event 4, 7, 25, KANTO, wOverworldMapBlocks + 43 - - db 0 ; bg events - - db 1 ; person events - object_event 3, 2, SPRITE_NANAMI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoOaksLab_Blocks:: INCBIN "maps/placeholder/blk/KantoOaksLab.blk" diff --git a/data/maps/attributes/placeholder/KantoPokecenter1F.asm b/data/maps/attributes/placeholder/KantoPokecenter1F.asm deleted file mode 100644 index 03fccc3..0000000 --- a/data/maps/attributes/placeholder/KantoPokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoPokecenter1F.asm", ROMX - map_attributes KantoPokecenter1F, KANTO_POKECENTER_1F, 0 - -KantoPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 2, KANTO, wOverworldMapBlocks + 59 - warp_event 6, 7, 2, KANTO, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, KANTO_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/KantoPokecenter21F.asm b/data/maps/attributes/placeholder/KantoPokecenter21F.asm deleted file mode 100644 index 9226222..0000000 --- a/data/maps/attributes/placeholder/KantoPokecenter21F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoPokecenter21F.asm", ROMX - map_attributes KantoPokecenter21F, KANTO_POKECENTER_2_1F, 0 - -KantoPokecenter21F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 20, KANTO, wOverworldMapBlocks + 59 - warp_event 6, 7, 20, KANTO, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, KANTO_POKECENTER_2_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoPokecenter21F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter21F.blk" diff --git a/data/maps/attributes/placeholder/KantoPokecenter22F.asm b/data/maps/attributes/placeholder/KantoPokecenter22F.asm deleted file mode 100644 index 3e56c12..0000000 --- a/data/maps/attributes/placeholder/KantoPokecenter22F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoPokecenter22F.asm", ROMX - map_attributes KantoPokecenter22F, KANTO_POKECENTER_2_2F, 0 - -KantoPokecenter22F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, KANTO_POKECENTER_2_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoPokecenter22F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter22F.blk" diff --git a/data/maps/attributes/placeholder/KantoPokecenter2F.asm b/data/maps/attributes/placeholder/KantoPokecenter2F.asm deleted file mode 100644 index c684143..0000000 --- a/data/maps/attributes/placeholder/KantoPokecenter2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoPokecenter2F.asm", ROMX - map_attributes KantoPokecenter2F, KANTO_POKECENTER_2F, 0 - -KantoPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, KANTO_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/KantoRedsHouse.asm b/data/maps/attributes/placeholder/KantoRedsHouse.asm deleted file mode 100644 index dc9748c..0000000 --- a/data/maps/attributes/placeholder/KantoRedsHouse.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoRedsHouse.asm", ROMX - map_attributes KantoRedsHouse, KANTO_REDS_HOUSE, 0 - -KantoRedsHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 21, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 21, KANTO, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 2 ; person events - object_event 7, 3, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoRedsHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoRedsHouse.blk" diff --git a/data/maps/attributes/placeholder/KantoSchool.asm b/data/maps/attributes/placeholder/KantoSchool.asm deleted file mode 100644 index eb49456..0000000 --- a/data/maps/attributes/placeholder/KantoSchool.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoSchool.asm", ROMX - map_attributes KantoSchool, KANTO_SCHOOL, 0 - -KantoSchool_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 15, 17, KANTO, wOverworldMapBlocks + 82 - warp_event 4, 15, 18, KANTO, wOverworldMapBlocks + 83 - - db 0 ; bg events - - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoSchool_Blocks:: INCBIN "maps/placeholder/blk/KantoSchool.blk" diff --git a/data/maps/attributes/placeholder/KantoSilphCo.asm b/data/maps/attributes/placeholder/KantoSilphCo.asm deleted file mode 100644 index 29926be..0000000 --- a/data/maps/attributes/placeholder/KantoSilphCo.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoSilphCo.asm", ROMX - map_attributes KantoSilphCo, KANTO_SILPH_CO, 0 - -KantoSilphCo_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 6, 15, 11, KANTO, wOverworldMapBlocks + 148 - warp_event 7, 15, 12, KANTO, wOverworldMapBlocks + 148 - - db 0 ; bg events - - db 2 ; person events - object_event 2, 2, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 22, 1, SPRITE_OFFICER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoSilphCo_Blocks:: INCBIN "maps/placeholder/blk/KantoSilphCo.blk" diff --git a/data/maps/attributes/placeholder/KantoUnusedArea.asm b/data/maps/attributes/placeholder/KantoUnusedArea.asm deleted file mode 100644 index cb8686e..0000000 --- a/data/maps/attributes/placeholder/KantoUnusedArea.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoUnusedArea.asm", ROMX - map_attributes KantoUnusedArea, KANTO_UNUSED_AREA, 0 - -KantoUnusedArea_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -KantoUnusedArea_Blocks:: INCBIN "maps/placeholder/blk/KantoUnusedArea.blk" diff --git a/data/maps/attributes/placeholder/KantoViridianHouse.asm b/data/maps/attributes/placeholder/KantoViridianHouse.asm deleted file mode 100644 index 1699edc..0000000 --- a/data/maps/attributes/placeholder/KantoViridianHouse.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/KantoViridianHouse.asm", ROMX - map_attributes KantoViridianHouse, KANTO_VIRIDIAN_HOUSE, 0 - -KantoViridianHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 13, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 13, KANTO, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 2 ; person events - object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -KantoViridianHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoViridianHouse.blk" diff --git a/data/maps/attributes/placeholder/MtFuji.asm b/data/maps/attributes/placeholder/MtFuji.asm deleted file mode 100644 index 8d31fa7..0000000 --- a/data/maps/attributes/placeholder/MtFuji.asm +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/MtFuji.asm", ROMX - map_attributes MtFuji, MT_FUJI, SOUTH - connection south, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10 - -MtFuji_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -MtFuji_Blocks:: INCBIN "maps/placeholder/blk/MtFuji.blk" diff --git a/data/maps/attributes/placeholder/MtFujiRoute.asm b/data/maps/attributes/placeholder/MtFujiRoute.asm deleted file mode 100644 index c4a2f08..0000000 --- a/data/maps/attributes/placeholder/MtFujiRoute.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/MtFujiRoute.asm", ROMX - map_attributes MtFujiRoute, MT_FUJI_ROUTE, NORTH | SOUTH - connection north, MtFuji, MT_FUJI, 0, 0, 10 - connection south, Prince, PRINCE, 0, 0, 10 - -MtFujiRoute_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -MtFujiRoute_Blocks:: INCBIN "maps/placeholder/blk/MtFujiRoute.blk" diff --git a/data/maps/attributes/placeholder/Newtype.asm b/data/maps/attributes/placeholder/Newtype.asm deleted file mode 100644 index 32297bd..0000000 --- a/data/maps/attributes/placeholder/Newtype.asm +++ /dev/null @@ -1,40 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Newtype.asm", ROMX - map_attributes Newtype, NEWTYPE, NORTH | WEST | EAST - connection north, SugarRoute, SUGAR_ROUTE, 5, 0, 10 - connection west, Route15, ROUTE_15, 0, 0, 9 - connection east, NewtypeRoute, NEWTYPE_ROUTE, 9, 0, 9 - -Newtype_MapEvents:: - dw $4000 ; unknown - - db 13 ; warp events - warp_event 7, 8, 1, NEWTYPE_POKECENTER_1F, wOverworldMapBlocks + 134 - warp_event 30, 9, 1, NEWTYPE_LEAGUE_1F, wOverworldMapBlocks + 146 - warp_event 31, 9, 2, NEWTYPE_LEAGUE_1F, wOverworldMapBlocks + 146 - warp_event 23, 13, 1, NEWTYPE_SAILOR_HOUSE, wOverworldMapBlocks + 194 - warp_event 7, 14, 1, NEWTYPE_MART, wOverworldMapBlocks + 212 - warp_event 33, 15, 1, NEWTYPE_DOJO, wOverworldMapBlocks + 225 - warp_event 34, 15, 2, NEWTYPE_DOJO, wOverworldMapBlocks + 226 - warp_event 23, 22, 1, NEWTYPE_HOUSE_1, wOverworldMapBlocks + 324 - warp_event 5, 23, 1, NEWTYPE_DINER, wOverworldMapBlocks + 315 - warp_event 11, 28, 1, NEWTYPE_HOUSE_2, wOverworldMapBlocks + 396 - warp_event 35, 30, 1, NEWTYPE_HOUSE_3, wOverworldMapBlocks + 434 - warp_event 18, 5, 1, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 88 - warp_event 19, 5, 2, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 88 - - db 5 ; bg events - bg_event 0, 8, 0, 1 - bg_event 8, 8, 0, 2 - bg_event 8, 14, 0, 3 - bg_event 30, 15, 0, 4 - bg_event 30, 21, 0, 5 - - db 4 ; person events - object_event 5, 10, SPRITE_SILVER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 24, 26, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 24, 9, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 30, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Newtype_Blocks:: INCBIN "maps/placeholder/blk/Newtype.blk" diff --git a/data/maps/attributes/placeholder/NewtypeDiner.asm b/data/maps/attributes/placeholder/NewtypeDiner.asm deleted file mode 100644 index 968b478..0000000 --- a/data/maps/attributes/placeholder/NewtypeDiner.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeDiner.asm", ROMX - map_attributes NewtypeDiner, NEWTYPE_DINER, 0 - -NewtypeDiner_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 2, 7, 9, NEWTYPE, wOverworldMapBlocks + 42 - warp_event 3, 7, 9, NEWTYPE, wOverworldMapBlocks + 42 - - db 0 ; bg events - - db 4 ; person events - object_event 2, 1, SPRITE_CLERK, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 3, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 3, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypeDiner_Blocks:: INCBIN "maps/placeholder/blk/NewtypeDiner.blk" diff --git a/data/maps/attributes/placeholder/NewtypeDojo.asm b/data/maps/attributes/placeholder/NewtypeDojo.asm deleted file mode 100644 index 7a0457b..0000000 --- a/data/maps/attributes/placeholder/NewtypeDojo.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeDojo.asm", ROMX - map_attributes NewtypeDojo, NEWTYPE_DOJO, 0 - -NewtypeDojo_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 15, 6, NEWTYPE, wOverworldMapBlocks + 82 - warp_event 4, 15, 7, NEWTYPE, wOverworldMapBlocks + 83 - - db 0 ; bg events - - db 5 ; person events - object_event 3, 2, SPRITE_BLACKBELT, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 6, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 6, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 10, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 10, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypeDojo_Blocks:: INCBIN "maps/placeholder/blk/NewtypeDojo.blk" diff --git a/data/maps/attributes/placeholder/NewtypeHouse1.asm b/data/maps/attributes/placeholder/NewtypeHouse1.asm deleted file mode 100644 index 9b613ad..0000000 --- a/data/maps/attributes/placeholder/NewtypeHouse1.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeHouse1.asm", ROMX - map_attributes NewtypeHouse1, NEWTYPE_HOUSE_1, 0 - -NewtypeHouse1_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 8, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 5, 7, 8, NEWTYPE, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypeHouse1_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse1.blk" diff --git a/data/maps/attributes/placeholder/NewtypeHouse2.asm b/data/maps/attributes/placeholder/NewtypeHouse2.asm deleted file mode 100644 index ef7e650..0000000 --- a/data/maps/attributes/placeholder/NewtypeHouse2.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeHouse2.asm", ROMX - map_attributes NewtypeHouse2, NEWTYPE_HOUSE_2, 0 - -NewtypeHouse2_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 10, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 5, 7, 10, NEWTYPE, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 4, 3, SPRITE_GENTLEMAN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypeHouse2_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse2.blk" diff --git a/data/maps/attributes/placeholder/NewtypeHouse3.asm b/data/maps/attributes/placeholder/NewtypeHouse3.asm deleted file mode 100644 index fbe78a1..0000000 --- a/data/maps/attributes/placeholder/NewtypeHouse3.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeHouse3.asm", ROMX - map_attributes NewtypeHouse3, NEWTYPE_HOUSE_3, 0 - -NewtypeHouse3_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 11, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 5, 7, 11, NEWTYPE, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypeHouse3_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse3.blk" diff --git a/data/maps/attributes/placeholder/NewtypeLeague1F.asm b/data/maps/attributes/placeholder/NewtypeLeague1F.asm deleted file mode 100644 index 227c641..0000000 --- a/data/maps/attributes/placeholder/NewtypeLeague1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeLeague1F.asm", ROMX - map_attributes NewtypeLeague1F, NEWTYPE_LEAGUE_1F, 0 - -NewtypeLeague1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 3, 15, 2, NEWTYPE, wOverworldMapBlocks + 82 - warp_event 4, 15, 3, NEWTYPE, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, NEWTYPE_LEAGUE_2F, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypeLeague1F_Blocks:: INCBIN "maps/placeholder/blk/NewtypeLeague1F.blk" diff --git a/data/maps/attributes/placeholder/NewtypeLeague2F.asm b/data/maps/attributes/placeholder/NewtypeLeague2F.asm deleted file mode 100644 index 3ee52b4..0000000 --- a/data/maps/attributes/placeholder/NewtypeLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeLeague2F.asm", ROMX - map_attributes NewtypeLeague2F, NEWTYPE_LEAGUE_2F, 0 - -NewtypeLeague2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 7, 15, 3, NEWTYPE_LEAGUE_1F, wOverworldMapBlocks + 92 - - db 0 ; bg events - - db 5 ; person events - object_event 5, 5, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 0, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 0, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 11, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypeLeague2F_Blocks:: INCBIN "maps/placeholder/blk/NewtypeLeague2F.blk" diff --git a/data/maps/attributes/placeholder/NewtypeMart.asm b/data/maps/attributes/placeholder/NewtypeMart.asm deleted file mode 100644 index a180396..0000000 --- a/data/maps/attributes/placeholder/NewtypeMart.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeMart.asm", ROMX - map_attributes NewtypeMart, NEWTYPE_MART, 0 - -NewtypeMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 5, NEWTYPE, wOverworldMapBlocks + 59 - warp_event 5, 7, 5, NEWTYPE, wOverworldMapBlocks + 59 - - db 0 ; bg events - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypeMart_Blocks:: INCBIN "maps/placeholder/blk/NewtypeMart.blk" diff --git a/data/maps/attributes/placeholder/NewtypePokecenter1F.asm b/data/maps/attributes/placeholder/NewtypePokecenter1F.asm deleted file mode 100644 index 196e153..0000000 --- a/data/maps/attributes/placeholder/NewtypePokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypePokecenter1F.asm", ROMX - map_attributes NewtypePokecenter1F, NEWTYPE_POKECENTER_1F, 0 - -NewtypePokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 1, NEWTYPE, wOverworldMapBlocks + 59 - warp_event 6, 7, 1, NEWTYPE, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, NEWTYPE_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypePokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/NewtypePokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/NewtypePokecenter2F.asm b/data/maps/attributes/placeholder/NewtypePokecenter2F.asm deleted file mode 100644 index 89a35fa..0000000 --- a/data/maps/attributes/placeholder/NewtypePokecenter2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypePokecenter2F.asm", ROMX - map_attributes NewtypePokecenter2F, NEWTYPE_POKECENTER_2F, 0 - -NewtypePokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, NEWTYPE_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypePokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/NewtypePokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/NewtypeRoute.asm b/data/maps/attributes/placeholder/NewtypeRoute.asm deleted file mode 100644 index ae23280..0000000 --- a/data/maps/attributes/placeholder/NewtypeRoute.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeRoute.asm", ROMX - map_attributes NewtypeRoute, NEWTYPE_ROUTE, WEST | EAST - connection west, Newtype, NEWTYPE, -3, 6, 12 - connection east, Route18, ROUTE_18, -3, 33, 12 - -NewtypeRoute_MapEvents:: - dw $4000 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -NewtypeRoute_Blocks:: INCBIN "maps/placeholder/blk/NewtypeRoute.blk" diff --git a/data/maps/attributes/placeholder/NewtypeRouteGate.asm b/data/maps/attributes/placeholder/NewtypeRouteGate.asm deleted file mode 100644 index b3546a6..0000000 --- a/data/maps/attributes/placeholder/NewtypeRouteGate.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeRouteGate.asm", ROMX - map_attributes NewtypeRouteGate, NEWTYPE_ROUTE_GATE, 0 - -NewtypeRouteGate_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 4, 7, 1, ROUTE_18, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, ROUTE_18, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 0 ; person events - -NewtypeRouteGate_Blocks:: INCBIN "maps/placeholder/blk/NewtypeRouteGate.blk" diff --git a/data/maps/attributes/placeholder/NewtypeSailorHouse.asm b/data/maps/attributes/placeholder/NewtypeSailorHouse.asm deleted file mode 100644 index ea7cb6b..0000000 --- a/data/maps/attributes/placeholder/NewtypeSailorHouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NewtypeSailorHouse.asm", ROMX - map_attributes NewtypeSailorHouse, NEWTYPE_SAILOR_HOUSE, 0 - -NewtypeSailorHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 4, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 5, 7, 4, NEWTYPE, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 6, 3, SPRITE_47, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NewtypeSailorHouse_Blocks:: INCBIN "maps/placeholder/blk/NewtypeSailorHouse.blk" diff --git a/data/maps/attributes/placeholder/North.asm b/data/maps/attributes/placeholder/North.asm deleted file mode 100644 index fec500b..0000000 --- a/data/maps/attributes/placeholder/North.asm +++ /dev/null @@ -1,27 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/North.asm", ROMX - map_attributes North, NORTH, SOUTH - connection south, BullForestRoute3, BULL_FOREST_ROUTE_3, 0, 0, 10 - -North_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 5, 5, 1, NORTH_HOUSE_1, wOverworldMapBlocks + 51 - warp_event 15, 6, 1, NORTH_MART, wOverworldMapBlocks + 72 - warp_event 5, 9, 1, NORTH_HOUSE_2, wOverworldMapBlocks + 83 - warp_event 13, 10, 1, NORTH_POKECENTER_1F, wOverworldMapBlocks + 103 - - db 4 ; bg events - bg_event 12, 4, 0, 1 - bg_event 16, 6, 0, 2 - bg_event 14, 10, 0, 3 - bg_event 8, 12, 0, 4 - - db 3 ; person events - object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -North_Blocks:: INCBIN "maps/placeholder/blk/North.blk" diff --git a/data/maps/attributes/placeholder/NorthHouse1.asm b/data/maps/attributes/placeholder/NorthHouse1.asm deleted file mode 100644 index 55ea98b..0000000 --- a/data/maps/attributes/placeholder/NorthHouse1.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NorthHouse1.asm", ROMX - map_attributes NorthHouse1, NORTH_HOUSE_1, 0 - -NorthHouse1_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 1, NORTH, wOverworldMapBlocks + 47 - warp_event 5, 7, 1, NORTH, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NorthHouse1_Blocks:: INCBIN "maps/placeholder/blk/NorthHouse1.blk" diff --git a/data/maps/attributes/placeholder/NorthHouse2.asm b/data/maps/attributes/placeholder/NorthHouse2.asm deleted file mode 100644 index 42178a7..0000000 --- a/data/maps/attributes/placeholder/NorthHouse2.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NorthHouse2.asm", ROMX - map_attributes NorthHouse2, NORTH_HOUSE_2, 0 - -NorthHouse2_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 3, NORTH, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, NORTH, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NorthHouse2_Blocks:: INCBIN "maps/placeholder/blk/NorthHouse2.blk" diff --git a/data/maps/attributes/placeholder/NorthMart.asm b/data/maps/attributes/placeholder/NorthMart.asm deleted file mode 100644 index f916cf1..0000000 --- a/data/maps/attributes/placeholder/NorthMart.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NorthMart.asm", ROMX - map_attributes NorthMart, NORTH_MART, 0 - -NorthMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 2, NORTH, wOverworldMapBlocks + 51 - warp_event 5, 7, 2, NORTH, wOverworldMapBlocks + 51 - - db 0 ; bg events - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_GIRL, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NorthMart_Blocks:: INCBIN "maps/placeholder/blk/NorthMart.blk" diff --git a/data/maps/attributes/placeholder/NorthPokecenter1F.asm b/data/maps/attributes/placeholder/NorthPokecenter1F.asm deleted file mode 100644 index 3b84a12..0000000 --- a/data/maps/attributes/placeholder/NorthPokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NorthPokecenter1F.asm", ROMX - map_attributes NorthPokecenter1F, NORTH_POKECENTER_1F, 0 - -NorthPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 4, NORTH, wOverworldMapBlocks + 59 - warp_event 6, 7, 4, NORTH, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, NORTH_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NorthPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/NorthPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/NorthPokecenter2F.asm b/data/maps/attributes/placeholder/NorthPokecenter2F.asm deleted file mode 100644 index 6d678c3..0000000 --- a/data/maps/attributes/placeholder/NorthPokecenter2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/NorthPokecenter2F.asm", ROMX - map_attributes NorthPokecenter2F, NORTH_POKECENTER_2F, 0 - -NorthPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, NORTH_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -NorthPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/NorthPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/Office1.asm b/data/maps/attributes/placeholder/Office1.asm deleted file mode 100644 index 661e688..0000000 --- a/data/maps/attributes/placeholder/Office1.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Office1.asm", ROMX - map_attributes Office1, OFFICE_1, 0 - -Office1_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -Office1_Blocks:: INCBIN "maps/placeholder/blk/Office1.blk" diff --git a/data/maps/attributes/placeholder/Office2.asm b/data/maps/attributes/placeholder/Office2.asm deleted file mode 100644 index 7190b43..0000000 --- a/data/maps/attributes/placeholder/Office2.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Office2.asm", ROMX - map_attributes Office2, OFFICE_2, 0 - -Office2_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -Office2_Blocks:: INCBIN "maps/placeholder/blk/Office2.blk" diff --git a/data/maps/attributes/placeholder/Office3.asm b/data/maps/attributes/placeholder/Office3.asm deleted file mode 100644 index 752a0b4..0000000 --- a/data/maps/attributes/placeholder/Office3.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Office3.asm", ROMX - map_attributes Office3, OFFICE_3, 0 - -Office3_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -Office3_Blocks:: INCBIN "maps/placeholder/blk/Office3.blk" diff --git a/data/maps/attributes/placeholder/OldCity.asm b/data/maps/attributes/placeholder/OldCity.asm deleted file mode 100644 index f1ffc71..0000000 --- a/data/maps/attributes/placeholder/OldCity.asm +++ /dev/null @@ -1,48 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCity.asm", ROMX - map_attributes OldCity, OLD_CITY, SOUTH | WEST - connection south, Route1P2, ROUTE_1_P2, 5, 0, 10 - connection west, Route2, ROUTE_2, 5, 0, 9 - -OldCity_MapEvents:: - dw $4000 ; unknown - - db 14 ; warp events - warp_event 4, 14, 1, OLD_CITY_MUSEUM, wOverworldMapBlocks + 211 - warp_event 5, 14, 2, OLD_CITY_MUSEUM, wOverworldMapBlocks + 211 - warp_event 26, 14, 1, OLD_CITY_GYM, wOverworldMapBlocks + 222 - warp_event 27, 14, 2, OLD_CITY_GYM, wOverworldMapBlocks + 222 - warp_event 11, 17, 1, OLD_CITY_TOWER_1F, wOverworldMapBlocks + 240 - warp_event 12, 17, 2, OLD_CITY_TOWER_1F, wOverworldMapBlocks + 241 - warp_event 30, 22, 1, OLD_CITY_BILLS_HOUSE, wOverworldMapBlocks + 328 - warp_event 3, 26, 1, OLD_CITY_MART, wOverworldMapBlocks + 366 - warp_event 10, 26, 1, OLD_CITY_HOUSE, wOverworldMapBlocks + 370 - warp_event 27, 28, 1, OLD_CITY_POKECENTER_1F, wOverworldMapBlocks + 404 - warp_event 3, 31, 1, OLD_CITY_KURTS_HOUSE, wOverworldMapBlocks + 418 - warp_event 18, 30, 3, ROUTE_1_GATE_1F, wOverworldMapBlocks + 426 - warp_event 19, 30, 4, ROUTE_1_GATE_1F, wOverworldMapBlocks + 426 - warp_event 22, 26, 1, OLD_CITY_SCHOOL, wOverworldMapBlocks + 376 - - db 12 ; bg events - bg_event 8, 14, 0, 1 - bg_event 8, 16, 0, 2 - bg_event 28, 16, 0, 3 - bg_event 20, 22, 0, 4 - bg_event 26, 22, 0, 5 - bg_event 8, 26, 0, 6 - bg_event 28, 28, 0, 7 - bg_event 20, 29, 0, 8 - bg_event 4, 32, 0, 9 - bg_event 30, 22, 0, 10 - bg_event 4, 14, 0, 11 - bg_event 5, 14, 0, 11 - - db 5 ; person events - object_event 8, 30, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 20, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 26, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 21, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 17, 19, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCity_Blocks:: INCBIN "maps/placeholder/blk/OldCity.blk" diff --git a/data/maps/attributes/placeholder/OldCityBillsHouse.asm b/data/maps/attributes/placeholder/OldCityBillsHouse.asm deleted file mode 100644 index e64ded4..0000000 --- a/data/maps/attributes/placeholder/OldCityBillsHouse.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityBillsHouse.asm", ROMX - map_attributes OldCityBillsHouse, OLD_CITY_BILLS_HOUSE, 0 - -OldCityBillsHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 7, OLD_CITY, wOverworldMapBlocks + 42 - warp_event 4, 7, 7, OLD_CITY, wOverworldMapBlocks + 43 - - db 6 ; bg events - bg_event 2, 1, 0, 1 - bg_event 3, 1, 0, 2 - bg_event 4, 1, 0, 3 - bg_event 6, 1, 0, 4 - bg_event 7, 1, 0, 5 - bg_event 1, 1, 0, 6 - - db 1 ; person events - object_event 5, 4, SPRITE_MASAKI, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityBillsHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityBillsHouse.blk" diff --git a/data/maps/attributes/placeholder/OldCityGym.asm b/data/maps/attributes/placeholder/OldCityGym.asm deleted file mode 100644 index d83f856..0000000 --- a/data/maps/attributes/placeholder/OldCityGym.asm +++ /dev/null @@ -1,25 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityGym.asm", ROMX - map_attributes OldCityGym, OLD_CITY_GYM, 0 - -OldCityGym_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 17, 3, OLD_CITY, wOverworldMapBlocks + 102 - warp_event 5, 17, 4, OLD_CITY, wOverworldMapBlocks + 102 - - db 2 ; bg events - bg_event 3, 15, 0, 1 - bg_event 6, 15, 0, 1 - - db 6 ; person events - object_event 4, 5, SPRITE_HAYATO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 9, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 - object_event 8, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 - object_event 1, 1, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 - object_event 1, 9, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 - object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 - -OldCityGym_Blocks:: INCBIN "maps/placeholder/blk/OldCityGym.blk" diff --git a/data/maps/attributes/placeholder/OldCityHouse.asm b/data/maps/attributes/placeholder/OldCityHouse.asm deleted file mode 100644 index 085ed83..0000000 --- a/data/maps/attributes/placeholder/OldCityHouse.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityHouse.asm", ROMX - map_attributes OldCityHouse, OLD_CITY_HOUSE, 0 - -OldCityHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 9, OLD_CITY, wOverworldMapBlocks + 42 - warp_event 4, 7, 9, OLD_CITY, wOverworldMapBlocks + 43 - - db 4 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 2, 1, 0, 3 - bg_event 7, 1, 0, 4 - - db 3 ; person events - object_event 2, 3, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 6, SPRITE_LASS, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityHouse.blk" diff --git a/data/maps/attributes/placeholder/OldCityKurtsHouse.asm b/data/maps/attributes/placeholder/OldCityKurtsHouse.asm deleted file mode 100644 index 0e343fd..0000000 --- a/data/maps/attributes/placeholder/OldCityKurtsHouse.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityKurtsHouse.asm", ROMX - map_attributes OldCityKurtsHouse, OLD_CITY_KURTS_HOUSE, 0 - -OldCityKurtsHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 11, OLD_CITY, wOverworldMapBlocks + 58 - warp_event 4, 7, 11, OLD_CITY, wOverworldMapBlocks + 59 - - db 5 ; bg events - bg_event 4, 1, 0, 1 - bg_event 5, 1, 0, 2 - bg_event 12, 1, 0, 3 - bg_event 14, 0, 0, 4 - bg_event 15, 0, 0, 4 - - db 1 ; person events - object_event 2, 2, SPRITE_GANTETSU, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityKurtsHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityKurtsHouse.blk" diff --git a/data/maps/attributes/placeholder/OldCityMart.asm b/data/maps/attributes/placeholder/OldCityMart.asm deleted file mode 100644 index 125dfa7..0000000 --- a/data/maps/attributes/placeholder/OldCityMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityMart.asm", ROMX - map_attributes OldCityMart, OLD_CITY_MART, 0 - -OldCityMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 8, OLD_CITY, wOverworldMapBlocks + 51 - warp_event 5, 7, 8, OLD_CITY, wOverworldMapBlocks + 51 - - db 1 ; bg events - bg_event 0, 7, 0, 1 - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityMart_Blocks:: INCBIN "maps/placeholder/blk/OldCityMart.blk" diff --git a/data/maps/attributes/placeholder/OldCityMuseum.asm b/data/maps/attributes/placeholder/OldCityMuseum.asm deleted file mode 100644 index 28f3351..0000000 --- a/data/maps/attributes/placeholder/OldCityMuseum.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityMuseum.asm", ROMX - map_attributes OldCityMuseum, OLD_CITY_MUSEUM, 0 - -OldCityMuseum_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 2, 7, 1, OLD_CITY, wOverworldMapBlocks + 58 - warp_event 3, 7, 2, OLD_CITY, wOverworldMapBlocks + 58 - - db 4 ; bg events - bg_event 2, 3, 0, 1 - bg_event 5, 4, 0, 2 - bg_event 9, 4, 0, 3 - bg_event 13, 4, 0, 4 - - db 2 ; person events - object_event 1, 5, SPRITE_FISHER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 4, SPRITE_EGG, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityMuseum_Blocks:: INCBIN "maps/placeholder/blk/OldCityMuseum.blk" diff --git a/data/maps/attributes/placeholder/OldCityPokecenter1F.asm b/data/maps/attributes/placeholder/OldCityPokecenter1F.asm deleted file mode 100644 index 1b27e00..0000000 --- a/data/maps/attributes/placeholder/OldCityPokecenter1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityPokecenter1F.asm", ROMX - map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, 0 - -OldCityPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 10, OLD_CITY, wOverworldMapBlocks + 59 - warp_event 6, 7, 10, OLD_CITY, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 1 ; bg events - bg_event 13, 1, 0, 1 - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_35, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/OldCityPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/OldCitySchool.asm b/data/maps/attributes/placeholder/OldCitySchool.asm deleted file mode 100644 index b6640a5..0000000 --- a/data/maps/attributes/placeholder/OldCitySchool.asm +++ /dev/null @@ -1,27 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCitySchool.asm", ROMX - map_attributes OldCitySchool, OLD_CITY_SCHOOL, 0 - -OldCitySchool_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 15, 14, OLD_CITY, wOverworldMapBlocks + 82 - warp_event 4, 15, 14, OLD_CITY, wOverworldMapBlocks + 83 - - db 4 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 4, 0, 0, 2 - - db 6 ; person events - object_event 2, 5, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_TEACHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCitySchool_Blocks:: INCBIN "maps/placeholder/blk/OldCitySchool.blk" diff --git a/data/maps/attributes/placeholder/OldCityTower1F.asm b/data/maps/attributes/placeholder/OldCityTower1F.asm deleted file mode 100644 index 39f8d17..0000000 --- a/data/maps/attributes/placeholder/OldCityTower1F.asm +++ /dev/null @@ -1,25 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityTower1F.asm", ROMX - map_attributes OldCityTower1F, OLD_CITY_TOWER_1F, 0 - -OldCityTower1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 3, 7, 5, OLD_CITY, wOverworldMapBlocks + 42 - warp_event 4, 7, 6, OLD_CITY, wOverworldMapBlocks + 43 - warp_event 0, 1, 1, OLD_CITY_TOWER_2F, wOverworldMapBlocks + 11 - - db 3 ; bg events - bg_event 2, 6, 0, 1 - bg_event 5, 6, 0, 2 - bg_event 4, 1, 0, 3 - - db 4 ; person events - object_event 0, 2, SPRITE_SAGE, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - object_event 1, 5, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 5, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 6, 4, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 - -OldCityTower1F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower1F.blk" diff --git a/data/maps/attributes/placeholder/OldCityTower2F.asm b/data/maps/attributes/placeholder/OldCityTower2F.asm deleted file mode 100644 index 2231f4d..0000000 --- a/data/maps/attributes/placeholder/OldCityTower2F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityTower2F.asm", ROMX - map_attributes OldCityTower2F, OLD_CITY_TOWER_2F, 0 - -OldCityTower2F_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 0, 1, 3, OLD_CITY_TOWER_1F, wOverworldMapBlocks + 11 - warp_event 7, 7, 2, OLD_CITY_TOWER_3F, wOverworldMapBlocks + 44 - - db 2 ; bg events - bg_event 3, 0, 0, 1 - bg_event 4, 1, 0, 2 - - db 4 ; person events - object_event 2, 3, SPRITE_MEDIUM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 5, 3, SPRITE_MEDIUM, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 2, 6, SPRITE_MEDIUM, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 5, 6, SPRITE_MEDIUM, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - -OldCityTower2F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower2F.blk" diff --git a/data/maps/attributes/placeholder/OldCityTower3F.asm b/data/maps/attributes/placeholder/OldCityTower3F.asm deleted file mode 100644 index d887263..0000000 --- a/data/maps/attributes/placeholder/OldCityTower3F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityTower3F.asm", ROMX - map_attributes OldCityTower3F, OLD_CITY_TOWER_3F, 0 - -OldCityTower3F_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 0, 1, 1, OLD_CITY_TOWER_4F, wOverworldMapBlocks + 11 - warp_event 7, 7, 2, OLD_CITY_TOWER_2F, wOverworldMapBlocks + 44 - - db 2 ; bg events - bg_event 3, 0, 0, 1 - bg_event 4, 1, 0, 2 - - db 4 ; person events - object_event 2, 3, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 3, 4, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - object_event 4, 4, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 5, 5, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - -OldCityTower3F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower3F.blk" diff --git a/data/maps/attributes/placeholder/OldCityTower4F.asm b/data/maps/attributes/placeholder/OldCityTower4F.asm deleted file mode 100644 index 7a0902c..0000000 --- a/data/maps/attributes/placeholder/OldCityTower4F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityTower4F.asm", ROMX - map_attributes OldCityTower4F, OLD_CITY_TOWER_4F, 0 - -OldCityTower4F_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 0, 1, 1, OLD_CITY_TOWER_3F, wOverworldMapBlocks + 11 - warp_event 7, 7, 1, OLD_CITY_TOWER_5F, wOverworldMapBlocks + 44 - - db 2 ; bg events - bg_event 3, 0, 0, 1 - bg_event 4, 1, 0, 2 - - db 4 ; person events - object_event 3, 2, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - object_event 4, 7, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 - object_event 6, 7, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 - object_event 7, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 - -OldCityTower4F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower4F.blk" diff --git a/data/maps/attributes/placeholder/OldCityTower5F.asm b/data/maps/attributes/placeholder/OldCityTower5F.asm deleted file mode 100644 index 9056341..0000000 --- a/data/maps/attributes/placeholder/OldCityTower5F.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/OldCityTower5F.asm", ROMX - map_attributes OldCityTower5F, OLD_CITY_TOWER_5F, 0 - -OldCityTower5F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 5, 5, 2, OLD_CITY_TOWER_4F, wOverworldMapBlocks + 30 - - db 3 ; bg events - bg_event 2, 0, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 4, 1, 0, 3 - - db 1 ; person events - object_event 2, 3, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -OldCityTower5F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower5F.blk" diff --git a/data/maps/attributes/placeholder/PowerPlant1.asm b/data/maps/attributes/placeholder/PowerPlant1.asm deleted file mode 100644 index e06ccd2..0000000 --- a/data/maps/attributes/placeholder/PowerPlant1.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/PowerPlant1.asm", ROMX - map_attributes PowerPlant1, POWER_PLANT_1, 0 - -PowerPlant1_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -PowerPlant1_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant1.blk" diff --git a/data/maps/attributes/placeholder/PowerPlant2.asm b/data/maps/attributes/placeholder/PowerPlant2.asm deleted file mode 100644 index e14cdd9..0000000 --- a/data/maps/attributes/placeholder/PowerPlant2.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/PowerPlant2.asm", ROMX - map_attributes PowerPlant2, POWER_PLANT_2, 0 - -PowerPlant2_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -PowerPlant2_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant2.blk" diff --git a/data/maps/attributes/placeholder/PowerPlant3.asm b/data/maps/attributes/placeholder/PowerPlant3.asm deleted file mode 100644 index 8a3797d..0000000 --- a/data/maps/attributes/placeholder/PowerPlant3.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/PowerPlant3.asm", ROMX - map_attributes PowerPlant3, POWER_PLANT_3, 0 - -PowerPlant3_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -PowerPlant3_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant3.blk" diff --git a/data/maps/attributes/placeholder/PowerPlant4.asm b/data/maps/attributes/placeholder/PowerPlant4.asm deleted file mode 100644 index bdb33ba..0000000 --- a/data/maps/attributes/placeholder/PowerPlant4.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/PowerPlant4.asm", ROMX - map_attributes PowerPlant4, POWER_PLANT_4, 0 - -PowerPlant4_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -PowerPlant4_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant4.blk" diff --git a/data/maps/attributes/placeholder/Prince.asm b/data/maps/attributes/placeholder/Prince.asm deleted file mode 100644 index 597d5eb..0000000 --- a/data/maps/attributes/placeholder/Prince.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Prince.asm", ROMX - map_attributes Prince, PRINCE, NORTH | SOUTH - connection north, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10 - connection south, PrinceRoute, PRINCE_ROUTE, 0, 0, 10 - -Prince_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -Prince_Blocks:: INCBIN "maps/placeholder/blk/Prince.blk" diff --git a/data/maps/attributes/placeholder/PrinceRoute.asm b/data/maps/attributes/placeholder/PrinceRoute.asm deleted file mode 100644 index 28af3d3..0000000 --- a/data/maps/attributes/placeholder/PrinceRoute.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/PrinceRoute.asm", ROMX - map_attributes PrinceRoute, PRINCE_ROUTE, NORTH | SOUTH - connection north, Prince, PRINCE, 0, 0, 10 - connection south, SilentHill, SILENT_HILL, 0, 0, 10 - -PrinceRoute_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -PrinceRoute_Blocks:: INCBIN "maps/placeholder/blk/PrinceRoute.blk" diff --git a/data/maps/attributes/placeholder/Route15.asm b/data/maps/attributes/placeholder/Route15.asm deleted file mode 100644 index 08f1564..0000000 --- a/data/maps/attributes/placeholder/Route15.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Route15.asm", ROMX - map_attributes Route15, ROUTE_15, NORTH | EAST - connection north, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 10 - connection east, Newtype, NEWTYPE, 0, 0, 12 - -Route15_MapEvents:: - dw $4000 ; unknown - - db 7 ; warp events - warp_event 8, 5, 1, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 68 - warp_event 9, 5, 2, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 68 - warp_event 9, 10, 1, ROUTE_15_POKECENTER_1F, wOverworldMapBlocks + 131 - warp_event 14, 12, 6, ROUTE_15, wOverworldMapBlocks + 155 - warp_event 14, 13, 7, ROUTE_15, wOverworldMapBlocks + 155 - warp_event 21, 8, 4, ROUTE_15, wOverworldMapBlocks + 116 - warp_event 21, 9, 5, ROUTE_15, wOverworldMapBlocks + 116 - - db 0 ; bg events - - db 0 ; person events - -Route15_Blocks:: INCBIN "maps/placeholder/blk/Route15.blk" diff --git a/data/maps/attributes/placeholder/Route15Pokecenter1F.asm b/data/maps/attributes/placeholder/Route15Pokecenter1F.asm deleted file mode 100644 index 52e9fc8..0000000 --- a/data/maps/attributes/placeholder/Route15Pokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Route15Pokecenter1F.asm", ROMX - map_attributes Route15Pokecenter1F, ROUTE_15_POKECENTER_1F, 0 - -Route15Pokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 3, ROUTE_15, wOverworldMapBlocks + 59 - warp_event 6, 7, 3, ROUTE_15, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, ROUTE_15_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Route15Pokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/Route15Pokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/Route15Pokecenter2F.asm b/data/maps/attributes/placeholder/Route15Pokecenter2F.asm deleted file mode 100644 index 758212d..0000000 --- a/data/maps/attributes/placeholder/Route15Pokecenter2F.asm +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Route15Pokecenter2F.asm", ROMX - map_attributes Route15Pokecenter2F, ROUTE_15_POKECENTER_2F, 0 - -Route15Pokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, ROUTE_15_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 0 ; person events - -Route15Pokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/Route15Pokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/Route18.asm b/data/maps/attributes/placeholder/Route18.asm deleted file mode 100644 index 8c7809a..0000000 --- a/data/maps/attributes/placeholder/Route18.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Route18.asm", ROMX - map_attributes Route18, ROUTE_18, NORTH | WEST - connection north, BullForestRoute1, BULL_FOREST_ROUTE_1, 0, 0, 13 - connection west, NewtypeRoute, NEWTYPE_ROUTE, 36, 0, 9 - -Route18_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 8, 5, 1, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 53 - warp_event 9, 5, 2, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 53 - warp_event 13, 28, 1, ROUTE_18_POKECENTER_1F, wOverworldMapBlocks + 247 - - db 0 ; bg events - - db 0 ; person events - -Route18_Blocks:: INCBIN "maps/placeholder/blk/Route18.blk" diff --git a/data/maps/attributes/placeholder/Route18Pokecenter1F.asm b/data/maps/attributes/placeholder/Route18Pokecenter1F.asm deleted file mode 100644 index ba29f0d..0000000 --- a/data/maps/attributes/placeholder/Route18Pokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Route18Pokecenter1F.asm", ROMX - map_attributes Route18Pokecenter1F, ROUTE_18_POKECENTER_1F, 0 - -Route18Pokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 3, ROUTE_18, wOverworldMapBlocks + 59 - warp_event 6, 7, 3, ROUTE_18, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, ROUTE_18_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Route18Pokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/Route18Pokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/Route18Pokecenter2F.asm b/data/maps/attributes/placeholder/Route18Pokecenter2F.asm deleted file mode 100644 index 3c0502f..0000000 --- a/data/maps/attributes/placeholder/Route18Pokecenter2F.asm +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Route18Pokecenter2F.asm", ROMX - map_attributes Route18Pokecenter2F, ROUTE_18_POKECENTER_2F, 0 - -Route18Pokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, ROUTE_18_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 0 ; person events - -Route18Pokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/Route18Pokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/Route2.asm b/data/maps/attributes/placeholder/Route2.asm deleted file mode 100644 index f3d876f..0000000 --- a/data/maps/attributes/placeholder/Route2.asm +++ /dev/null @@ -1,25 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Route2.asm", ROMX - map_attributes Route2, ROUTE_2, WEST | EAST - connection west, West, WEST, -3, 2, 15 - connection east, OldCity, OLD_CITY, -3, 2, 15 - -Route2_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 6, 5, 3, ROUTE_2_GATE_1F, wOverworldMapBlocks + 67 - warp_event 15, 4, 1, ROUTE_2_HOUSE, wOverworldMapBlocks + 71 - - db 3 ; bg events - bg_event 15, 4, 0, 3 - bg_event 14, 5, 0, 1 - bg_event 24, 10, 0, 2 - - db 3 ; person events - object_event 19, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 - object_event 15, 7, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 8, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - -Route2_Blocks:: INCBIN "maps/placeholder/blk/Route2.blk" diff --git a/data/maps/attributes/placeholder/Route2Gate1F.asm b/data/maps/attributes/placeholder/Route2Gate1F.asm deleted file mode 100644 index bb112f9..0000000 --- a/data/maps/attributes/placeholder/Route2Gate1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Route2Gate1F.asm", ROMX - map_attributes Route2Gate1F, ROUTE_2_GATE_1F, 0 - -Route2Gate1F_MapEvents:: - dw $4000 ; unknown - - db 5 ; warp events - warp_event 0, 7, 13, WEST, wOverworldMapBlocks + 45 - warp_event 1, 7, 13, WEST, wOverworldMapBlocks + 45 - warp_event 8, 7, 1, ROUTE_2, wOverworldMapBlocks + 49 - warp_event 9, 7, 1, ROUTE_2, wOverworldMapBlocks + 49 - warp_event 1, 0, 1, ROUTE_2_GATE_2F, wOverworldMapBlocks + 12 - - db 0 ; bg events - - db 2 ; person events - object_event 8, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 1, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Route2Gate1F_Blocks:: INCBIN "maps/placeholder/blk/Route2Gate1F.blk" diff --git a/data/maps/attributes/placeholder/Route2Gate2F.asm b/data/maps/attributes/placeholder/Route2Gate2F.asm deleted file mode 100644 index c9d2d82..0000000 --- a/data/maps/attributes/placeholder/Route2Gate2F.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Route2Gate2F.asm", ROMX - map_attributes Route2Gate2F, ROUTE_2_GATE_2F, 0 - -Route2Gate2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 5, 0, 5, ROUTE_2_GATE_1F, wOverworldMapBlocks + 13 - - db 2 ; bg events - bg_event 1, 0, 0, 1 - bg_event 3, 0, 0, 2 - - db 2 ; person events - object_event 2, 2, SPRITE_LASS, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 4, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Route2Gate2F_Blocks:: INCBIN "maps/placeholder/blk/Route2Gate2F.blk" diff --git a/data/maps/attributes/placeholder/Route2House.asm b/data/maps/attributes/placeholder/Route2House.asm deleted file mode 100644 index 3600ea1..0000000 --- a/data/maps/attributes/placeholder/Route2House.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Route2House.asm", ROMX - map_attributes Route2House, ROUTE_2_HOUSE, 0 - -Route2House_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 2, ROUTE_2, wOverworldMapBlocks + 43 - warp_event 5, 7, 2, ROUTE_2, wOverworldMapBlocks + 43 - - db 6 ; bg events - bg_event 0, 0, 0, 1 - bg_event 2, 0, 0, 1 - bg_event 4, 0, 0, 1 - bg_event 6, 0, 0, 1 - bg_event 0, 3, 0, 2 - bg_event 4, 3, 0, 3 - - db 1 ; person events - object_event 6, 6, SPRITE_SCIENTIST, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Route2House_Blocks:: INCBIN "maps/placeholder/blk/Route2House.blk" diff --git a/data/maps/attributes/placeholder/RouteSilentEast.asm b/data/maps/attributes/placeholder/RouteSilentEast.asm deleted file mode 100644 index 661a9a7..0000000 --- a/data/maps/attributes/placeholder/RouteSilentEast.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/RouteSilentEast.asm", ROMX - map_attributes RouteSilentEast, ROUTE_SILENT_EAST, WEST | EAST - connection west, SilentHill, SILENT_HILL, 0, 0, 9 - connection east, Kanto, KANTO, -3, 6, 15 - -RouteSilentEast_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 55, 9, 1, ROUTE_SILENT_EAST_GATE, wOverworldMapBlocks + 208 - - db 0 ; bg events - - db 0 ; person events - -RouteSilentEast_Blocks:: INCBIN "maps/placeholder/blk/RouteSilentEast.blk" diff --git a/data/maps/attributes/placeholder/RouteSilentEastGate.asm b/data/maps/attributes/placeholder/RouteSilentEastGate.asm deleted file mode 100644 index 9de74e1..0000000 --- a/data/maps/attributes/placeholder/RouteSilentEastGate.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/RouteSilentEastGate.asm", ROMX - map_attributes RouteSilentEastGate, ROUTE_SILENT_EAST_GATE, 0 - -RouteSilentEastGate_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 0, 7, 1, ROUTE_SILENT_EAST, wOverworldMapBlocks + 45 - warp_event 1, 7, 1, ROUTE_SILENT_EAST, wOverworldMapBlocks + 45 - warp_event 8, 7, 29, KANTO, wOverworldMapBlocks + 49 - warp_event 9, 7, 29, KANTO, wOverworldMapBlocks + 49 - - db 0 ; bg events - - db 0 ; person events - -RouteSilentEastGate_Blocks:: INCBIN "maps/placeholder/blk/RouteSilentEastGate.blk" diff --git a/data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm b/data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm deleted file mode 100644 index 6394343..0000000 --- a/data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm", ROMX - map_attributes RuinsOfAlphEntrance, RUINS_OF_ALPH_ENTRANCE, 0 - -RuinsOfAlphEntrance_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -RuinsOfAlphEntrance_Blocks:: INCBIN "maps/placeholder/blk/RuinsOfAlphEntrance.blk" diff --git a/data/maps/attributes/placeholder/RuinsOfAlphMain.asm b/data/maps/attributes/placeholder/RuinsOfAlphMain.asm deleted file mode 100644 index bf6e073..0000000 --- a/data/maps/attributes/placeholder/RuinsOfAlphMain.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/RuinsOfAlphMain.asm", ROMX - map_attributes RuinsOfAlphMain, RUINS_OF_ALPH_MAIN, 0 - -RuinsOfAlphMain_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -RuinsOfAlphMain_Blocks:: INCBIN "maps/placeholder/blk/RuinsOfAlphMain.blk" diff --git a/data/maps/attributes/placeholder/SlowpokeWellEntrance.asm b/data/maps/attributes/placeholder/SlowpokeWellEntrance.asm deleted file mode 100644 index 7e9a91e..0000000 --- a/data/maps/attributes/placeholder/SlowpokeWellEntrance.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SlowpokeWellEntrance.asm", ROMX - map_attributes SlowpokeWellEntrance, SLOWPOKE_WELL_ENTRANCE, 0 - -SlowpokeWellEntrance_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -SlowpokeWellEntrance_Blocks:: INCBIN "maps/placeholder/blk/SlowpokeWellEntrance.blk" diff --git a/data/maps/attributes/placeholder/SlowpokeWellMain.asm b/data/maps/attributes/placeholder/SlowpokeWellMain.asm deleted file mode 100644 index 5293965..0000000 --- a/data/maps/attributes/placeholder/SlowpokeWellMain.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SlowpokeWellMain.asm", ROMX - map_attributes SlowpokeWellMain, SLOWPOKE_WELL_MAIN, 0 - -SlowpokeWellMain_MapEvents:: - dw $0 ; unknown - - db 0 ; warp events - - db 0 ; bg events - - db 0 ; person events - -SlowpokeWellMain_Blocks:: INCBIN "maps/placeholder/blk/SlowpokeWellMain.blk" diff --git a/data/maps/attributes/placeholder/South.asm b/data/maps/attributes/placeholder/South.asm deleted file mode 100644 index 682b5dc..0000000 --- a/data/maps/attributes/placeholder/South.asm +++ /dev/null @@ -1,36 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/South.asm", ROMX - map_attributes South, SOUTH, NORTH | SOUTH | EAST - connection north, FontoRoute5, FONTO_ROUTE_5, 10, 0, 10 - connection south, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, 10, 0, 10 - connection east, FontoRoute1, FONTO_ROUTE_1, 0, 0, 9 - -South_MapEvents:: - dw $4000 ; unknown - - db 9 ; warp events - warp_event 26, 10, 1, SOUTH_HOUSE_1, wOverworldMapBlocks + 170 - warp_event 33, 14, 1, SOUTH_POKECENTER_1F, wOverworldMapBlocks + 225 - warp_event 19, 22, 1, SOUTH_MART, wOverworldMapBlocks + 322 - warp_event 33, 23, 1, SOUTH_HOUSE_2, wOverworldMapBlocks + 329 - warp_event 30, 5, 1, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 94 - warp_event 31, 5, 2, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 94 - warp_event 35, 19, 2, FONTO_ROUTE_GATE_1, wOverworldMapBlocks + 278 - warp_event 30, 30, 3, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 432 - warp_event 31, 30, 4, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 432 - - db 5 ; bg events - bg_event 30, 14, 0, 1 - bg_event 34, 14, 0, 2 - bg_event 28, 17, 0, 3 - bg_event 16, 22, 0, 4 - bg_event 20, 22, 0, 5 - - db 4 ; person events - object_event 25, 21, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 24, 21, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 22, 16, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 30, 11, SPRITE_FISHING_GURU, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - -South_Blocks:: INCBIN "maps/placeholder/blk/South.blk" diff --git a/data/maps/attributes/placeholder/SouthHouse1.asm b/data/maps/attributes/placeholder/SouthHouse1.asm deleted file mode 100644 index 70c2f79..0000000 --- a/data/maps/attributes/placeholder/SouthHouse1.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SouthHouse1.asm", ROMX - map_attributes SouthHouse1, SOUTH_HOUSE_1, 0 - -SouthHouse1_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 1, SOUTH, wOverworldMapBlocks + 47 - warp_event 5, 7, 1, SOUTH, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 2, 3, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SouthHouse1_Blocks:: INCBIN "maps/placeholder/blk/SouthHouse1.blk" diff --git a/data/maps/attributes/placeholder/SouthHouse2.asm b/data/maps/attributes/placeholder/SouthHouse2.asm deleted file mode 100644 index 556c132..0000000 --- a/data/maps/attributes/placeholder/SouthHouse2.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SouthHouse2.asm", ROMX - map_attributes SouthHouse2, SOUTH_HOUSE_2, 0 - -SouthHouse2_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 4, SOUTH, wOverworldMapBlocks + 47 - warp_event 5, 7, 4, SOUTH, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 1, 2, SPRITE_FISHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SouthHouse2_Blocks:: INCBIN "maps/placeholder/blk/SouthHouse2.blk" diff --git a/data/maps/attributes/placeholder/SouthMart.asm b/data/maps/attributes/placeholder/SouthMart.asm deleted file mode 100644 index 89ed8a6..0000000 --- a/data/maps/attributes/placeholder/SouthMart.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SouthMart.asm", ROMX - map_attributes SouthMart, SOUTH_MART, 0 - -SouthMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 3, SOUTH, wOverworldMapBlocks + 59 - warp_event 5, 7, 3, SOUTH, wOverworldMapBlocks + 59 - - db 0 ; bg events - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SouthMart_Blocks:: INCBIN "maps/placeholder/blk/SouthMart.blk" diff --git a/data/maps/attributes/placeholder/SouthPokecenter1F.asm b/data/maps/attributes/placeholder/SouthPokecenter1F.asm deleted file mode 100644 index 635a8e4..0000000 --- a/data/maps/attributes/placeholder/SouthPokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SouthPokecenter1F.asm", ROMX - map_attributes SouthPokecenter1F, SOUTH_POKECENTER_1F, 0 - -SouthPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 2, SOUTH, wOverworldMapBlocks + 59 - warp_event 6, 7, 2, SOUTH, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, SOUTH_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SouthPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/SouthPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/SouthPokecenter2F.asm b/data/maps/attributes/placeholder/SouthPokecenter2F.asm deleted file mode 100644 index 27c0b2e..0000000 --- a/data/maps/attributes/placeholder/SouthPokecenter2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SouthPokecenter2F.asm", ROMX - map_attributes SouthPokecenter2F, SOUTH_POKECENTER_2F, 0 - -SouthPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, SOUTH_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SouthPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/SouthPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/Stand.asm b/data/maps/attributes/placeholder/Stand.asm deleted file mode 100644 index b5289c9..0000000 --- a/data/maps/attributes/placeholder/Stand.asm +++ /dev/null @@ -1,46 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Stand.asm", ROMX - map_attributes Stand, STAND, NORTH | SOUTH - connection north, BullForestRoute2, BULL_FOREST_ROUTE_2, 10, 0, 10 - connection south, StandRoute, STAND_ROUTE, 10, 0, 10 - -Stand_MapEvents:: - dw $4000 ; unknown - - db 10 ; warp events - warp_event 24, 17, 1, STAND_LAB, wOverworldMapBlocks + 247 - warp_event 33, 20, 1, STAND_POKECENTER_1F, wOverworldMapBlocks + 303 - warp_event 16, 21, 1, STAND_OFFICE, wOverworldMapBlocks + 295 - warp_event 35, 26, 1, STAND_MART, wOverworldMapBlocks + 382 - warp_event 26, 29, 1, STAND_HOUSE, wOverworldMapBlocks + 404 - warp_event 17, 31, 1, STAND_ROCKET_HOUSE_1F, wOverworldMapBlocks + 425 - warp_event 34, 31, 1, STAND_LEAGUE_1F, wOverworldMapBlocks + 434 - warp_event 35, 31, 2, STAND_LEAGUE_1F, wOverworldMapBlocks + 434 - warp_event 30, 13, 1, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 198 - warp_event 31, 13, 2, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 198 - - db 10 ; bg events - bg_event 8, 8, 0, 1 - bg_event 14, 8, 0, 2 - bg_event 20, 10, 0, 3 - bg_event 16, 16, 0, 4 - bg_event 10, 20, 0, 5 - bg_event 18, 21, 0, 6 - bg_event 24, 20, 0, 7 - bg_event 34, 20, 0, 8 - bg_event 36, 26, 0, 9 - bg_event 32, 35, 0, 10 - - db 9 ; person events - object_event 10, 10, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 17, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 28, 19, SPRITE_ROCKER, FACE_RIGHT, 0, 3, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 30, 31, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 21, 8, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 6, SPRITE_PIPPI, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 15, SPRITE_POPPO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 21, SPRITE_SIDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Stand_Blocks:: INCBIN "maps/placeholder/blk/Stand.blk" diff --git a/data/maps/attributes/placeholder/StandHouse.asm b/data/maps/attributes/placeholder/StandHouse.asm deleted file mode 100644 index 8560cec..0000000 --- a/data/maps/attributes/placeholder/StandHouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandHouse.asm", ROMX - map_attributes StandHouse, STAND_HOUSE, 0 - -StandHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 5, STAND, wOverworldMapBlocks + 47 - warp_event 5, 7, 5, STAND, wOverworldMapBlocks + 47 - - db 0 ; bg events - - db 1 ; person events - object_event 2, 3, SPRITE_SUPER_NERD, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 - -StandHouse_Blocks:: INCBIN "maps/placeholder/blk/StandHouse.blk" diff --git a/data/maps/attributes/placeholder/StandLab.asm b/data/maps/attributes/placeholder/StandLab.asm deleted file mode 100644 index cfaeb45..0000000 --- a/data/maps/attributes/placeholder/StandLab.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandLab.asm", ROMX - map_attributes StandLab, STAND_LAB, 0 - -StandLab_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 1, STAND, wOverworldMapBlocks + 42 - warp_event 4, 7, 1, STAND, wOverworldMapBlocks + 43 - - db 0 ; bg events - - db 1 ; person events - object_event 2, 3, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -StandLab_Blocks:: INCBIN "maps/placeholder/blk/StandLab.blk" diff --git a/data/maps/attributes/placeholder/StandLeague1F.asm b/data/maps/attributes/placeholder/StandLeague1F.asm deleted file mode 100644 index a762b75..0000000 --- a/data/maps/attributes/placeholder/StandLeague1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandLeague1F.asm", ROMX - map_attributes StandLeague1F, STAND_LEAGUE_1F, 0 - -StandLeague1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 3, 15, 7, STAND, wOverworldMapBlocks + 82 - warp_event 4, 15, 8, STAND, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, STAND_LEAGUE_2F, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -StandLeague1F_Blocks:: INCBIN "maps/placeholder/blk/StandLeague1F.blk" diff --git a/data/maps/attributes/placeholder/StandLeague2F.asm b/data/maps/attributes/placeholder/StandLeague2F.asm deleted file mode 100644 index e88767b..0000000 --- a/data/maps/attributes/placeholder/StandLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandLeague2F.asm", ROMX - map_attributes StandLeague2F, STAND_LEAGUE_2F, 0 - -StandLeague2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 7, 15, 3, STAND_LEAGUE_1F, wOverworldMapBlocks + 92 - - db 0 ; bg events - - db 5 ; person events - object_event 4, 7, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -StandLeague2F_Blocks:: INCBIN "maps/placeholder/blk/StandLeague2F.blk" diff --git a/data/maps/attributes/placeholder/StandMart.asm b/data/maps/attributes/placeholder/StandMart.asm deleted file mode 100644 index 56b2581..0000000 --- a/data/maps/attributes/placeholder/StandMart.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandMart.asm", ROMX - map_attributes StandMart, STAND_MART, 0 - -StandMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 4, STAND, wOverworldMapBlocks + 59 - warp_event 5, 7, 4, STAND, wOverworldMapBlocks + 59 - - db 0 ; bg events - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -StandMart_Blocks:: INCBIN "maps/placeholder/blk/StandMart.blk" diff --git a/data/maps/attributes/placeholder/StandOffice.asm b/data/maps/attributes/placeholder/StandOffice.asm deleted file mode 100644 index 7faa973..0000000 --- a/data/maps/attributes/placeholder/StandOffice.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandOffice.asm", ROMX - map_attributes StandOffice, STAND_OFFICE, 0 - -StandOffice_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 2, 7, 3, STAND, wOverworldMapBlocks + 58 - warp_event 3, 7, 3, STAND, wOverworldMapBlocks + 58 - - db 0 ; bg events - - db 3 ; person events - object_event 13, 4, SPRITE_ROCKER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 6, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 7, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -StandOffice_Blocks:: INCBIN "maps/placeholder/blk/StandOffice.blk" diff --git a/data/maps/attributes/placeholder/StandPokecenter1F.asm b/data/maps/attributes/placeholder/StandPokecenter1F.asm deleted file mode 100644 index 36fe312..0000000 --- a/data/maps/attributes/placeholder/StandPokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandPokecenter1F.asm", ROMX - map_attributes StandPokecenter1F, STAND_POKECENTER_1F, 0 - -StandPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 2, STAND, wOverworldMapBlocks + 59 - warp_event 6, 7, 2, STAND, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, STAND_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -StandPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/StandPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/StandPokecenter2F.asm b/data/maps/attributes/placeholder/StandPokecenter2F.asm deleted file mode 100644 index 27cceef..0000000 --- a/data/maps/attributes/placeholder/StandPokecenter2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandPokecenter2F.asm", ROMX - map_attributes StandPokecenter2F, STAND_POKECENTER_2F, 0 - -StandPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, STAND_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -StandPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/StandPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/StandRocketHouse1F.asm b/data/maps/attributes/placeholder/StandRocketHouse1F.asm deleted file mode 100644 index e5c9553..0000000 --- a/data/maps/attributes/placeholder/StandRocketHouse1F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandRocketHouse1F.asm", ROMX - map_attributes StandRocketHouse1F, STAND_ROCKET_HOUSE_1F, 0 - -StandRocketHouse1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 2, 7, 6, STAND, wOverworldMapBlocks + 58 - warp_event 3, 7, 6, STAND, wOverworldMapBlocks + 58 - warp_event 15, 1, 1, STAND_ROCKET_HOUSE_2F, wOverworldMapBlocks + 22 - - db 0 ; bg events - - db 1 ; person events - object_event 11, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -StandRocketHouse1F_Blocks:: INCBIN "maps/placeholder/blk/StandRocketHouse1F.blk" diff --git a/data/maps/attributes/placeholder/StandRocketHouse2F.asm b/data/maps/attributes/placeholder/StandRocketHouse2F.asm deleted file mode 100644 index 6f7828d..0000000 --- a/data/maps/attributes/placeholder/StandRocketHouse2F.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandRocketHouse2F.asm", ROMX - map_attributes StandRocketHouse2F, STAND_ROCKET_HOUSE_2F, 0 - -StandRocketHouse2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 15, 1, 3, STAND_ROCKET_HOUSE_1F, wOverworldMapBlocks + 22 - - db 0 ; bg events - - db 1 ; person events - object_event 5, 4, SPRITE_ROCKET_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -StandRocketHouse2F_Blocks:: INCBIN "maps/placeholder/blk/StandRocketHouse2F.blk" diff --git a/data/maps/attributes/placeholder/StandRoute.asm b/data/maps/attributes/placeholder/StandRoute.asm deleted file mode 100644 index 30186ce..0000000 --- a/data/maps/attributes/placeholder/StandRoute.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandRoute.asm", ROMX - map_attributes StandRoute, STAND_ROUTE, NORTH | SOUTH - connection north, Stand, STAND, -3, 7, 13 - connection south, KantoEastRoute, KANTO_EAST_ROUTE, -3, 7, 13 - -StandRoute_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 8, 48, 3, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 405 - warp_event 9, 48, 4, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 405 - - db 0 ; bg events - - db 0 ; person events - -StandRoute_Blocks:: INCBIN "maps/placeholder/blk/StandRoute.blk" diff --git a/data/maps/attributes/placeholder/StandRouteGateKanto.asm b/data/maps/attributes/placeholder/StandRouteGateKanto.asm deleted file mode 100644 index 2981852..0000000 --- a/data/maps/attributes/placeholder/StandRouteGateKanto.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/StandRouteGateKanto.asm", ROMX - map_attributes StandRouteGateKanto, STAND_ROUTE_GATE_KANTO, 0 - -StandRouteGateKanto_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 4, 7, 1, KANTO_EAST_ROUTE, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, KANTO_EAST_ROUTE, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, STAND_ROUTE, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, STAND_ROUTE, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 0 ; person events - -StandRouteGateKanto_Blocks:: INCBIN "maps/placeholder/blk/StandRouteGateKanto.blk" diff --git a/data/maps/attributes/placeholder/Sugar.asm b/data/maps/attributes/placeholder/Sugar.asm deleted file mode 100644 index 6c5d6b4..0000000 --- a/data/maps/attributes/placeholder/Sugar.asm +++ /dev/null @@ -1,27 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/Sugar.asm", ROMX - map_attributes Sugar, SUGAR, SOUTH - connection south, SugarRoute, SUGAR_ROUTE, 0, 0, 10 - -Sugar_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 5, 5, 1, SUGAR_HOUSE, wOverworldMapBlocks + 51 - warp_event 15, 9, 1, SUGAR_HOUSE_2, wOverworldMapBlocks + 88 - warp_event 5, 10, 1, SUGAR_MART, wOverworldMapBlocks + 99 - warp_event 9, 10, 1, SUGAR_POKECENTER_1F, wOverworldMapBlocks + 101 - - db 4 ; bg events - bg_event 14, 6, 0, 1 - bg_event 6, 10, 0, 2 - bg_event 10, 10, 0, 3 - bg_event 10, 14, 0, 4 - - db 3 ; person events - object_event 8, 12, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 11, SPRITE_GRAMPS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - -Sugar_Blocks:: INCBIN "maps/placeholder/blk/Sugar.blk" diff --git a/data/maps/attributes/placeholder/SugarHouse.asm b/data/maps/attributes/placeholder/SugarHouse.asm deleted file mode 100644 index eef5c56..0000000 --- a/data/maps/attributes/placeholder/SugarHouse.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SugarHouse.asm", ROMX - map_attributes SugarHouse, SUGAR_HOUSE, 0 - -SugarHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 15, 1, SUGAR, wOverworldMapBlocks + 82 - warp_event 4, 15, 1, SUGAR, wOverworldMapBlocks + 83 - - db 0 ; bg events - - db 3 ; person events - object_event 3, 5, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 5, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SugarHouse_Blocks:: INCBIN "maps/placeholder/blk/SugarHouse.blk" diff --git a/data/maps/attributes/placeholder/SugarHouse2.asm b/data/maps/attributes/placeholder/SugarHouse2.asm deleted file mode 100644 index 9d86644..0000000 --- a/data/maps/attributes/placeholder/SugarHouse2.asm +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SugarHouse2.asm", ROMX - map_attributes SugarHouse2, SUGAR_HOUSE_2, 0 - -SugarHouse2_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 3, 7, 2, SUGAR, wOverworldMapBlocks + 42 - warp_event 4, 7, 2, SUGAR, wOverworldMapBlocks + 43 - - db 0 ; bg events - - db 1 ; person events - object_event 2, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SugarHouse2_Blocks:: INCBIN "maps/placeholder/blk/SugarHouse2.blk" diff --git a/data/maps/attributes/placeholder/SugarMart.asm b/data/maps/attributes/placeholder/SugarMart.asm deleted file mode 100644 index 2da0c08..0000000 --- a/data/maps/attributes/placeholder/SugarMart.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SugarMart.asm", ROMX - map_attributes SugarMart, SUGAR_MART, 0 - -SugarMart_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 3, SUGAR, wOverworldMapBlocks + 59 - warp_event 5, 7, 3, SUGAR, wOverworldMapBlocks + 59 - - db 0 ; bg events - - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SugarMart_Blocks:: INCBIN "maps/placeholder/blk/SugarMart.blk" diff --git a/data/maps/attributes/placeholder/SugarPokecenter1F.asm b/data/maps/attributes/placeholder/SugarPokecenter1F.asm deleted file mode 100644 index 944c776..0000000 --- a/data/maps/attributes/placeholder/SugarPokecenter1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SugarPokecenter1F.asm", ROMX - map_attributes SugarPokecenter1F, SUGAR_POKECENTER_1F, 0 - -SugarPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 4, SUGAR, wOverworldMapBlocks + 59 - warp_event 6, 7, 4, SUGAR, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, SUGAR_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SugarPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/SugarPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/SugarPokecenter2F.asm b/data/maps/attributes/placeholder/SugarPokecenter2F.asm deleted file mode 100644 index 8141093..0000000 --- a/data/maps/attributes/placeholder/SugarPokecenter2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SugarPokecenter2F.asm", ROMX - map_attributes SugarPokecenter2F, SUGAR_POKECENTER_2F, 0 - -SugarPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, SUGAR_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 0 ; bg events - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -SugarPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/SugarPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/SugarRoute.asm b/data/maps/attributes/placeholder/SugarRoute.asm deleted file mode 100644 index 20647d8..0000000 --- a/data/maps/attributes/placeholder/SugarRoute.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SugarRoute.asm", ROMX - map_attributes SugarRoute, SUGAR_ROUTE, NORTH | SOUTH - connection north, Sugar, SUGAR, 0, 0, 10 - connection south, Newtype, NEWTYPE, -3, 2, 16 - -SugarRoute_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 8, 48, 3, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 405 - warp_event 9, 48, 4, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 405 - - db 0 ; bg events - - db 0 ; person events - -SugarRoute_Blocks:: INCBIN "maps/placeholder/blk/SugarRoute.blk" diff --git a/data/maps/attributes/placeholder/SugarRouteGate.asm b/data/maps/attributes/placeholder/SugarRouteGate.asm deleted file mode 100644 index 95acf84..0000000 --- a/data/maps/attributes/placeholder/SugarRouteGate.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/SugarRouteGate.asm", ROMX - map_attributes SugarRouteGate, SUGAR_ROUTE_GATE, 0 - -SugarRouteGate_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 4, 7, 12, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 5, 7, 13, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, SUGAR_ROUTE, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, SUGAR_ROUTE, wOverworldMapBlocks + 14 - - db 0 ; bg events - - db 0 ; person events - -SugarRouteGate_Blocks:: INCBIN "maps/placeholder/blk/SugarRouteGate.blk" diff --git a/data/maps/attributes/placeholder/West.asm b/data/maps/attributes/placeholder/West.asm deleted file mode 100644 index 04d1e8d..0000000 --- a/data/maps/attributes/placeholder/West.asm +++ /dev/null @@ -1,43 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/West.asm", ROMX - map_attributes West, WEST, NORTH | EAST - connection north, BaadonRoute1, BAADON_ROUTE_1, 5, 0, 10 - connection east, Route2, ROUTE_2, 5, 0, 9 - -West_MapEvents:: - dw $4000 ; unknown - - db 13 ; warp events - warp_event 13, 5, 1, WEST_MART_1F, wOverworldMapBlocks + 85 - warp_event 14, 5, 2, WEST_MART_1F, wOverworldMapBlocks + 86 - warp_event 31, 7, 1, WEST_RADIO_TOWER_1F, wOverworldMapBlocks + 120 - warp_event 32, 7, 2, WEST_RADIO_TOWER_1F, wOverworldMapBlocks + 121 - warp_event 18, 12, 1, WEST_ROCKET_RAIDED_HOUSE, wOverworldMapBlocks + 192 - warp_event 25, 14, 1, WEST_POKECENTER_1F, wOverworldMapBlocks + 221 - warp_event 14, 19, 1, WEST_GYM, wOverworldMapBlocks + 268 - warp_event 15, 19, 2, WEST_GYM, wOverworldMapBlocks + 268 - warp_event 26, 19, 1, WEST_HOUSE_1, wOverworldMapBlocks + 274 - warp_event 32, 19, 1, WEST_HOUSE_2, wOverworldMapBlocks + 277 - warp_event 22, 5, 1, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 90 - warp_event 23, 5, 2, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 90 - warp_event 35, 15, 1, ROUTE_2_GATE_1F, wOverworldMapBlocks + 226 - - db 6 ; bg events - bg_event 16, 7, 0, 1 - bg_event 28, 9, 0, 2 - bg_event 12, 10, 0, 3 - bg_event 32, 12, 0, 4 - bg_event 26, 14, 0, 5 - bg_event 18, 20, 0, 6 - - db 7 ; person events - object_event 6, 8, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 12, 7, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 26, 10, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 30, 14, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 29, 14, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 22, 19, SPRITE_COOLTRAINER_F, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 18, 13, SPRITE_36, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -West_Blocks:: INCBIN "maps/placeholder/blk/West.blk" diff --git a/data/maps/attributes/placeholder/WestGym.asm b/data/maps/attributes/placeholder/WestGym.asm deleted file mode 100644 index f1bc752..0000000 --- a/data/maps/attributes/placeholder/WestGym.asm +++ /dev/null @@ -1,25 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestGym.asm", ROMX - map_attributes WestGym, WEST_GYM, 0 - -WestGym_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 17, 7, WEST, wOverworldMapBlocks + 102 - warp_event 5, 17, 8, WEST, wOverworldMapBlocks + 102 - - db 2 ; bg events - bg_event 3, 15, 0, 1 - bg_event 6, 15, 0, 1 - - db 6 ; person events - object_event 4, 4, SPRITE_TSUKUSHI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 7, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - object_event 3, 11, SPRITE_COOLTRAINER_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - object_event 5, 9, SPRITE_LASS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 4, 6, SPRITE_TWIN, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestGym_Blocks:: INCBIN "maps/placeholder/blk/WestGym.blk" diff --git a/data/maps/attributes/placeholder/WestHouse1.asm b/data/maps/attributes/placeholder/WestHouse1.asm deleted file mode 100644 index 6b9fb0c..0000000 --- a/data/maps/attributes/placeholder/WestHouse1.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestHouse1.asm", ROMX - map_attributes WestHouse1, WEST_HOUSE_1, 0 - -WestHouse1_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 9, WEST, wOverworldMapBlocks + 47 - warp_event 5, 7, 9, WEST, wOverworldMapBlocks + 47 - - db 4 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 5, 1, 0, 3 - bg_event 8, 0, 0, 4 - - db 3 ; person events - object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 6, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 4, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestHouse1_Blocks:: INCBIN "maps/placeholder/blk/WestHouse1.blk" diff --git a/data/maps/attributes/placeholder/WestHouse2.asm b/data/maps/attributes/placeholder/WestHouse2.asm deleted file mode 100644 index 2e10b62..0000000 --- a/data/maps/attributes/placeholder/WestHouse2.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestHouse2.asm", ROMX - map_attributes WestHouse2, WEST_HOUSE_2, 0 - -WestHouse2_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 10, WEST, wOverworldMapBlocks + 47 - warp_event 5, 7, 10, WEST, wOverworldMapBlocks + 47 - - db 4 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 5, 1, 0, 3 - bg_event 8, 0, 0, 4 - - db 3 ; person events - object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 6, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_BUG_CATCHER_BOY, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -WestHouse2_Blocks:: INCBIN "maps/placeholder/blk/WestHouse2.blk" diff --git a/data/maps/attributes/placeholder/WestMart1F.asm b/data/maps/attributes/placeholder/WestMart1F.asm deleted file mode 100644 index 8a9cdff..0000000 --- a/data/maps/attributes/placeholder/WestMart1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestMart1F.asm", ROMX - map_attributes WestMart1F, WEST_MART_1F, 0 - -WestMart1F_MapEvents:: - dw $4000 ; unknown - - db 4 ; warp events - warp_event 13, 7, 1, WEST, wOverworldMapBlocks + 63 - warp_event 14, 7, 2, WEST, wOverworldMapBlocks + 64 - warp_event 15, 0, 2, WEST_MART_2F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 - - db 2 ; bg events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 - - db 1 ; person events - object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestMart1F_Blocks:: INCBIN "maps/placeholder/blk/WestMart1F.blk" diff --git a/data/maps/attributes/placeholder/WestMart2F.asm b/data/maps/attributes/placeholder/WestMart2F.asm deleted file mode 100644 index 97d1893..0000000 --- a/data/maps/attributes/placeholder/WestMart2F.asm +++ /dev/null @@ -1,38 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestMart2F.asm", ROMX - map_attributes WestMart2F, WEST_MART_2F, 0 - -WestMart2F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 12, 0, 1, WEST_MART_3F, wOverworldMapBlocks + 21 - warp_event 15, 0, 3, WEST_MART_1F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 - - db 16 ; bg events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 3, 4, 0, 3 - bg_event 3, 5, 0, 3 - bg_event 3, 6, 0, 3 - bg_event 3, 7, 0, 3 - bg_event 7, 4, 0, 3 - bg_event 7, 5, 0, 3 - bg_event 7, 6, 0, 3 - bg_event 7, 7, 0, 3 - bg_event 4, 1, 0, 3 - bg_event 5, 1, 0, 3 - bg_event 6, 1, 0, 3 - bg_event 7, 1, 0, 3 - bg_event 8, 1, 0, 3 - bg_event 9, 1, 0, 3 - - db 4 ; person events - object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 6, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_BURGLAR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_ROCKET_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestMart2F_Blocks:: INCBIN "maps/placeholder/blk/WestMart2F.blk" diff --git a/data/maps/attributes/placeholder/WestMart3F.asm b/data/maps/attributes/placeholder/WestMart3F.asm deleted file mode 100644 index fe53d36..0000000 --- a/data/maps/attributes/placeholder/WestMart3F.asm +++ /dev/null @@ -1,35 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestMart3F.asm", ROMX - map_attributes WestMart3F, WEST_MART_3F, 0 - -WestMart3F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 12, 0, 1, WEST_MART_2F, wOverworldMapBlocks + 21 - warp_event 15, 0, 2, WEST_MART_4F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 - - db 14 ; bg events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 1, 4, 0, 3 - bg_event 1, 5, 0, 3 - bg_event 1, 6, 0, 3 - bg_event 1, 7, 0, 3 - bg_event 5, 4, 0, 3 - bg_event 5, 5, 0, 3 - bg_event 5, 6, 0, 3 - bg_event 5, 7, 0, 3 - bg_event 9, 4, 0, 3 - bg_event 9, 5, 0, 3 - bg_event 9, 6, 0, 3 - bg_event 9, 7, 0, 3 - - db 3 ; person events - object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 4, SPRITE_GENTLEMAN, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 5, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestMart3F_Blocks:: INCBIN "maps/placeholder/blk/WestMart3F.blk" diff --git a/data/maps/attributes/placeholder/WestMart4F.asm b/data/maps/attributes/placeholder/WestMart4F.asm deleted file mode 100644 index f63a9b4..0000000 --- a/data/maps/attributes/placeholder/WestMart4F.asm +++ /dev/null @@ -1,35 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestMart4F.asm", ROMX - map_attributes WestMart4F, WEST_MART_4F, 0 - -WestMart4F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 12, 0, 1, WEST_MART_5F, wOverworldMapBlocks + 21 - warp_event 15, 0, 2, WEST_MART_3F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 - - db 14 ; bg events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 2, 5, 0, 3 - bg_event 3, 5, 0, 3 - bg_event 4, 5, 0, 3 - bg_event 5, 5, 0, 3 - bg_event 6, 5, 0, 3 - bg_event 7, 5, 0, 3 - bg_event 8, 5, 0, 3 - bg_event 9, 5, 0, 3 - bg_event 6, 1, 0, 3 - bg_event 7, 1, 0, 3 - bg_event 8, 1, 0, 3 - bg_event 9, 1, 0, 3 - - db 3 ; person events - object_event 13, 5, SPRITE_CLERK, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 6, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestMart4F_Blocks:: INCBIN "maps/placeholder/blk/WestMart4F.blk" diff --git a/data/maps/attributes/placeholder/WestMart5F.asm b/data/maps/attributes/placeholder/WestMart5F.asm deleted file mode 100644 index c3bf314..0000000 --- a/data/maps/attributes/placeholder/WestMart5F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestMart5F.asm", ROMX - map_attributes WestMart5F, WEST_MART_5F, 0 - -WestMart5F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 12, 0, 1, WEST_MART_4F, wOverworldMapBlocks + 21 - warp_event 15, 0, 1, WEST_MART_6F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 - - db 2 ; bg events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 - - db 3 ; person events - object_event 8, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 5, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 4, SPRITE_NYOROBON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestMart5F_Blocks:: INCBIN "maps/placeholder/blk/WestMart5F.blk" diff --git a/data/maps/attributes/placeholder/WestMart6F.asm b/data/maps/attributes/placeholder/WestMart6F.asm deleted file mode 100644 index 1d2f81c..0000000 --- a/data/maps/attributes/placeholder/WestMart6F.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestMart6F.asm", ROMX - map_attributes WestMart6F, WEST_MART_6F, 0 - -WestMart6F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 15, 0, 2, WEST_MART_5F, wOverworldMapBlocks + 22 - - db 5 ; bg events - bg_event 8, 1, 0, 1 - bg_event 9, 1, 0, 2 - bg_event 10, 1, 0, 3 - bg_event 11, 1, 0, 4 - bg_event 14, 0, 0, 5 - - db 3 ; person events - object_event 12, 3, SPRITE_OFFICER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 4, SPRITE_SIDON, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 6, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestMart6F_Blocks:: INCBIN "maps/placeholder/blk/WestMart6F.blk" diff --git a/data/maps/attributes/placeholder/WestMartElevator.asm b/data/maps/attributes/placeholder/WestMartElevator.asm deleted file mode 100644 index 1e7c99a..0000000 --- a/data/maps/attributes/placeholder/WestMartElevator.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestMartElevator.asm", ROMX - map_attributes WestMartElevator, WEST_MART_ELEVATOR, 0 - -WestMartElevator_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 1, 3, 4, WEST_MART_1F, wOverworldMapBlocks + 17 - warp_event 2, 3, 4, WEST_MART_1F, wOverworldMapBlocks + 18 - - db 0 ; bg events - - db 0 ; person events - -WestMartElevator_Blocks:: INCBIN "maps/placeholder/blk/WestMartElevator.blk" diff --git a/data/maps/attributes/placeholder/WestPokecenter1F.asm b/data/maps/attributes/placeholder/WestPokecenter1F.asm deleted file mode 100644 index 3135a9e..0000000 --- a/data/maps/attributes/placeholder/WestPokecenter1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestPokecenter1F.asm", ROMX - map_attributes WestPokecenter1F, WEST_POKECENTER_1F, 0 - -WestPokecenter1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 5, 7, 6, WEST, wOverworldMapBlocks + 59 - warp_event 6, 7, 6, WEST, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, WEST_POKECENTER_2F, wOverworldMapBlocks + 57 - - db 1 ; bg events - bg_event 13, 1, 0, 1 - - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_LASS, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_ROCKET_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/WestPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/WestPokecenter2F.asm b/data/maps/attributes/placeholder/WestPokecenter2F.asm deleted file mode 100644 index f67f47e..0000000 --- a/data/maps/attributes/placeholder/WestPokecenter2F.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestPokecenter2F.asm", ROMX - map_attributes WestPokecenter2F, WEST_POKECENTER_2F, 0 - -WestPokecenter2F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 7, 3, WEST_POKECENTER_1F, wOverworldMapBlocks + 57 - - db 1 ; bg events - bg_event 1, 1, 0, 1 - - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/WestPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/WestRadioTower1F.asm b/data/maps/attributes/placeholder/WestRadioTower1F.asm deleted file mode 100644 index 8a7f33a..0000000 --- a/data/maps/attributes/placeholder/WestRadioTower1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestRadioTower1F.asm", ROMX - map_attributes WestRadioTower1F, WEST_RADIO_TOWER_1F, 0 - -WestRadioTower1F_MapEvents:: - dw $4000 ; unknown - - db 3 ; warp events - warp_event 2, 7, 3, WEST, wOverworldMapBlocks + 42 - warp_event 3, 7, 4, WEST, wOverworldMapBlocks + 42 - warp_event 7, 0, 2, WEST_RADIO_TOWER_2F, wOverworldMapBlocks + 14 - - db 2 ; bg events - bg_event 5, 0, 0, 1 - bg_event 0, 1, 0, 2 - - db 3 ; person events - object_event 6, 6, SPRITE_RECEPTIONIST, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 3, SPRITE_SUPER_NERD, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestRadioTower1F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower1F.blk" diff --git a/data/maps/attributes/placeholder/WestRadioTower2F.asm b/data/maps/attributes/placeholder/WestRadioTower2F.asm deleted file mode 100644 index c42b729..0000000 --- a/data/maps/attributes/placeholder/WestRadioTower2F.asm +++ /dev/null @@ -1,25 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestRadioTower2F.asm", ROMX - map_attributes WestRadioTower2F, WEST_RADIO_TOWER_2F, 0 - -WestRadioTower2F_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 0, 0, 1, WEST_RADIO_TOWER_3F, wOverworldMapBlocks + 11 - warp_event 7, 0, 3, WEST_RADIO_TOWER_1F, wOverworldMapBlocks + 14 - - db 1 ; bg events - bg_event 5, 0, 0, 1 - - db 7 ; person events - object_event 4, 6, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 5, SPRITE_ROCKER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_SUPER_NERD, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 2, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestRadioTower2F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower2F.blk" diff --git a/data/maps/attributes/placeholder/WestRadioTower3F.asm b/data/maps/attributes/placeholder/WestRadioTower3F.asm deleted file mode 100644 index 87e3b7c..0000000 --- a/data/maps/attributes/placeholder/WestRadioTower3F.asm +++ /dev/null @@ -1,26 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestRadioTower3F.asm", ROMX - map_attributes WestRadioTower3F, WEST_RADIO_TOWER_3F, 0 - -WestRadioTower3F_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 0, 0, 1, WEST_RADIO_TOWER_2F, wOverworldMapBlocks + 11 - warp_event 7, 0, 2, WEST_RADIO_TOWER_4F, wOverworldMapBlocks + 14 - - db 1 ; bg events - bg_event 5, 0, 0, 1 - - db 8 ; person events - object_event 4, 6, SPRITE_SUPER_NERD, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 6, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 5, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 2, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 3, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestRadioTower3F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower3F.blk" diff --git a/data/maps/attributes/placeholder/WestRadioTower4F.asm b/data/maps/attributes/placeholder/WestRadioTower4F.asm deleted file mode 100644 index 3f16e4f..0000000 --- a/data/maps/attributes/placeholder/WestRadioTower4F.asm +++ /dev/null @@ -1,27 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestRadioTower4F.asm", ROMX - map_attributes WestRadioTower4F, WEST_RADIO_TOWER_4F, 0 - -WestRadioTower4F_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 0, 0, 1, WEST_RADIO_TOWER_5F, wOverworldMapBlocks + 11 - warp_event 7, 0, 2, WEST_RADIO_TOWER_3F, wOverworldMapBlocks + 14 - - db 1 ; bg events - bg_event 5, 0, 0, 1 - - db 9 ; person events - object_event 2, 6, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 5, SPRITE_BURGLAR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 6, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 5, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 5, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 4, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 2, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestRadioTower4F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower4F.blk" diff --git a/data/maps/attributes/placeholder/WestRadioTower5F.asm b/data/maps/attributes/placeholder/WestRadioTower5F.asm deleted file mode 100644 index da37bb0..0000000 --- a/data/maps/attributes/placeholder/WestRadioTower5F.asm +++ /dev/null @@ -1,27 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestRadioTower5F.asm", ROMX - map_attributes WestRadioTower5F, WEST_RADIO_TOWER_5F, 0 - -WestRadioTower5F_MapEvents:: - dw $4000 ; unknown - - db 1 ; warp events - warp_event 0, 0, 1, WEST_RADIO_TOWER_4F, wOverworldMapBlocks + 11 - - db 3 ; bg events - bg_event 3, 0, 0, 1 - bg_event 6, 4, 0, 2 - bg_event 7, 4, 0, 2 - - db 8 ; person events - object_event 6, 6, SPRITE_SCIENTIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 2, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 6, SPRITE_PIPPI, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 7, SPRITE_SAKAKI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 4, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 7, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestRadioTower5F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower5F.blk" diff --git a/data/maps/attributes/placeholder/WestRocketRaidedHouse.asm b/data/maps/attributes/placeholder/WestRocketRaidedHouse.asm deleted file mode 100644 index c3ea07d..0000000 --- a/data/maps/attributes/placeholder/WestRocketRaidedHouse.asm +++ /dev/null @@ -1,29 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/attributes/placeholder/WestRocketRaidedHouse.asm", ROMX - map_attributes WestRocketRaidedHouse, WEST_ROCKET_RAIDED_HOUSE, 0 - -WestRocketRaidedHouse_MapEvents:: - dw $4000 ; unknown - - db 2 ; warp events - warp_event 4, 7, 5, WEST, wOverworldMapBlocks + 47 - warp_event 5, 7, 5, WEST, wOverworldMapBlocks + 47 - - db 7 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 2, 1, 0, 3 - bg_event 4, 1, 0, 4 - bg_event 5, 1, 0, 4 - bg_event 7, 1, 0, 5 - bg_event 8, 0, 0, 6 - - db 5 ; person events - object_event 8, 1, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 5, SPRITE_36, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 4, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 3, SPRITE_POKEFAN_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -WestRocketRaidedHouse_Blocks:: INCBIN "maps/placeholder/blk/WestRocketRaidedHouse.blk" diff --git a/data/maps/objects/Baadon.asm b/data/maps/objects/Baadon.asm new file mode 100644 index 0000000..f33b6cd --- /dev/null +++ b/data/maps/objects/Baadon.asm @@ -0,0 +1,36 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Baadon.asm", ROMX + + map_attributes Baadon, BAADON, NORTH | SOUTH | EAST + connection north, FontoRoute4, FONTO_ROUTE_4, 0, 0, 10 + connection south, BaadonRoute1, BAADON_ROUTE_1, 0, 0, 10 + connection east, BaadonRoute2, BAADON_ROUTE_2, 0, 0, 9 + +Baadon_MapEvents:: + dw $4000 ; unknown + + db 9 ; warp events + warp_event 3, 4, 1, BAADON_MART, wOverworldMapBlocks + 50 + warp_event 15, 4, 1, BAADON_POKECENTER_1F, wOverworldMapBlocks + 56 + warp_event 4, 9, 1, BAADON_HOUSE_1, wOverworldMapBlocks + 83 + warp_event 3, 13, 1, BAADON_WALLPAPER_HOUSE, wOverworldMapBlocks + 114 + warp_event 9, 13, 1, BAADON_HOUSE_2, wOverworldMapBlocks + 117 + warp_event 14, 15, 1, BAADON_LEAGUE_1F, wOverworldMapBlocks + 136 + warp_event 15, 15, 2, BAADON_LEAGUE_1F, wOverworldMapBlocks + 136 + warp_event 8, 5, 1, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 53 + warp_event 9, 5, 2, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 53 + + db 4 ; bg events + bg_event 4, 4, 0, 1 + bg_event 16, 4, 0, 2 + bg_event 11, 10, 0, 3 + bg_event 6, 14, 0, 4 + + db 3 ; person events + object_event 14, 8, SPRITE_SUPER_NERD, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 9, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 14, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Baadon_Blocks:: +INCBIN "maps/Baadon.blk" diff --git a/data/maps/objects/BaadonHouse1.asm b/data/maps/objects/BaadonHouse1.asm new file mode 100644 index 0000000..a4ecf0b --- /dev/null +++ b/data/maps/objects/BaadonHouse1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonHouse1.asm", ROMX + + map_attributes BaadonHouse1, BAADON_HOUSE_1, 0 + +BaadonHouse1_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 3, BAADON, wOverworldMapBlocks + 42 + warp_event 4, 7, 3, BAADON, wOverworldMapBlocks + 43 + + db 0 ; bg events + + db 1 ; person events + object_event 2, 3, SPRITE_ELDER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BaadonHouse1_Blocks:: +INCBIN "maps/BaadonHouse1.blk" diff --git a/data/maps/objects/BaadonHouse2.asm b/data/maps/objects/BaadonHouse2.asm new file mode 100644 index 0000000..cac8df5 --- /dev/null +++ b/data/maps/objects/BaadonHouse2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonHouse2.asm", ROMX + + map_attributes BaadonHouse2, BAADON_HOUSE_2, 0 + +BaadonHouse2_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 5, BAADON, wOverworldMapBlocks + 47 + warp_event 5, 7, 5, BAADON, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 7, 5, SPRITE_GRANNY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BaadonHouse2_Blocks:: +INCBIN "maps/BaadonHouse2.blk" diff --git a/data/maps/objects/BaadonLeague1F.asm b/data/maps/objects/BaadonLeague1F.asm new file mode 100644 index 0000000..828fa54 --- /dev/null +++ b/data/maps/objects/BaadonLeague1F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonLeague1F.asm", ROMX + + map_attributes BaadonLeague1F, BAADON_LEAGUE_1F, 0 + +BaadonLeague1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 3, 15, 6, BAADON, wOverworldMapBlocks + 82 + warp_event 4, 15, 7, BAADON, wOverworldMapBlocks + 83 + warp_event 7, 1, 1, BAADON_LEAGUE_2F, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 5 ; person events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +BaadonLeague1F_Blocks:: +INCBIN "maps/BaadonLeague1F.blk" diff --git a/data/maps/objects/BaadonLeague2F.asm b/data/maps/objects/BaadonLeague2F.asm new file mode 100644 index 0000000..7021383 --- /dev/null +++ b/data/maps/objects/BaadonLeague2F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonLeague2F.asm", ROMX + + map_attributes BaadonLeague2F, BAADON_LEAGUE_2F, 0 + +BaadonLeague2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 7, 15, 3, BAADON_LEAGUE_1F, wOverworldMapBlocks + 92 + + db 0 ; bg events + + db 5 ; person events + object_event 4, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 2, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 1, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 9, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 11, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BaadonLeague2F_Blocks:: +INCBIN "maps/BaadonLeague2F.blk" diff --git a/data/maps/objects/BaadonMart.asm b/data/maps/objects/BaadonMart.asm new file mode 100644 index 0000000..2492e69 --- /dev/null +++ b/data/maps/objects/BaadonMart.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonMart.asm", ROMX + + map_attributes BaadonMart, BAADON_MART, 0 + +BaadonMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 1, BAADON, wOverworldMapBlocks + 59 + warp_event 5, 7, 1, BAADON, wOverworldMapBlocks + 59 + + db 0 ; bg events + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BaadonMart_Blocks:: +INCBIN "maps/BaadonMart.blk" diff --git a/data/maps/objects/BaadonPokecenter1F.asm b/data/maps/objects/BaadonPokecenter1F.asm new file mode 100644 index 0000000..aa9f38d --- /dev/null +++ b/data/maps/objects/BaadonPokecenter1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonPokecenter1F.asm", ROMX + + map_attributes BaadonPokecenter1F, BAADON_POKECENTER_1F, 0 + +BaadonPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 2, BAADON, wOverworldMapBlocks + 59 + warp_event 6, 7, 2, BAADON, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, BAADON_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 14, 6, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BaadonPokecenter1F_Blocks:: +INCBIN "maps/BaadonPokecenter1F.blk" diff --git a/data/maps/objects/BaadonPokecenter2F.asm b/data/maps/objects/BaadonPokecenter2F.asm new file mode 100644 index 0000000..4f865a5 --- /dev/null +++ b/data/maps/objects/BaadonPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonPokecenter2F.asm", ROMX + + map_attributes BaadonPokecenter2F, BAADON_POKECENTER_2F, 0 + +BaadonPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, BAADON_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BaadonPokecenter2F_Blocks:: +INCBIN "maps/BaadonPokecenter2F.blk" diff --git a/data/maps/objects/BaadonRoute1.asm b/data/maps/objects/BaadonRoute1.asm new file mode 100644 index 0000000..eddd672 --- /dev/null +++ b/data/maps/objects/BaadonRoute1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonRoute1.asm", ROMX + + map_attributes BaadonRoute1, BAADON_ROUTE_1, NORTH | SOUTH + connection north, Baadon, BAADON, 0, 0, 10 + connection south, West, WEST, -3, 2, 16 + +BaadonRoute1_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 12, 48, 3, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 407 + warp_event 13, 48, 4, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 407 + + db 0 ; bg events + + db 0 ; person events + +BaadonRoute1_Blocks:: +INCBIN "maps/BaadonRoute1.blk" diff --git a/data/maps/objects/BaadonRoute2.asm b/data/maps/objects/BaadonRoute2.asm new file mode 100644 index 0000000..93c9a9f --- /dev/null +++ b/data/maps/objects/BaadonRoute2.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonRoute2.asm", ROMX + + map_attributes BaadonRoute2, BAADON_ROUTE_2, WEST | EAST + connection west, Baadon, BAADON, 0, 0, 9 + connection east, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 12 + +BaadonRoute2_MapEvents:: + dw $4000 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +BaadonRoute2_Blocks:: +INCBIN "maps/BaadonRoute2.blk" diff --git a/data/maps/objects/BaadonRoute3.asm b/data/maps/objects/BaadonRoute3.asm new file mode 100644 index 0000000..06b491f --- /dev/null +++ b/data/maps/objects/BaadonRoute3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonRoute3.asm", ROMX + + map_attributes BaadonRoute3, BAADON_ROUTE_3, SOUTH | WEST + connection south, Route15, ROUTE_15, 0, 0, 13 + connection west, BaadonRoute2, BAADON_ROUTE_2, 0, 0, 9 + +BaadonRoute3_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 8, 30, 3, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 261 + warp_event 9, 30, 4, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 261 + + db 0 ; bg events + + db 0 ; person events + +BaadonRoute3_Blocks:: +INCBIN "maps/BaadonRoute3.blk" diff --git a/data/maps/objects/BaadonRouteGateNewtype.asm b/data/maps/objects/BaadonRouteGateNewtype.asm new file mode 100644 index 0000000..6fcbe21 --- /dev/null +++ b/data/maps/objects/BaadonRouteGateNewtype.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonRouteGateNewtype.asm", ROMX + + map_attributes BaadonRouteGateNewtype, BAADON_ROUTE_GATE_NEWTYPE, 0 + +BaadonRouteGateNewtype_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 4, 7, 1, ROUTE_15, wOverworldMapBlocks + 47 + warp_event 5, 7, 2, ROUTE_15, wOverworldMapBlocks + 47 + warp_event 4, 0, 1, BAADON_ROUTE_3, wOverworldMapBlocks + 14 + warp_event 5, 0, 2, BAADON_ROUTE_3, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 0 ; person events + +BaadonRouteGateNewtype_Blocks:: +INCBIN "maps/BaadonRouteGateNewtype.blk" diff --git a/data/maps/objects/BaadonRouteGateWest.asm b/data/maps/objects/BaadonRouteGateWest.asm new file mode 100644 index 0000000..7eac9a2 --- /dev/null +++ b/data/maps/objects/BaadonRouteGateWest.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonRouteGateWest.asm", ROMX + + map_attributes BaadonRouteGateWest, BAADON_ROUTE_GATE_WEST, 0 + +BaadonRouteGateWest_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 4, 7, 11, WEST, wOverworldMapBlocks + 47 + warp_event 5, 7, 12, WEST, wOverworldMapBlocks + 47 + warp_event 4, 0, 1, BAADON_ROUTE_1, wOverworldMapBlocks + 14 + warp_event 5, 0, 2, BAADON_ROUTE_1, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 0 ; person events + +BaadonRouteGateWest_Blocks:: +INCBIN "maps/BaadonRouteGateWest.blk" diff --git a/data/maps/objects/BaadonWallpaperHouse.asm b/data/maps/objects/BaadonWallpaperHouse.asm new file mode 100644 index 0000000..56e809c --- /dev/null +++ b/data/maps/objects/BaadonWallpaperHouse.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BaadonWallpaperHouse.asm", ROMX + + map_attributes BaadonWallpaperHouse, BAADON_WALLPAPER_HOUSE, 0 + +BaadonWallpaperHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 2, 7, 4, BAADON, wOverworldMapBlocks + 42 + warp_event 3, 7, 4, BAADON, wOverworldMapBlocks + 42 + + db 0 ; bg events + + db 0 ; person events + +BaadonWallpaperHouse_Blocks:: +INCBIN "maps/BaadonWallpaperHouse.blk" diff --git a/data/maps/objects/BullForest.asm b/data/maps/objects/BullForest.asm new file mode 100644 index 0000000..9c7c4f3 --- /dev/null +++ b/data/maps/objects/BullForest.asm @@ -0,0 +1,36 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullForest.asm", ROMX + + map_attributes BullForest, BULL_FOREST, NORTH | SOUTH | WEST + connection north, BullForestRoute3, BULL_FOREST_ROUTE_3, 5, 0, 10 + connection south, BullForestRoute2, BULL_FOREST_ROUTE_2, 5, 0, 10 + connection west, BullForestRoute1, BULL_FOREST_ROUTE_1, 9, 0, 9 + +BullForest_MapEvents:: + dw $4000 ; unknown + + db 8 ; warp events + warp_event 25, 6, 1, BULL_MART, wOverworldMapBlocks + 117 + warp_event 9, 9, 1, BULL_HOUSE_1, wOverworldMapBlocks + 135 + warp_event 27, 11, 1, BULL_HOUSE_2, wOverworldMapBlocks + 170 + warp_event 19, 13, 1, BULL_HOUSE_3, wOverworldMapBlocks + 192 + warp_event 13, 18, 1, BULL_POKECENTER_1F, wOverworldMapBlocks + 267 + warp_event 26, 21, 1, BULL_LEAGUE_1F, wOverworldMapBlocks + 300 + warp_event 27, 21, 2, BULL_LEAGUE_1F, wOverworldMapBlocks + 300 + warp_event 3, 22, 1, BULL_HOUSE_4, wOverworldMapBlocks + 314 + + db 3 ; bg events + bg_event 26, 6, 0, 1 + bg_event 2, 16, 0, 2 + bg_event 14, 18, 0, 3 + + db 5 ; person events + object_event 21, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 11, 12, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 16, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 20, 19, SPRITE_TEACHER, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 20, 29, SPRITE_BUG_CATCHER_BOY, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +BullForest_Blocks:: +INCBIN "maps/BullForest.blk" diff --git a/data/maps/objects/BullForestRoute1.asm b/data/maps/objects/BullForestRoute1.asm new file mode 100644 index 0000000..ad22484 --- /dev/null +++ b/data/maps/objects/BullForestRoute1.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullForestRoute1.asm", ROMX + + map_attributes BullForestRoute1, BULL_FOREST_ROUTE_1, SOUTH | EAST + connection south, Route18, ROUTE_18, 0, 0, 10 + connection east, BullForest, BULL_FOREST, -3, 6, 12 + +BullForestRoute1_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 8, 12, 3, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 222 + warp_event 9, 12, 4, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 222 + warp_event 9, 5, 1, BULL_FOREST_ROUTE_1_HOUSE, wOverworldMapBlocks + 98 + + db 0 ; bg events + + db 0 ; person events + +BullForestRoute1_Blocks:: +INCBIN "maps/BullForestRoute1.blk" diff --git a/data/maps/objects/BullForestRoute1House.asm b/data/maps/objects/BullForestRoute1House.asm new file mode 100644 index 0000000..e253222 --- /dev/null +++ b/data/maps/objects/BullForestRoute1House.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullForestRoute1House.asm", ROMX + + map_attributes BullForestRoute1House, BULL_FOREST_ROUTE_1_HOUSE, 0 + +BullForestRoute1House_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 3, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 47 + warp_event 5, 7, 3, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 1, 5, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BullForestRoute1House_Blocks:: +INCBIN "maps/BullForestRoute1House.blk" diff --git a/data/maps/objects/BullForestRoute2.asm b/data/maps/objects/BullForestRoute2.asm new file mode 100644 index 0000000..615d539 --- /dev/null +++ b/data/maps/objects/BullForestRoute2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullForestRoute2.asm", ROMX + + map_attributes BullForestRoute2, BULL_FOREST_ROUTE_2, NORTH | SOUTH + connection north, BullForest, BULL_FOREST, -3, 2, 16 + connection south, Stand, STAND, -3, 7, 13 + +BullForestRoute2_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 8, 48, 3, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 405 + warp_event 9, 48, 4, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 405 + + db 0 ; bg events + + db 0 ; person events + +BullForestRoute2_Blocks:: +INCBIN "maps/BullForestRoute2.blk" diff --git a/data/maps/objects/BullForestRoute3.asm b/data/maps/objects/BullForestRoute3.asm new file mode 100644 index 0000000..1db4c57 --- /dev/null +++ b/data/maps/objects/BullForestRoute3.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullForestRoute3.asm", ROMX + + map_attributes BullForestRoute3, BULL_FOREST_ROUTE_3, NORTH | SOUTH + connection north, North, NORTH, 0, 0, 10 + connection south, BullForest, BULL_FOREST, -3, 2, 16 + +BullForestRoute3_MapEvents:: + dw $4000 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +BullForestRoute3_Blocks:: +INCBIN "maps/BullForestRoute3.blk" diff --git a/data/maps/objects/BullForestRouteGateStand.asm b/data/maps/objects/BullForestRouteGateStand.asm new file mode 100644 index 0000000..ee252b2 --- /dev/null +++ b/data/maps/objects/BullForestRouteGateStand.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullForestRouteGateStand.asm", ROMX + + map_attributes BullForestRouteGateStand, BULL_FOREST_ROUTE_GATE_STAND, 0 + +BullForestRouteGateStand_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 4, 7, 9, STAND, wOverworldMapBlocks + 47 + warp_event 5, 7, 10, STAND, wOverworldMapBlocks + 47 + warp_event 4, 0, 1, BULL_FOREST_ROUTE_2, wOverworldMapBlocks + 14 + warp_event 5, 0, 2, BULL_FOREST_ROUTE_2, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 0 ; person events + +BullForestRouteGateStand_Blocks:: +INCBIN "maps/BullForestRouteGateStand.blk" diff --git a/data/maps/objects/BullHouse1.asm b/data/maps/objects/BullHouse1.asm new file mode 100644 index 0000000..430fea2 --- /dev/null +++ b/data/maps/objects/BullHouse1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullHouse1.asm", ROMX + + map_attributes BullHouse1, BULL_HOUSE_1, 0 + +BullHouse1_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 2, BULL_FOREST, wOverworldMapBlocks + 42 + warp_event 4, 7, 2, BULL_FOREST, wOverworldMapBlocks + 43 + + db 0 ; bg events + + db 1 ; person events + object_event 2, 3, SPRITE_KIKUKO, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BullHouse1_Blocks:: +INCBIN "maps/BullHouse1.blk" diff --git a/data/maps/objects/BullHouse2.asm b/data/maps/objects/BullHouse2.asm new file mode 100644 index 0000000..286b8e8 --- /dev/null +++ b/data/maps/objects/BullHouse2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullHouse2.asm", ROMX + + map_attributes BullHouse2, BULL_HOUSE_2, 0 + +BullHouse2_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 3, BULL_FOREST, wOverworldMapBlocks + 47 + warp_event 5, 7, 3, BULL_FOREST, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 8, 4, SPRITE_GRANNY, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + +BullHouse2_Blocks:: +INCBIN "maps/BullHouse2.blk" diff --git a/data/maps/objects/BullHouse3.asm b/data/maps/objects/BullHouse3.asm new file mode 100644 index 0000000..6979863 --- /dev/null +++ b/data/maps/objects/BullHouse3.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullHouse3.asm", ROMX + + map_attributes BullHouse3, BULL_HOUSE_3, 0 + +BullHouse3_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 4, BULL_FOREST, wOverworldMapBlocks + 47 + warp_event 5, 7, 4, BULL_FOREST, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BullHouse3_Blocks:: +INCBIN "maps/BullHouse3.blk" diff --git a/data/maps/objects/BullHouse4.asm b/data/maps/objects/BullHouse4.asm new file mode 100644 index 0000000..9bf3763 --- /dev/null +++ b/data/maps/objects/BullHouse4.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullHouse4.asm", ROMX + + map_attributes BullHouse4, BULL_HOUSE_4, 0 + +BullHouse4_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 8, BULL_FOREST, wOverworldMapBlocks + 47 + warp_event 5, 7, 8, BULL_FOREST, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 0 ; person events + +BullHouse4_Blocks:: +INCBIN "maps/BullHouse4.blk" diff --git a/data/maps/objects/BullLeague1F.asm b/data/maps/objects/BullLeague1F.asm new file mode 100644 index 0000000..f7e51d0 --- /dev/null +++ b/data/maps/objects/BullLeague1F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullLeague1F.asm", ROMX + + map_attributes BullLeague1F, BULL_LEAGUE_1F, 0 + +BullLeague1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 3, 15, 6, BULL_FOREST, wOverworldMapBlocks + 82 + warp_event 4, 15, 7, BULL_FOREST, wOverworldMapBlocks + 83 + warp_event 7, 1, 1, BULL_LEAGUE_2F, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 5 ; person events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +BullLeague1F_Blocks:: +INCBIN "maps/BullLeague1F.blk" diff --git a/data/maps/objects/BullLeague2F.asm b/data/maps/objects/BullLeague2F.asm new file mode 100644 index 0000000..cb825a1 --- /dev/null +++ b/data/maps/objects/BullLeague2F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullLeague2F.asm", ROMX + + map_attributes BullLeague2F, BULL_LEAGUE_2F, 0 + +BullLeague2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 7, 15, 3, BULL_LEAGUE_1F, wOverworldMapBlocks + 92 + + db 0 ; bg events + + db 5 ; person events + object_event 4, 4, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 9, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 9, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BullLeague2F_Blocks:: +INCBIN "maps/BullLeague2F.blk" diff --git a/data/maps/objects/BullMart.asm b/data/maps/objects/BullMart.asm new file mode 100644 index 0000000..14cbb05 --- /dev/null +++ b/data/maps/objects/BullMart.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullMart.asm", ROMX + + map_attributes BullMart, BULL_MART, 0 + +BullMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 1, BULL_FOREST, wOverworldMapBlocks + 59 + warp_event 5, 7, 1, BULL_FOREST, wOverworldMapBlocks + 59 + + db 0 ; bg events + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_FISHER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BullMart_Blocks:: +INCBIN "maps/BullMart.blk" diff --git a/data/maps/objects/BullPokecenter1F.asm b/data/maps/objects/BullPokecenter1F.asm new file mode 100644 index 0000000..ca32a16 --- /dev/null +++ b/data/maps/objects/BullPokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullPokecenter1F.asm", ROMX + + map_attributes BullPokecenter1F, BULL_POKECENTER_1F, 0 + +BullPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 5, BULL_FOREST, wOverworldMapBlocks + 59 + warp_event 6, 7, 5, BULL_FOREST, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, BULL_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BullPokecenter1F_Blocks:: +INCBIN "maps/BullPokecenter1F.blk" diff --git a/data/maps/objects/BullPokecenter2F.asm b/data/maps/objects/BullPokecenter2F.asm new file mode 100644 index 0000000..0fc3b4b --- /dev/null +++ b/data/maps/objects/BullPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BullPokecenter2F.asm", ROMX + + map_attributes BullPokecenter2F, BULL_POKECENTER_2F, 0 + +BullPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, BULL_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BullPokecenter2F_Blocks:: +INCBIN "maps/BullPokecenter2F.blk" diff --git a/data/maps/objects/CaveMinecarts1.asm b/data/maps/objects/CaveMinecarts1.asm new file mode 100644 index 0000000..922c9f2 --- /dev/null +++ b/data/maps/objects/CaveMinecarts1.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/CaveMinecarts1.asm", ROMX + + map_attributes CaveMinecarts1, CAVE_MINECARTS_1, 0 + +CaveMinecarts1_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +CaveMinecarts1_Blocks:: +INCBIN "maps/CaveMinecarts1.blk" diff --git a/data/maps/objects/CaveMinecarts2.asm b/data/maps/objects/CaveMinecarts2.asm new file mode 100644 index 0000000..b878892 --- /dev/null +++ b/data/maps/objects/CaveMinecarts2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/CaveMinecarts2.asm", ROMX + + map_attributes CaveMinecarts2, CAVE_MINECARTS_2, 0 + +CaveMinecarts2_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +CaveMinecarts2_Blocks:: +INCBIN "maps/CaveMinecarts2.blk" diff --git a/data/maps/objects/CaveMinecarts3.asm b/data/maps/objects/CaveMinecarts3.asm new file mode 100644 index 0000000..bae9ae6 --- /dev/null +++ b/data/maps/objects/CaveMinecarts3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/CaveMinecarts3.asm", ROMX + + map_attributes CaveMinecarts3, CAVE_MINECARTS_3, 0 + +CaveMinecarts3_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +CaveMinecarts3_Blocks:: +INCBIN "maps/CaveMinecarts3.blk" diff --git a/data/maps/objects/CaveMinecarts4.asm b/data/maps/objects/CaveMinecarts4.asm new file mode 100644 index 0000000..955d7a3 --- /dev/null +++ b/data/maps/objects/CaveMinecarts4.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/CaveMinecarts4.asm", ROMX + + map_attributes CaveMinecarts4, CAVE_MINECARTS_4, 0 + +CaveMinecarts4_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +CaveMinecarts4_Blocks:: +INCBIN "maps/CaveMinecarts4.blk" diff --git a/data/maps/objects/CaveMinecarts5.asm b/data/maps/objects/CaveMinecarts5.asm new file mode 100644 index 0000000..5e64a3d --- /dev/null +++ b/data/maps/objects/CaveMinecarts5.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/CaveMinecarts5.asm", ROMX + + map_attributes CaveMinecarts5, CAVE_MINECARTS_5, 0 + +CaveMinecarts5_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +CaveMinecarts5_Blocks:: +INCBIN "maps/CaveMinecarts5.blk" diff --git a/data/maps/objects/CaveMinecarts6.asm b/data/maps/objects/CaveMinecarts6.asm new file mode 100644 index 0000000..ca84386 --- /dev/null +++ b/data/maps/objects/CaveMinecarts6.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/CaveMinecarts6.asm", ROMX + + map_attributes CaveMinecarts6, CAVE_MINECARTS_6, 0 + +CaveMinecarts6_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +CaveMinecarts6_Blocks:: +INCBIN "maps/CaveMinecarts6.blk" diff --git a/data/maps/objects/CaveMinecarts7.asm b/data/maps/objects/CaveMinecarts7.asm new file mode 100644 index 0000000..222f0c2 --- /dev/null +++ b/data/maps/objects/CaveMinecarts7.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/CaveMinecarts7.asm", ROMX + + map_attributes CaveMinecarts7, CAVE_MINECARTS_7, 0 + +CaveMinecarts7_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +CaveMinecarts7_Blocks:: +INCBIN "maps/CaveMinecarts7.blk" diff --git a/data/maps/objects/Fonto.asm b/data/maps/objects/Fonto.asm new file mode 100644 index 0000000..4e9da3c --- /dev/null +++ b/data/maps/objects/Fonto.asm @@ -0,0 +1,34 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Fonto.asm", ROMX + + map_attributes Fonto, FONTO, NORTH | WEST | EAST + connection north, FontoRoute2, FONTO_ROUTE_2, 0, 0, 10 + connection west, FontoRoute1, FONTO_ROUTE_1, 0, 0, 9 + connection east, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9 + +Fonto_MapEvents:: + dw $4000 ; unknown + + db 5 ; warp events + warp_event 4, 3, 1, FONTO_ROCKET_HOUSE, wOverworldMapBlocks + 35 + warp_event 15, 4, 1, FONTO_MART, wOverworldMapBlocks + 56 + warp_event 3, 7, 1, FONTO_HOUSE, wOverworldMapBlocks + 66 + warp_event 3, 12, 1, FONTO_POKECENTER_1F, wOverworldMapBlocks + 114 + warp_event 16, 13, 1, FONTO_LAB, wOverworldMapBlocks + 121 + + db 5 ; bg events + bg_event 15, 4, 0, 1 + bg_event 14, 6, 0, 2 + bg_event 4, 12, 0, 3 + bg_event 6, 12, 0, 4 + bg_event 10, 12, 0, 5 + + db 4 ; person events + object_event 2, 4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_SIDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 16, 8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + +Fonto_Blocks:: +INCBIN "maps/Fonto.blk" diff --git a/data/maps/objects/FontoHouse.asm b/data/maps/objects/FontoHouse.asm new file mode 100644 index 0000000..05c8a5e --- /dev/null +++ b/data/maps/objects/FontoHouse.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoHouse.asm", ROMX + + map_attributes FontoHouse, FONTO_HOUSE, 0 + +FontoHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 3, FONTO, wOverworldMapBlocks + 47 + warp_event 5, 7, 3, FONTO, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 8, 4, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + +FontoHouse_Blocks:: +INCBIN "maps/FontoHouse.blk" diff --git a/data/maps/objects/FontoLab.asm b/data/maps/objects/FontoLab.asm new file mode 100644 index 0000000..59fa933 --- /dev/null +++ b/data/maps/objects/FontoLab.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoLab.asm", ROMX + + map_attributes FontoLab, FONTO_LAB, 0 + +FontoLab_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 5, FONTO, wOverworldMapBlocks + 46 + warp_event 4, 7, 5, FONTO, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 2 ; person events + object_event 2, 2, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 5, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +FontoLab_Blocks:: +INCBIN "maps/FontoLab.blk" diff --git a/data/maps/objects/FontoMart.asm b/data/maps/objects/FontoMart.asm new file mode 100644 index 0000000..3241f57 --- /dev/null +++ b/data/maps/objects/FontoMart.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoMart.asm", ROMX + + map_attributes FontoMart, FONTO_MART, 0 + +FontoMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 2, FONTO, wOverworldMapBlocks + 59 + warp_event 5, 7, 2, FONTO, wOverworldMapBlocks + 59 + + db 0 ; bg events + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +FontoMart_Blocks:: +INCBIN "maps/FontoMart.blk" diff --git a/data/maps/objects/FontoPokecenter1F.asm b/data/maps/objects/FontoPokecenter1F.asm new file mode 100644 index 0000000..aefac44 --- /dev/null +++ b/data/maps/objects/FontoPokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoPokecenter1F.asm", ROMX + + map_attributes FontoPokecenter1F, FONTO_POKECENTER_1F, 0 + +FontoPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 4, FONTO, wOverworldMapBlocks + 59 + warp_event 6, 7, 4, FONTO, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, FONTO_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +FontoPokecenter1F_Blocks:: +INCBIN "maps/FontoPokecenter1F.blk" diff --git a/data/maps/objects/FontoPokecenter2F.asm b/data/maps/objects/FontoPokecenter2F.asm new file mode 100644 index 0000000..025df9f --- /dev/null +++ b/data/maps/objects/FontoPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoPokecenter2F.asm", ROMX + + map_attributes FontoPokecenter2F, FONTO_POKECENTER_2F, 0 + +FontoPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, FONTO_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +FontoPokecenter2F_Blocks:: +INCBIN "maps/FontoPokecenter2F.blk" diff --git a/data/maps/objects/FontoRocketHouse.asm b/data/maps/objects/FontoRocketHouse.asm new file mode 100644 index 0000000..b97cb16 --- /dev/null +++ b/data/maps/objects/FontoRocketHouse.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoRocketHouse.asm", ROMX + + map_attributes FontoRocketHouse, FONTO_ROCKET_HOUSE, 0 + +FontoRocketHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 12, 7, 1, FONTO, wOverworldMapBlocks + 63 + warp_event 13, 7, 1, FONTO, wOverworldMapBlocks + 63 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 2, SPRITE_ROCKET_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 12, 2, SPRITE_POPPO, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +FontoRocketHouse_Blocks:: +INCBIN "maps/FontoRocketHouse.blk" diff --git a/data/maps/objects/FontoRoute1.asm b/data/maps/objects/FontoRoute1.asm new file mode 100644 index 0000000..6218d81 --- /dev/null +++ b/data/maps/objects/FontoRoute1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoRoute1.asm", ROMX + + map_attributes FontoRoute1, FONTO_ROUTE_1, WEST | EAST + connection west, South, SOUTH, 0, 0, 12 + connection east, Fonto, FONTO, 0, 0, 9 + +FontoRoute1_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 6, 9, 3, FONTO_ROUTE_GATE_1, wOverworldMapBlocks + 209 + + db 0 ; bg events + + db 0 ; person events + +FontoRoute1_Blocks:: +INCBIN "maps/FontoRoute1.blk" diff --git a/data/maps/objects/FontoRoute2.asm b/data/maps/objects/FontoRoute2.asm new file mode 100644 index 0000000..1c79180 --- /dev/null +++ b/data/maps/objects/FontoRoute2.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoRoute2.asm", ROMX + + map_attributes FontoRoute2, FONTO_ROUTE_2, SOUTH | WEST + connection south, Fonto, FONTO, 0, 0, 10 + connection west, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9 + +FontoRoute2_MapEvents:: + dw $4000 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +FontoRoute2_Blocks:: +INCBIN "maps/FontoRoute2.blk" diff --git a/data/maps/objects/FontoRoute3.asm b/data/maps/objects/FontoRoute3.asm new file mode 100644 index 0000000..36dc909 --- /dev/null +++ b/data/maps/objects/FontoRoute3.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoRoute3.asm", ROMX + + map_attributes FontoRoute3, FONTO_ROUTE_3, WEST | EAST + connection west, Fonto, FONTO, 0, 0, 9 + connection east, FontoRoute4, FONTO_ROUTE_4, 0, 0, 12 + +FontoRoute3_MapEvents:: + dw $4000 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +FontoRoute3_Blocks:: +INCBIN "maps/FontoRoute3.blk" diff --git a/data/maps/objects/FontoRoute4.asm b/data/maps/objects/FontoRoute4.asm new file mode 100644 index 0000000..bed27cb --- /dev/null +++ b/data/maps/objects/FontoRoute4.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoRoute4.asm", ROMX + + map_attributes FontoRoute4, FONTO_ROUTE_4, SOUTH | WEST + connection south, Baadon, BAADON, 0, 0, 10 + connection west, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9 + +FontoRoute4_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 8, 30, 3, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 261 + warp_event 9, 30, 4, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 261 + + db 0 ; bg events + + db 0 ; person events + +FontoRoute4_Blocks:: +INCBIN "maps/FontoRoute4.blk" diff --git a/data/maps/objects/FontoRoute5.asm b/data/maps/objects/FontoRoute5.asm new file mode 100644 index 0000000..441a773 --- /dev/null +++ b/data/maps/objects/FontoRoute5.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoRoute5.asm", ROMX + + map_attributes FontoRoute5, FONTO_ROUTE_5, SOUTH | EAST + connection south, South, SOUTH, -3, 7, 13 + connection east, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9 + +FontoRoute5_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 8, 30, 3, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 261 + warp_event 9, 30, 4, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 261 + + db 0 ; bg events + + db 0 ; person events + +FontoRoute5_Blocks:: +INCBIN "maps/FontoRoute5.blk" diff --git a/data/maps/objects/FontoRoute6.asm b/data/maps/objects/FontoRoute6.asm new file mode 100644 index 0000000..c3320e7 --- /dev/null +++ b/data/maps/objects/FontoRoute6.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoRoute6.asm", ROMX + + map_attributes FontoRoute6, FONTO_ROUTE_6, WEST | EAST + connection west, FontoRoute5, FONTO_ROUTE_5, 0, 0, 12 + connection east, FontoRoute2, FONTO_ROUTE_2, 0, 0, 12 + +FontoRoute6_MapEvents:: + dw $4000 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +FontoRoute6_Blocks:: +INCBIN "maps/FontoRoute6.blk" diff --git a/data/maps/objects/FontoRouteGate1.asm b/data/maps/objects/FontoRouteGate1.asm new file mode 100644 index 0000000..2ef0c71 --- /dev/null +++ b/data/maps/objects/FontoRouteGate1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoRouteGate1.asm", ROMX + + map_attributes FontoRouteGate1, FONTO_ROUTE_GATE_1, 0 + +FontoRouteGate1_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 0, 7, 7, SOUTH, wOverworldMapBlocks + 45 + warp_event 1, 7, 7, SOUTH, wOverworldMapBlocks + 45 + warp_event 8, 7, 1, FONTO_ROUTE_1, wOverworldMapBlocks + 49 + warp_event 9, 7, 1, FONTO_ROUTE_1, wOverworldMapBlocks + 49 + + db 0 ; bg events + + db 0 ; person events + +FontoRouteGate1_Blocks:: +INCBIN "maps/FontoRouteGate1.blk" diff --git a/data/maps/objects/FontoRouteGate2.asm b/data/maps/objects/FontoRouteGate2.asm new file mode 100644 index 0000000..bf69bf8 --- /dev/null +++ b/data/maps/objects/FontoRouteGate2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoRouteGate2.asm", ROMX + + map_attributes FontoRouteGate2, FONTO_ROUTE_GATE_2, 0 + +FontoRouteGate2_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 4, 7, 8, BAADON, wOverworldMapBlocks + 47 + warp_event 5, 7, 9, BAADON, wOverworldMapBlocks + 47 + warp_event 4, 0, 1, FONTO_ROUTE_4, wOverworldMapBlocks + 14 + warp_event 5, 0, 2, FONTO_ROUTE_4, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 0 ; person events + +FontoRouteGate2_Blocks:: +INCBIN "maps/FontoRouteGate2.blk" diff --git a/data/maps/objects/FontoRouteGate3.asm b/data/maps/objects/FontoRouteGate3.asm new file mode 100644 index 0000000..18af188 --- /dev/null +++ b/data/maps/objects/FontoRouteGate3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontoRouteGate3.asm", ROMX + + map_attributes FontoRouteGate3, FONTO_ROUTE_GATE_3, 0 + +FontoRouteGate3_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 4, 7, 5, SOUTH, wOverworldMapBlocks + 47 + warp_event 5, 7, 6, SOUTH, wOverworldMapBlocks + 47 + warp_event 4, 0, 1, FONTO_ROUTE_5, wOverworldMapBlocks + 14 + warp_event 5, 0, 2, FONTO_ROUTE_5, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 0 ; person events + +FontoRouteGate3_Blocks:: +INCBIN "maps/FontoRouteGate3.blk" diff --git a/data/maps/objects/Haiteku.asm b/data/maps/objects/Haiteku.asm new file mode 100644 index 0000000..2205ced --- /dev/null +++ b/data/maps/objects/Haiteku.asm @@ -0,0 +1,40 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Haiteku.asm", ROMX + + map_attributes Haiteku, HAITEKU, WEST + connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0, 0, 9 + +Haiteku_MapEvents:: + dw $4000 ; unknown + + db 9 ; warp events + warp_event 31, 10, 1, HAITEKU_POKECENTER_1F, wOverworldMapBlocks + 172 + warp_event 10, 11, 1, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 162 + warp_event 11, 11, 2, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 162 + warp_event 31, 16, 1, HAITEKU_MART, wOverworldMapBlocks + 250 + warp_event 7, 17, 1, HAITEKU_HOUSE_1, wOverworldMapBlocks + 238 + warp_event 15, 17, 1, HAITEKU_HOUSE_2, wOverworldMapBlocks + 242 + warp_event 33, 20, 1, HAITEKU_IMPOSTER_OAK_HOUSE, wOverworldMapBlocks + 303 + warp_event 6, 27, 1, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 368 + warp_event 7, 27, 2, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 368 + + db 8 ; bg events + bg_event 24, 7, 0, 1 + bg_event 12, 12, 0, 2 + bg_event 32, 10, 0, 3 + bg_event 10, 17, 0, 4 + bg_event 32, 16, 0, 5 + bg_event 10, 27, 0, 6 + bg_event 30, 25, 0, 7 + bg_event 24, 28, 0, 8 + + db 5 ; person events + object_event 22, 15, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 23, 14, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 23, 24, SPRITE_SAILOR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 26, 10, SPRITE_SAILOR, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 14, SPRITE_GENTLEMAN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Haiteku_Blocks:: +INCBIN "maps/Haiteku.blk" diff --git a/data/maps/objects/HaitekuAquarium1F.asm b/data/maps/objects/HaitekuAquarium1F.asm new file mode 100644 index 0000000..5b7a1de --- /dev/null +++ b/data/maps/objects/HaitekuAquarium1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuAquarium1F.asm", ROMX + + map_attributes HaitekuAquarium1F, HAITEKU_AQUARIUM_1F, 0 + +HaitekuAquarium1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 12, 7, 8, HAITEKU, wOverworldMapBlocks + 63 + warp_event 13, 7, 9, HAITEKU, wOverworldMapBlocks + 63 + warp_event 0, 7, 1, HAITEKU_AQUARIUM_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 15, 5, SPRITE_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 12, 2, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 5, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + +HaitekuAquarium1F_Blocks:: +INCBIN "maps/HaitekuAquarium1F.blk" diff --git a/data/maps/objects/HaitekuAquarium2F.asm b/data/maps/objects/HaitekuAquarium2F.asm new file mode 100644 index 0000000..61a377d --- /dev/null +++ b/data/maps/objects/HaitekuAquarium2F.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuAquarium2F.asm", ROMX + + map_attributes HaitekuAquarium2F, HAITEKU_AQUARIUM_2F, 0 + +HaitekuAquarium2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 2 ; person events + object_event 7, 6, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 4, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HaitekuAquarium2F_Blocks:: +INCBIN "maps/HaitekuAquarium2F.blk" diff --git a/data/maps/objects/HaitekuHouse1.asm b/data/maps/objects/HaitekuHouse1.asm new file mode 100644 index 0000000..d359c1c --- /dev/null +++ b/data/maps/objects/HaitekuHouse1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuHouse1.asm", ROMX + + map_attributes HaitekuHouse1, HAITEKU_HOUSE_1, 0 + +HaitekuHouse1_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 5, HAITEKU, wOverworldMapBlocks + 47 + warp_event 5, 7, 5, HAITEKU, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 7, 3, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HaitekuHouse1_Blocks:: +INCBIN "maps/HaitekuHouse1.blk" diff --git a/data/maps/objects/HaitekuHouse2.asm b/data/maps/objects/HaitekuHouse2.asm new file mode 100644 index 0000000..e0df087 --- /dev/null +++ b/data/maps/objects/HaitekuHouse2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuHouse2.asm", ROMX + + map_attributes HaitekuHouse2, HAITEKU_HOUSE_2, 0 + +HaitekuHouse2_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 6, HAITEKU, wOverworldMapBlocks + 47 + warp_event 5, 7, 6, HAITEKU, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 7, 3, SPRITE_SAILOR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HaitekuHouse2_Blocks:: +INCBIN "maps/HaitekuHouse2.blk" diff --git a/data/maps/objects/HaitekuImposterOakHouse.asm b/data/maps/objects/HaitekuImposterOakHouse.asm new file mode 100644 index 0000000..87ce9b3 --- /dev/null +++ b/data/maps/objects/HaitekuImposterOakHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuImposterOakHouse.asm", ROMX + + map_attributes HaitekuImposterOakHouse, HAITEKU_IMPOSTER_OAK_HOUSE, 0 + +HaitekuImposterOakHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 7, HAITEKU, wOverworldMapBlocks + 47 + warp_event 5, 7, 7, HAITEKU, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 2 ; person events + object_event 7, 3, SPRITE_EVIL_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 2, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HaitekuImposterOakHouse_Blocks:: +INCBIN "maps/HaitekuImposterOakHouse.blk" diff --git a/data/maps/objects/HaitekuLeague1F.asm b/data/maps/objects/HaitekuLeague1F.asm new file mode 100644 index 0000000..c00342d --- /dev/null +++ b/data/maps/objects/HaitekuLeague1F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuLeague1F.asm", ROMX + + map_attributes HaitekuLeague1F, HAITEKU_LEAGUE_1F, 0 + +HaitekuLeague1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 3, 15, 2, HAITEKU, wOverworldMapBlocks + 82 + warp_event 4, 15, 3, HAITEKU, wOverworldMapBlocks + 83 + warp_event 7, 1, 1, HAITEKU_LEAGUE_2F, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 5 ; person events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +HaitekuLeague1F_Blocks:: +INCBIN "maps/HaitekuLeague1F.blk" diff --git a/data/maps/objects/HaitekuLeague2F.asm b/data/maps/objects/HaitekuLeague2F.asm new file mode 100644 index 0000000..5eadc64 --- /dev/null +++ b/data/maps/objects/HaitekuLeague2F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuLeague2F.asm", ROMX + + map_attributes HaitekuLeague2F, HAITEKU_LEAGUE_2F, 0 + +HaitekuLeague2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 7, 15, 3, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 92 + + db 0 ; bg events + + db 5 ; person events + object_event 4, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 12, SPRITE_COOLTRAINER_F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 10, SPRITE_24, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 7, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HaitekuLeague2F_Blocks:: +INCBIN "maps/HaitekuLeague2F.blk" diff --git a/data/maps/objects/HaitekuMart.asm b/data/maps/objects/HaitekuMart.asm new file mode 100644 index 0000000..5570978 --- /dev/null +++ b/data/maps/objects/HaitekuMart.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuMart.asm", ROMX + + map_attributes HaitekuMart, HAITEKU_MART, 0 + +HaitekuMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 4, HAITEKU, wOverworldMapBlocks + 51 + warp_event 5, 7, 4, HAITEKU, wOverworldMapBlocks + 51 + + db 0 ; bg events + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HaitekuMart_Blocks:: +INCBIN "maps/HaitekuMart.blk" diff --git a/data/maps/objects/HaitekuPokecenter1F.asm b/data/maps/objects/HaitekuPokecenter1F.asm new file mode 100644 index 0000000..e17a4aa --- /dev/null +++ b/data/maps/objects/HaitekuPokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuPokecenter1F.asm", ROMX + + map_attributes HaitekuPokecenter1F, HAITEKU_POKECENTER_1F, 0 + +HaitekuPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 1, HAITEKU, wOverworldMapBlocks + 59 + warp_event 6, 7, 1, HAITEKU, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, HAITEKU_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HaitekuPokecenter1F_Blocks:: +INCBIN "maps/HaitekuPokecenter1F.blk" diff --git a/data/maps/objects/HaitekuPokecenter2F.asm b/data/maps/objects/HaitekuPokecenter2F.asm new file mode 100644 index 0000000..ef3abc9 --- /dev/null +++ b/data/maps/objects/HaitekuPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuPokecenter2F.asm", ROMX + + map_attributes HaitekuPokecenter2F, HAITEKU_POKECENTER_2F, 0 + +HaitekuPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, HAITEKU_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HaitekuPokecenter2F_Blocks:: +INCBIN "maps/HaitekuPokecenter2F.blk" diff --git a/data/maps/objects/HaitekuWestRoute.asm b/data/maps/objects/HaitekuWestRoute.asm new file mode 100644 index 0000000..6facf73 --- /dev/null +++ b/data/maps/objects/HaitekuWestRoute.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuWestRoute.asm", ROMX + + map_attributes HaitekuWestRoute, HAITEKU_WEST_ROUTE, WEST | EAST + connection west, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, -3, 15, 12 + connection east, Haiteku, HAITEKU, 0, 0, 12 + +HaitekuWestRoute_MapEvents:: + dw $4000 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +HaitekuWestRoute_Blocks:: +INCBIN "maps/HaitekuWestRoute.blk" diff --git a/data/maps/objects/HaitekuWestRouteGate.asm b/data/maps/objects/HaitekuWestRouteGate.asm new file mode 100644 index 0000000..77774c2 --- /dev/null +++ b/data/maps/objects/HaitekuWestRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuWestRouteGate.asm", ROMX + + map_attributes HaitekuWestRouteGate, HAITEKU_WEST_ROUTE_GATE, 0 + +HaitekuWestRouteGate_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 4, 7, 1, HAITEKU_WEST_ROUTE_OCEAN, wOverworldMapBlocks + 47 + warp_event 5, 7, 2, HAITEKU_WEST_ROUTE_OCEAN, wOverworldMapBlocks + 47 + warp_event 4, 0, 8, SOUTH, wOverworldMapBlocks + 14 + warp_event 5, 0, 9, SOUTH, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 0 ; person events + +HaitekuWestRouteGate_Blocks:: +INCBIN "maps/HaitekuWestRouteGate.blk" diff --git a/data/maps/objects/HaitekuWestRouteOcean.asm b/data/maps/objects/HaitekuWestRouteOcean.asm new file mode 100644 index 0000000..9a4ab79 --- /dev/null +++ b/data/maps/objects/HaitekuWestRouteOcean.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HaitekuWestRouteOcean.asm", ROMX + + map_attributes HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, NORTH | EAST + connection north, South, SOUTH, -3, 7, 13 + connection east, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 18, 0, 9 + +HaitekuWestRouteOcean_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 10, 9, 1, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 86 + warp_event 11, 9, 2, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 86 + + db 0 ; bg events + + db 0 ; person events + +HaitekuWestRouteOcean_Blocks:: +INCBIN "maps/HaitekuWestRouteOcean.blk" diff --git a/data/maps/objects/Kanto.asm b/data/maps/objects/Kanto.asm new file mode 100644 index 0000000..60ddd71 --- /dev/null +++ b/data/maps/objects/Kanto.asm @@ -0,0 +1,61 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Kanto.asm", ROMX + + map_attributes Kanto, KANTO, WEST | EAST + connection west, RouteSilentEast, ROUTE_SILENT_EAST, 9, 0, 9 + connection east, KantoEastRoute, KANTO_EAST_ROUTE, 9, 0, 9 + +Kanto_MapEvents:: + dw $4000 ; unknown + + db 30 ; warp events + warp_event 40, 3, 1, KANTO_CERULEAN_HOUSE, wOverworldMapBlocks + 93 + warp_event 13, 4, 1, KANTO_POKECENTER_1F, wOverworldMapBlocks + 115 + warp_event 4, 5, 1, KANTO_LEAGUE_1F, wOverworldMapBlocks + 111 + warp_event 5, 5, 2, KANTO_LEAGUE_1F, wOverworldMapBlocks + 111 + warp_event 51, 11, 1, KANTO_LAVENDER_HOUSE, wOverworldMapBlocks + 242 + warp_event 14, 17, 1, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 332 + warp_event 15, 17, 1, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 332 + warp_event 3, 18, 1, KANTO_MART, wOverworldMapBlocks + 362 + warp_event 22, 19, 1, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 372 + warp_event 23, 19, 2, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 372 + warp_event 30, 19, 1, KANTO_SILPH_CO, wOverworldMapBlocks + 376 + warp_event 31, 19, 2, KANTO_SILPH_CO, wOverworldMapBlocks + 376 + warp_event 16, 23, 1, KANTO_VIRIDIAN_HOUSE, wOverworldMapBlocks + 441 + warp_event 29, 23, 1, KANTO_GAME_CORNER, wOverworldMapBlocks + 447 + warp_event 34, 23, 1, KANTO_GAME_CORNER_PRIZES, wOverworldMapBlocks + 450 + warp_event 40, 23, 1, KANTO_DINER, wOverworldMapBlocks + 453 + warp_event 52, 23, 1, KANTO_SCHOOL, wOverworldMapBlocks + 459 + warp_event 53, 23, 2, KANTO_SCHOOL, wOverworldMapBlocks + 459 + warp_event 38, 29, 1, KANTO_HOSPITAL, wOverworldMapBlocks + 560 + warp_event 49, 30, 1, KANTO_POKECENTER_2_1F, wOverworldMapBlocks + 601 + warp_event 5, 38, 1, KANTO_REDS_HOUSE, wOverworldMapBlocks + 723 + warp_event 13, 38, 1, KANTO_GREENS_HOUSE_1F, wOverworldMapBlocks + 727 + warp_event 39, 38, 1, KANTO_ELDERS_HOUSE, wOverworldMapBlocks + 740 + warp_event 12, 43, 1, KANTO_OAKS_LAB, wOverworldMapBlocks + 799 + warp_event 13, 43, 2, KANTO_OAKS_LAB, wOverworldMapBlocks + 799 + warp_event 52, 45, 1, KANTO_LEAGUE_2_1F, wOverworldMapBlocks + 855 + warp_event 53, 45, 2, KANTO_LEAGUE_2_1F, wOverworldMapBlocks + 855 + warp_event 45, 46, 1, KANTO_FISHING_GURU, wOverworldMapBlocks + 887 + warp_event 6, 27, 3, ROUTE_SILENT_EAST_GATE, wOverworldMapBlocks + 508 + warp_event 21, 13, 5, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 263 + + db 12 ; bg events + bg_event 14, 4, 0, 1 + bg_event 42, 4, 0, 2 + bg_event 54, 8, 0, 3 + bg_event 4, 18, 0, 4 + bg_event 18, 18, 0, 5 + bg_event 26, 19, 0, 6 + bg_event 46, 18, 0, 7 + bg_event 8, 38, 0, 8 + bg_event 16, 38, 0, 9 + bg_event 6, 41, 0, 10 + bg_event 12, 45, 0, 11 + bg_event 50, 30, 0, 12 + + db 0 ; person events + +Kanto_Blocks:: +INCBIN "maps/Kanto.blk" diff --git a/data/maps/objects/KantoCeladonElevator.asm b/data/maps/objects/KantoCeladonElevator.asm new file mode 100644 index 0000000..391ba9e --- /dev/null +++ b/data/maps/objects/KantoCeladonElevator.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoCeladonElevator.asm", ROMX + + map_attributes KantoCeladonElevator, KANTO_CELADON_ELEVATOR, 0 + +KantoCeladonElevator_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 1, 3, 4, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 17 + warp_event 2, 3, 4, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 18 + + db 0 ; bg events + + db 0 ; person events + +KantoCeladonElevator_Blocks:: +INCBIN "maps/KantoCeladonElevator.blk" diff --git a/data/maps/objects/KantoCeladonMart1F.asm b/data/maps/objects/KantoCeladonMart1F.asm new file mode 100644 index 0000000..e97c1a2 --- /dev/null +++ b/data/maps/objects/KantoCeladonMart1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoCeladonMart1F.asm", ROMX + + map_attributes KantoCeladonMart1F, KANTO_CELADON_MART_1F, 0 + +KantoCeladonMart1F_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 13, 7, 6, KANTO, wOverworldMapBlocks + 63 + warp_event 14, 7, 7, KANTO, wOverworldMapBlocks + 64 + warp_event 15, 0, 2, KANTO_CELADON_MART_2F, wOverworldMapBlocks + 22 + warp_event 2, 0, 2, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 + + db 0 ; bg events + + db 1 ; person events + object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoCeladonMart1F_Blocks:: +INCBIN "maps/KantoCeladonMart1F.blk" diff --git a/data/maps/objects/KantoCeladonMart2F.asm b/data/maps/objects/KantoCeladonMart2F.asm new file mode 100644 index 0000000..306e463 --- /dev/null +++ b/data/maps/objects/KantoCeladonMart2F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoCeladonMart2F.asm", ROMX + + map_attributes KantoCeladonMart2F, KANTO_CELADON_MART_2F, 0 + +KantoCeladonMart2F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 12, 0, 1, KANTO_CELADON_MART_3F, wOverworldMapBlocks + 21 + warp_event 15, 0, 3, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 22 + warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 + + db 0 ; bg events + + db 2 ; person events + object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 5, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoCeladonMart2F_Blocks:: +INCBIN "maps/KantoCeladonMart2F.blk" diff --git a/data/maps/objects/KantoCeladonMart3F.asm b/data/maps/objects/KantoCeladonMart3F.asm new file mode 100644 index 0000000..86ed78e --- /dev/null +++ b/data/maps/objects/KantoCeladonMart3F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoCeladonMart3F.asm", ROMX + + map_attributes KantoCeladonMart3F, KANTO_CELADON_MART_3F, 0 + +KantoCeladonMart3F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 12, 0, 1, KANTO_CELADON_MART_2F, wOverworldMapBlocks + 21 + warp_event 15, 0, 2, KANTO_CELADON_MART_4F, wOverworldMapBlocks + 22 + warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 + + db 0 ; bg events + + db 2 ; person events + object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 5, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoCeladonMart3F_Blocks:: +INCBIN "maps/KantoCeladonMart3F.blk" diff --git a/data/maps/objects/KantoCeladonMart4F.asm b/data/maps/objects/KantoCeladonMart4F.asm new file mode 100644 index 0000000..db1c820 --- /dev/null +++ b/data/maps/objects/KantoCeladonMart4F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoCeladonMart4F.asm", ROMX + + map_attributes KantoCeladonMart4F, KANTO_CELADON_MART_4F, 0 + +KantoCeladonMart4F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 12, 0, 1, KANTO_CELADON_MART_5F, wOverworldMapBlocks + 21 + warp_event 15, 0, 2, KANTO_CELADON_MART_3F, wOverworldMapBlocks + 22 + warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 + + db 0 ; bg events + + db 3 ; person events + object_event 14, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoCeladonMart4F_Blocks:: +INCBIN "maps/KantoCeladonMart4F.blk" diff --git a/data/maps/objects/KantoCeladonMart5F.asm b/data/maps/objects/KantoCeladonMart5F.asm new file mode 100644 index 0000000..b783876 --- /dev/null +++ b/data/maps/objects/KantoCeladonMart5F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoCeladonMart5F.asm", ROMX + + map_attributes KantoCeladonMart5F, KANTO_CELADON_MART_5F, 0 + +KantoCeladonMart5F_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 13, 0, 1, KANTO_CELADON_MART_4F, wOverworldMapBlocks + 21 + warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 + + db 0 ; bg events + + db 3 ; person events + object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 3, SPRITE_SIDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoCeladonMart5F_Blocks:: +INCBIN "maps/KantoCeladonMart5F.blk" diff --git a/data/maps/objects/KantoCeruleanHouse.asm b/data/maps/objects/KantoCeruleanHouse.asm new file mode 100644 index 0000000..93d6c59 --- /dev/null +++ b/data/maps/objects/KantoCeruleanHouse.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoCeruleanHouse.asm", ROMX + + map_attributes KantoCeruleanHouse, KANTO_CERULEAN_HOUSE, 0 + +KantoCeruleanHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 1, KANTO, wOverworldMapBlocks + 47 + warp_event 5, 7, 1, KANTO, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 3, 3, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoCeruleanHouse_Blocks:: +INCBIN "maps/KantoCeruleanHouse.blk" diff --git a/data/maps/objects/KantoDiner.asm b/data/maps/objects/KantoDiner.asm new file mode 100644 index 0000000..b161d29 --- /dev/null +++ b/data/maps/objects/KantoDiner.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoDiner.asm", ROMX + + map_attributes KantoDiner, KANTO_DINER, 0 + +KantoDiner_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 16, KANTO, wOverworldMapBlocks + 47 + warp_event 5, 7, 16, KANTO, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 0 ; person events + +KantoDiner_Blocks:: +INCBIN "maps/KantoDiner.blk" diff --git a/data/maps/objects/KantoEastRoute.asm b/data/maps/objects/KantoEastRoute.asm new file mode 100644 index 0000000..00bf8f2 --- /dev/null +++ b/data/maps/objects/KantoEastRoute.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoEastRoute.asm", ROMX + + map_attributes KantoEastRoute, KANTO_EAST_ROUTE, NORTH | WEST + connection north, StandRoute, STAND_ROUTE, 10, 0, 10 + connection west, Kanto, KANTO, -3, 6, 15 + +KantoEastRoute_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 28, 5, 1, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 93 + warp_event 29, 5, 2, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 93 + + db 0 ; bg events + + db 0 ; person events + +KantoEastRoute_Blocks:: +INCBIN "maps/KantoEastRoute.blk" diff --git a/data/maps/objects/KantoEldersHouse.asm b/data/maps/objects/KantoEldersHouse.asm new file mode 100644 index 0000000..7ea0b94 --- /dev/null +++ b/data/maps/objects/KantoEldersHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoEldersHouse.asm", ROMX + + map_attributes KantoEldersHouse, KANTO_ELDERS_HOUSE, 0 + +KantoEldersHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 23, KANTO, wOverworldMapBlocks + 47 + warp_event 5, 7, 23, KANTO, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 2 ; person events + object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_GRANNY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoEldersHouse_Blocks:: +INCBIN "maps/KantoEldersHouse.blk" diff --git a/data/maps/objects/KantoFishingGuru.asm b/data/maps/objects/KantoFishingGuru.asm new file mode 100644 index 0000000..a5a2312 --- /dev/null +++ b/data/maps/objects/KantoFishingGuru.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoFishingGuru.asm", ROMX + + map_attributes KantoFishingGuru, KANTO_FISHING_GURU, 0 + +KantoFishingGuru_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 28, KANTO, wOverworldMapBlocks + 46 + warp_event 4, 7, 28, KANTO, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 4, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoFishingGuru_Blocks:: +INCBIN "maps/KantoFishingGuru.blk" diff --git a/data/maps/objects/KantoGameCorner.asm b/data/maps/objects/KantoGameCorner.asm new file mode 100644 index 0000000..424a77a --- /dev/null +++ b/data/maps/objects/KantoGameCorner.asm @@ -0,0 +1,31 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoGameCorner.asm", ROMX + + map_attributes KantoGameCorner, KANTO_GAME_CORNER, 0 + +KantoGameCorner_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 8, 13, 14, KANTO, wOverworldMapBlocks + 117 + warp_event 9, 13, 14, KANTO, wOverworldMapBlocks + 117 + warp_event 10, 13, 14, KANTO, wOverworldMapBlocks + 118 + warp_event 11, 13, 14, KANTO, wOverworldMapBlocks + 118 + + db 0 ; bg events + + db 10 ; person events + object_event 3, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 6, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 7, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 8, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 11, 6, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 11, 8, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_FISHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 17, 9, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoGameCorner_Blocks:: +INCBIN "maps/KantoGameCorner.blk" diff --git a/data/maps/objects/KantoGameCornerPrizes.asm b/data/maps/objects/KantoGameCornerPrizes.asm new file mode 100644 index 0000000..b21ca78 --- /dev/null +++ b/data/maps/objects/KantoGameCornerPrizes.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoGameCornerPrizes.asm", ROMX + + map_attributes KantoGameCornerPrizes, KANTO_GAME_CORNER_PRIZES, 0 + +KantoGameCornerPrizes_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 15, KANTO, wOverworldMapBlocks + 47 + warp_event 5, 7, 15, KANTO, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 3 ; person events + object_event 2, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoGameCornerPrizes_Blocks:: +INCBIN "maps/KantoGameCornerPrizes.blk" diff --git a/data/maps/objects/KantoGamefreakHQ1.asm b/data/maps/objects/KantoGamefreakHQ1.asm new file mode 100644 index 0000000..2964f40 --- /dev/null +++ b/data/maps/objects/KantoGamefreakHQ1.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoGamefreakHQ1.asm", ROMX + + map_attributes KantoGamefreakHQ1, KANTO_GAMEFREAK_HQ_1, 0 + +KantoGamefreakHQ1_MapEvents:: + dw $4000 ; unknown + + db 5 ; warp events + warp_event 4, 11, 9, KANTO, wOverworldMapBlocks + 63 + warp_event 5, 11, 10, KANTO, wOverworldMapBlocks + 63 + warp_event 7, 1, 2, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 14 + warp_event 2, 1, 3, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 12 + warp_event 4, 0, 30, KANTO, wOverworldMapBlocks + 13 + + db 0 ; bg events + + db 4 ; person events + object_event 1, 5, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 5, SPRITE_SIDON, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 8, SPRITE_PIPPI, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 7, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoGamefreakHQ1_Blocks:: +INCBIN "maps/KantoGamefreakHQ1.blk" diff --git a/data/maps/objects/KantoGamefreakHQ2.asm b/data/maps/objects/KantoGamefreakHQ2.asm new file mode 100644 index 0000000..f419688 --- /dev/null +++ b/data/maps/objects/KantoGamefreakHQ2.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoGamefreakHQ2.asm", ROMX + + map_attributes KantoGamefreakHQ2, KANTO_GAMEFREAK_HQ_2, 0 + +KantoGamefreakHQ2_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 6, 1, 1, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 14 + warp_event 7, 1, 3, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 14 + warp_event 2, 1, 4, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 12 + warp_event 4, 1, 4, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 13 + + db 0 ; bg events + + db 1 ; person events + object_event 2, 4, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoGamefreakHQ2_Blocks:: +INCBIN "maps/KantoGamefreakHQ2.blk" diff --git a/data/maps/objects/KantoGamefreakHQ3.asm b/data/maps/objects/KantoGamefreakHQ3.asm new file mode 100644 index 0000000..4e36ec7 --- /dev/null +++ b/data/maps/objects/KantoGamefreakHQ3.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoGamefreakHQ3.asm", ROMX + + map_attributes KantoGamefreakHQ3, KANTO_GAMEFREAK_HQ_3, 0 + +KantoGamefreakHQ3_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 6, 1, 1, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 14 + warp_event 7, 1, 2, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 14 + warp_event 2, 1, 3, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 12 + warp_event 4, 1, 4, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 13 + + db 0 ; bg events + + db 3 ; person events + object_event 0, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 7, SPRITE_BURGLAR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 7, SPRITE_FISHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoGamefreakHQ3_Blocks:: +INCBIN "maps/KantoGamefreakHQ3.blk" diff --git a/data/maps/objects/KantoGamefreakHQ4.asm b/data/maps/objects/KantoGamefreakHQ4.asm new file mode 100644 index 0000000..fc1ee0f --- /dev/null +++ b/data/maps/objects/KantoGamefreakHQ4.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoGamefreakHQ4.asm", ROMX + + map_attributes KantoGamefreakHQ4, KANTO_GAMEFREAK_HQ_4, 0 + +KantoGamefreakHQ4_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 2, 7, 1, KANTO_GAMEFREAK_HQ_5, wOverworldMapBlocks + 42 + warp_event 6, 1, 2, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 14 + warp_event 2, 1, 3, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 12 + + db 0 ; bg events + + db 0 ; person events + +KantoGamefreakHQ4_Blocks:: +INCBIN "maps/KantoGamefreakHQ4.blk" diff --git a/data/maps/objects/KantoGamefreakHQ5.asm b/data/maps/objects/KantoGamefreakHQ5.asm new file mode 100644 index 0000000..96d02ca --- /dev/null +++ b/data/maps/objects/KantoGamefreakHQ5.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoGamefreakHQ5.asm", ROMX + + map_attributes KantoGamefreakHQ5, KANTO_GAMEFREAK_HQ_5, 0 + +KantoGamefreakHQ5_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 1, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 42 + warp_event 4, 7, 1, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 43 + + db 0 ; bg events + + db 0 ; person events + +KantoGamefreakHQ5_Blocks:: +INCBIN "maps/KantoGamefreakHQ5.blk" diff --git a/data/maps/objects/KantoGreensHouse1F.asm b/data/maps/objects/KantoGreensHouse1F.asm new file mode 100644 index 0000000..d6600b1 --- /dev/null +++ b/data/maps/objects/KantoGreensHouse1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoGreensHouse1F.asm", ROMX + + map_attributes KantoGreensHouse1F, KANTO_GREENS_HOUSE_1F, 0 + +KantoGreensHouse1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 2, 7, 22, KANTO, wOverworldMapBlocks + 42 + warp_event 3, 7, 22, KANTO, wOverworldMapBlocks + 42 + warp_event 7, 1, 1, KANTO_GREENS_HOUSE_2F, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 1 ; person events + object_event 5, 3, SPRITE_0F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoGreensHouse1F_Blocks:: +INCBIN "maps/KantoGreensHouse1F.blk" diff --git a/data/maps/objects/KantoGreensHouse2F.asm b/data/maps/objects/KantoGreensHouse2F.asm new file mode 100644 index 0000000..a534362 --- /dev/null +++ b/data/maps/objects/KantoGreensHouse2F.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoGreensHouse2F.asm", ROMX + + map_attributes KantoGreensHouse2F, KANTO_GREENS_HOUSE_2F, 0 + +KantoGreensHouse2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 7, 1, 3, KANTO_GREENS_HOUSE_1F, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 0 ; person events + +KantoGreensHouse2F_Blocks:: +INCBIN "maps/KantoGreensHouse2F.blk" diff --git a/data/maps/objects/KantoHospital.asm b/data/maps/objects/KantoHospital.asm new file mode 100644 index 0000000..252b56b --- /dev/null +++ b/data/maps/objects/KantoHospital.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoHospital.asm", ROMX + + map_attributes KantoHospital, KANTO_HOSPITAL, 0 + +KantoHospital_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 1, 7, 19, KANTO, wOverworldMapBlocks + 57 + warp_event 2, 7, 19, KANTO, wOverworldMapBlocks + 58 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 6, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 12, 6, SPRITE_GIRL, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoHospital_Blocks:: +INCBIN "maps/KantoHospital.blk" diff --git a/data/maps/objects/KantoLavenderHouse.asm b/data/maps/objects/KantoLavenderHouse.asm new file mode 100644 index 0000000..e74f072 --- /dev/null +++ b/data/maps/objects/KantoLavenderHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoLavenderHouse.asm", ROMX + + map_attributes KantoLavenderHouse, KANTO_LAVENDER_HOUSE, 0 + +KantoLavenderHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 5, KANTO, wOverworldMapBlocks + 47 + warp_event 5, 7, 5, KANTO, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 2 ; person events + object_event 7, 3, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_POKEFAN_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoLavenderHouse_Blocks:: +INCBIN "maps/KantoLavenderHouse.blk" diff --git a/data/maps/objects/KantoLeague1F.asm b/data/maps/objects/KantoLeague1F.asm new file mode 100644 index 0000000..ea51b73 --- /dev/null +++ b/data/maps/objects/KantoLeague1F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoLeague1F.asm", ROMX + + map_attributes KantoLeague1F, KANTO_LEAGUE_1F, 0 + +KantoLeague1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 3, 15, 3, KANTO, wOverworldMapBlocks + 82 + warp_event 4, 15, 4, KANTO, wOverworldMapBlocks + 83 + warp_event 7, 1, 1, KANTO_LEAGUE_2F, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 5 ; person events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoLeague1F_Blocks:: +INCBIN "maps/KantoLeague1F.blk" diff --git a/data/maps/objects/KantoLeague21F.asm b/data/maps/objects/KantoLeague21F.asm new file mode 100644 index 0000000..a773116 --- /dev/null +++ b/data/maps/objects/KantoLeague21F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoLeague21F.asm", ROMX + + map_attributes KantoLeague21F, KANTO_LEAGUE_2_1F, 0 + +KantoLeague21F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 3, 15, 26, KANTO, wOverworldMapBlocks + 82 + warp_event 4, 15, 27, KANTO, wOverworldMapBlocks + 83 + warp_event 7, 1, 1, KANTO_LEAGUE_2_2F, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 5 ; person events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoLeague21F_Blocks:: +INCBIN "maps/KantoLeague21F.blk" diff --git a/data/maps/objects/KantoLeague22F.asm b/data/maps/objects/KantoLeague22F.asm new file mode 100644 index 0000000..a45069b --- /dev/null +++ b/data/maps/objects/KantoLeague22F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoLeague22F.asm", ROMX + + map_attributes KantoLeague22F, KANTO_LEAGUE_2_2F, 0 + +KantoLeague22F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 7, 15, 3, KANTO_LEAGUE_2_1F, wOverworldMapBlocks + 92 + + db 0 ; bg events + + db 5 ; person events + object_event 4, 7, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoLeague22F_Blocks:: +INCBIN "maps/KantoLeague22F.blk" diff --git a/data/maps/objects/KantoLeague2F.asm b/data/maps/objects/KantoLeague2F.asm new file mode 100644 index 0000000..d6e38f4 --- /dev/null +++ b/data/maps/objects/KantoLeague2F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoLeague2F.asm", ROMX + + map_attributes KantoLeague2F, KANTO_LEAGUE_2F, 0 + +KantoLeague2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 7, 15, 3, KANTO_LEAGUE_1F, wOverworldMapBlocks + 92 + + db 0 ; bg events + + db 5 ; person events + object_event 4, 7, SPRITE_RED, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoLeague2F_Blocks:: +INCBIN "maps/KantoLeague2F.blk" diff --git a/data/maps/objects/KantoMart.asm b/data/maps/objects/KantoMart.asm new file mode 100644 index 0000000..0ad9314 --- /dev/null +++ b/data/maps/objects/KantoMart.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoMart.asm", ROMX + + map_attributes KantoMart, KANTO_MART, 0 + +KantoMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 8, KANTO, wOverworldMapBlocks + 59 + warp_event 5, 7, 8, KANTO, wOverworldMapBlocks + 59 + + db 0 ; bg events + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_TWIN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_GRAMPS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoMart_Blocks:: +INCBIN "maps/KantoMart.blk" diff --git a/data/maps/objects/KantoOaksLab.asm b/data/maps/objects/KantoOaksLab.asm new file mode 100644 index 0000000..2760121 --- /dev/null +++ b/data/maps/objects/KantoOaksLab.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoOaksLab.asm", ROMX + + map_attributes KantoOaksLab, KANTO_OAKS_LAB, 0 + +KantoOaksLab_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 24, KANTO, wOverworldMapBlocks + 42 + warp_event 4, 7, 25, KANTO, wOverworldMapBlocks + 43 + + db 0 ; bg events + + db 1 ; person events + object_event 3, 2, SPRITE_NANAMI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoOaksLab_Blocks:: +INCBIN "maps/KantoOaksLab.blk" diff --git a/data/maps/objects/KantoPokecenter1F.asm b/data/maps/objects/KantoPokecenter1F.asm new file mode 100644 index 0000000..1ee32fd --- /dev/null +++ b/data/maps/objects/KantoPokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoPokecenter1F.asm", ROMX + + map_attributes KantoPokecenter1F, KANTO_POKECENTER_1F, 0 + +KantoPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 2, KANTO, wOverworldMapBlocks + 59 + warp_event 6, 7, 2, KANTO, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, KANTO_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoPokecenter1F_Blocks:: +INCBIN "maps/KantoPokecenter1F.blk" diff --git a/data/maps/objects/KantoPokecenter21F.asm b/data/maps/objects/KantoPokecenter21F.asm new file mode 100644 index 0000000..2e7a2ac --- /dev/null +++ b/data/maps/objects/KantoPokecenter21F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoPokecenter21F.asm", ROMX + + map_attributes KantoPokecenter21F, KANTO_POKECENTER_2_1F, 0 + +KantoPokecenter21F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 20, KANTO, wOverworldMapBlocks + 59 + warp_event 6, 7, 20, KANTO, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, KANTO_POKECENTER_2_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoPokecenter21F_Blocks:: +INCBIN "maps/KantoPokecenter21F.blk" diff --git a/data/maps/objects/KantoPokecenter22F.asm b/data/maps/objects/KantoPokecenter22F.asm new file mode 100644 index 0000000..1e46fe2 --- /dev/null +++ b/data/maps/objects/KantoPokecenter22F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoPokecenter22F.asm", ROMX + + map_attributes KantoPokecenter22F, KANTO_POKECENTER_2_2F, 0 + +KantoPokecenter22F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, KANTO_POKECENTER_2_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoPokecenter22F_Blocks:: +INCBIN "maps/KantoPokecenter22F.blk" diff --git a/data/maps/objects/KantoPokecenter2F.asm b/data/maps/objects/KantoPokecenter2F.asm new file mode 100644 index 0000000..43a9070 --- /dev/null +++ b/data/maps/objects/KantoPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoPokecenter2F.asm", ROMX + + map_attributes KantoPokecenter2F, KANTO_POKECENTER_2F, 0 + +KantoPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, KANTO_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoPokecenter2F_Blocks:: +INCBIN "maps/KantoPokecenter2F.blk" diff --git a/data/maps/objects/KantoRedsHouse.asm b/data/maps/objects/KantoRedsHouse.asm new file mode 100644 index 0000000..7043e27 --- /dev/null +++ b/data/maps/objects/KantoRedsHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoRedsHouse.asm", ROMX + + map_attributes KantoRedsHouse, KANTO_REDS_HOUSE, 0 + +KantoRedsHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 21, KANTO, wOverworldMapBlocks + 47 + warp_event 5, 7, 21, KANTO, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 2 ; person events + object_event 7, 3, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoRedsHouse_Blocks:: +INCBIN "maps/KantoRedsHouse.blk" diff --git a/data/maps/objects/KantoSchool.asm b/data/maps/objects/KantoSchool.asm new file mode 100644 index 0000000..dcba623 --- /dev/null +++ b/data/maps/objects/KantoSchool.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoSchool.asm", ROMX + + map_attributes KantoSchool, KANTO_SCHOOL, 0 + +KantoSchool_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 15, 17, KANTO, wOverworldMapBlocks + 82 + warp_event 4, 15, 18, KANTO, wOverworldMapBlocks + 83 + + db 0 ; bg events + + db 5 ; person events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoSchool_Blocks:: +INCBIN "maps/KantoSchool.blk" diff --git a/data/maps/objects/KantoSilphCo.asm b/data/maps/objects/KantoSilphCo.asm new file mode 100644 index 0000000..38bd8ab --- /dev/null +++ b/data/maps/objects/KantoSilphCo.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoSilphCo.asm", ROMX + + map_attributes KantoSilphCo, KANTO_SILPH_CO, 0 + +KantoSilphCo_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 6, 15, 11, KANTO, wOverworldMapBlocks + 148 + warp_event 7, 15, 12, KANTO, wOverworldMapBlocks + 148 + + db 0 ; bg events + + db 2 ; person events + object_event 2, 2, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 22, 1, SPRITE_OFFICER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoSilphCo_Blocks:: +INCBIN "maps/KantoSilphCo.blk" diff --git a/data/maps/objects/KantoUnusedArea.asm b/data/maps/objects/KantoUnusedArea.asm new file mode 100644 index 0000000..7429d38 --- /dev/null +++ b/data/maps/objects/KantoUnusedArea.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoUnusedArea.asm", ROMX + + map_attributes KantoUnusedArea, KANTO_UNUSED_AREA, 0 + +KantoUnusedArea_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +KantoUnusedArea_Blocks:: +INCBIN "maps/KantoUnusedArea.blk" diff --git a/data/maps/objects/KantoViridianHouse.asm b/data/maps/objects/KantoViridianHouse.asm new file mode 100644 index 0000000..29bc41f --- /dev/null +++ b/data/maps/objects/KantoViridianHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/KantoViridianHouse.asm", ROMX + + map_attributes KantoViridianHouse, KANTO_VIRIDIAN_HOUSE, 0 + +KantoViridianHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 13, KANTO, wOverworldMapBlocks + 47 + warp_event 5, 7, 13, KANTO, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 2 ; person events + object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +KantoViridianHouse_Blocks:: +INCBIN "maps/KantoViridianHouse.blk" diff --git a/data/maps/objects/MtFuji.asm b/data/maps/objects/MtFuji.asm new file mode 100644 index 0000000..ddae1d3 --- /dev/null +++ b/data/maps/objects/MtFuji.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/MtFuji.asm", ROMX + + map_attributes MtFuji, MT_FUJI, SOUTH + connection south, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10 + +MtFuji_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +MtFuji_Blocks:: +INCBIN "maps/MtFuji.blk" diff --git a/data/maps/objects/MtFujiRoute.asm b/data/maps/objects/MtFujiRoute.asm new file mode 100644 index 0000000..e530dcc --- /dev/null +++ b/data/maps/objects/MtFujiRoute.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/MtFujiRoute.asm", ROMX + + map_attributes MtFujiRoute, MT_FUJI_ROUTE, NORTH | SOUTH + connection north, MtFuji, MT_FUJI, 0, 0, 10 + connection south, Prince, PRINCE, 0, 0, 10 + +MtFujiRoute_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +MtFujiRoute_Blocks:: +INCBIN "maps/MtFujiRoute.blk" diff --git a/data/maps/objects/Newtype.asm b/data/maps/objects/Newtype.asm new file mode 100644 index 0000000..a0179d9 --- /dev/null +++ b/data/maps/objects/Newtype.asm @@ -0,0 +1,42 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Newtype.asm", ROMX + + map_attributes Newtype, NEWTYPE, NORTH | WEST | EAST + connection north, SugarRoute, SUGAR_ROUTE, 5, 0, 10 + connection west, Route15, ROUTE_15, 0, 0, 9 + connection east, NewtypeRoute, NEWTYPE_ROUTE, 9, 0, 9 + +Newtype_MapEvents:: + dw $4000 ; unknown + + db 13 ; warp events + warp_event 7, 8, 1, NEWTYPE_POKECENTER_1F, wOverworldMapBlocks + 134 + warp_event 30, 9, 1, NEWTYPE_LEAGUE_1F, wOverworldMapBlocks + 146 + warp_event 31, 9, 2, NEWTYPE_LEAGUE_1F, wOverworldMapBlocks + 146 + warp_event 23, 13, 1, NEWTYPE_SAILOR_HOUSE, wOverworldMapBlocks + 194 + warp_event 7, 14, 1, NEWTYPE_MART, wOverworldMapBlocks + 212 + warp_event 33, 15, 1, NEWTYPE_DOJO, wOverworldMapBlocks + 225 + warp_event 34, 15, 2, NEWTYPE_DOJO, wOverworldMapBlocks + 226 + warp_event 23, 22, 1, NEWTYPE_HOUSE_1, wOverworldMapBlocks + 324 + warp_event 5, 23, 1, NEWTYPE_DINER, wOverworldMapBlocks + 315 + warp_event 11, 28, 1, NEWTYPE_HOUSE_2, wOverworldMapBlocks + 396 + warp_event 35, 30, 1, NEWTYPE_HOUSE_3, wOverworldMapBlocks + 434 + warp_event 18, 5, 1, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 88 + warp_event 19, 5, 2, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 88 + + db 5 ; bg events + bg_event 0, 8, 0, 1 + bg_event 8, 8, 0, 2 + bg_event 8, 14, 0, 3 + bg_event 30, 15, 0, 4 + bg_event 30, 21, 0, 5 + + db 4 ; person events + object_event 5, 10, SPRITE_SILVER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 24, 26, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 24, 9, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 30, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Newtype_Blocks:: +INCBIN "maps/Newtype.blk" diff --git a/data/maps/objects/NewtypeDiner.asm b/data/maps/objects/NewtypeDiner.asm new file mode 100644 index 0000000..fafd30a --- /dev/null +++ b/data/maps/objects/NewtypeDiner.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeDiner.asm", ROMX + + map_attributes NewtypeDiner, NEWTYPE_DINER, 0 + +NewtypeDiner_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 2, 7, 9, NEWTYPE, wOverworldMapBlocks + 42 + warp_event 3, 7, 9, NEWTYPE, wOverworldMapBlocks + 42 + + db 0 ; bg events + + db 4 ; person events + object_event 2, 1, SPRITE_CLERK, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 3, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 3, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypeDiner_Blocks:: +INCBIN "maps/NewtypeDiner.blk" diff --git a/data/maps/objects/NewtypeDojo.asm b/data/maps/objects/NewtypeDojo.asm new file mode 100644 index 0000000..444a861 --- /dev/null +++ b/data/maps/objects/NewtypeDojo.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeDojo.asm", ROMX + + map_attributes NewtypeDojo, NEWTYPE_DOJO, 0 + +NewtypeDojo_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 15, 6, NEWTYPE, wOverworldMapBlocks + 82 + warp_event 4, 15, 7, NEWTYPE, wOverworldMapBlocks + 83 + + db 0 ; bg events + + db 5 ; person events + object_event 3, 2, SPRITE_BLACKBELT, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 6, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 6, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 10, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 10, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypeDojo_Blocks:: +INCBIN "maps/NewtypeDojo.blk" diff --git a/data/maps/objects/NewtypeHouse1.asm b/data/maps/objects/NewtypeHouse1.asm new file mode 100644 index 0000000..30de46a --- /dev/null +++ b/data/maps/objects/NewtypeHouse1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeHouse1.asm", ROMX + + map_attributes NewtypeHouse1, NEWTYPE_HOUSE_1, 0 + +NewtypeHouse1_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 8, NEWTYPE, wOverworldMapBlocks + 47 + warp_event 5, 7, 8, NEWTYPE, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypeHouse1_Blocks:: +INCBIN "maps/NewtypeHouse1.blk" diff --git a/data/maps/objects/NewtypeHouse2.asm b/data/maps/objects/NewtypeHouse2.asm new file mode 100644 index 0000000..d0153d0 --- /dev/null +++ b/data/maps/objects/NewtypeHouse2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeHouse2.asm", ROMX + + map_attributes NewtypeHouse2, NEWTYPE_HOUSE_2, 0 + +NewtypeHouse2_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 10, NEWTYPE, wOverworldMapBlocks + 47 + warp_event 5, 7, 10, NEWTYPE, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 4, 3, SPRITE_GENTLEMAN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypeHouse2_Blocks:: +INCBIN "maps/NewtypeHouse2.blk" diff --git a/data/maps/objects/NewtypeHouse3.asm b/data/maps/objects/NewtypeHouse3.asm new file mode 100644 index 0000000..bf7bcfb --- /dev/null +++ b/data/maps/objects/NewtypeHouse3.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeHouse3.asm", ROMX + + map_attributes NewtypeHouse3, NEWTYPE_HOUSE_3, 0 + +NewtypeHouse3_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 11, NEWTYPE, wOverworldMapBlocks + 47 + warp_event 5, 7, 11, NEWTYPE, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypeHouse3_Blocks:: +INCBIN "maps/NewtypeHouse3.blk" diff --git a/data/maps/objects/NewtypeLeague1F.asm b/data/maps/objects/NewtypeLeague1F.asm new file mode 100644 index 0000000..cd9ea41 --- /dev/null +++ b/data/maps/objects/NewtypeLeague1F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeLeague1F.asm", ROMX + + map_attributes NewtypeLeague1F, NEWTYPE_LEAGUE_1F, 0 + +NewtypeLeague1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 3, 15, 2, NEWTYPE, wOverworldMapBlocks + 82 + warp_event 4, 15, 3, NEWTYPE, wOverworldMapBlocks + 83 + warp_event 7, 1, 1, NEWTYPE_LEAGUE_2F, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 5 ; person events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypeLeague1F_Blocks:: +INCBIN "maps/NewtypeLeague1F.blk" diff --git a/data/maps/objects/NewtypeLeague2F.asm b/data/maps/objects/NewtypeLeague2F.asm new file mode 100644 index 0000000..19cae51 --- /dev/null +++ b/data/maps/objects/NewtypeLeague2F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeLeague2F.asm", ROMX + + map_attributes NewtypeLeague2F, NEWTYPE_LEAGUE_2F, 0 + +NewtypeLeague2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 7, 15, 3, NEWTYPE_LEAGUE_1F, wOverworldMapBlocks + 92 + + db 0 ; bg events + + db 5 ; person events + object_event 5, 5, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 0, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 0, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 11, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypeLeague2F_Blocks:: +INCBIN "maps/NewtypeLeague2F.blk" diff --git a/data/maps/objects/NewtypeMart.asm b/data/maps/objects/NewtypeMart.asm new file mode 100644 index 0000000..2ada20c --- /dev/null +++ b/data/maps/objects/NewtypeMart.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeMart.asm", ROMX + + map_attributes NewtypeMart, NEWTYPE_MART, 0 + +NewtypeMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 5, NEWTYPE, wOverworldMapBlocks + 59 + warp_event 5, 7, 5, NEWTYPE, wOverworldMapBlocks + 59 + + db 0 ; bg events + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypeMart_Blocks:: +INCBIN "maps/NewtypeMart.blk" diff --git a/data/maps/objects/NewtypePokecenter1F.asm b/data/maps/objects/NewtypePokecenter1F.asm new file mode 100644 index 0000000..9122876 --- /dev/null +++ b/data/maps/objects/NewtypePokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypePokecenter1F.asm", ROMX + + map_attributes NewtypePokecenter1F, NEWTYPE_POKECENTER_1F, 0 + +NewtypePokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 1, NEWTYPE, wOverworldMapBlocks + 59 + warp_event 6, 7, 1, NEWTYPE, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, NEWTYPE_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypePokecenter1F_Blocks:: +INCBIN "maps/NewtypePokecenter1F.blk" diff --git a/data/maps/objects/NewtypePokecenter2F.asm b/data/maps/objects/NewtypePokecenter2F.asm new file mode 100644 index 0000000..50a988e --- /dev/null +++ b/data/maps/objects/NewtypePokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypePokecenter2F.asm", ROMX + + map_attributes NewtypePokecenter2F, NEWTYPE_POKECENTER_2F, 0 + +NewtypePokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, NEWTYPE_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypePokecenter2F_Blocks:: +INCBIN "maps/NewtypePokecenter2F.blk" diff --git a/data/maps/objects/NewtypeRoute.asm b/data/maps/objects/NewtypeRoute.asm new file mode 100644 index 0000000..eceaf4c --- /dev/null +++ b/data/maps/objects/NewtypeRoute.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeRoute.asm", ROMX + + map_attributes NewtypeRoute, NEWTYPE_ROUTE, WEST | EAST + connection west, Newtype, NEWTYPE, -3, 6, 12 + connection east, Route18, ROUTE_18, -3, 33, 12 + +NewtypeRoute_MapEvents:: + dw $4000 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +NewtypeRoute_Blocks:: +INCBIN "maps/NewtypeRoute.blk" diff --git a/data/maps/objects/NewtypeRouteGate.asm b/data/maps/objects/NewtypeRouteGate.asm new file mode 100644 index 0000000..382549b --- /dev/null +++ b/data/maps/objects/NewtypeRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeRouteGate.asm", ROMX + + map_attributes NewtypeRouteGate, NEWTYPE_ROUTE_GATE, 0 + +NewtypeRouteGate_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 4, 7, 1, ROUTE_18, wOverworldMapBlocks + 47 + warp_event 5, 7, 2, ROUTE_18, wOverworldMapBlocks + 47 + warp_event 4, 0, 1, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 14 + warp_event 5, 0, 2, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 0 ; person events + +NewtypeRouteGate_Blocks:: +INCBIN "maps/NewtypeRouteGate.blk" diff --git a/data/maps/objects/NewtypeSailorHouse.asm b/data/maps/objects/NewtypeSailorHouse.asm new file mode 100644 index 0000000..234929c --- /dev/null +++ b/data/maps/objects/NewtypeSailorHouse.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NewtypeSailorHouse.asm", ROMX + + map_attributes NewtypeSailorHouse, NEWTYPE_SAILOR_HOUSE, 0 + +NewtypeSailorHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 4, NEWTYPE, wOverworldMapBlocks + 47 + warp_event 5, 7, 4, NEWTYPE, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 6, 3, SPRITE_47, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NewtypeSailorHouse_Blocks:: +INCBIN "maps/NewtypeSailorHouse.blk" diff --git a/data/maps/objects/North.asm b/data/maps/objects/North.asm new file mode 100644 index 0000000..4675b13 --- /dev/null +++ b/data/maps/objects/North.asm @@ -0,0 +1,29 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/North.asm", ROMX + + map_attributes North, NORTH, SOUTH + connection south, BullForestRoute3, BULL_FOREST_ROUTE_3, 0, 0, 10 + +North_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 5, 5, 1, NORTH_HOUSE_1, wOverworldMapBlocks + 51 + warp_event 15, 6, 1, NORTH_MART, wOverworldMapBlocks + 72 + warp_event 5, 9, 1, NORTH_HOUSE_2, wOverworldMapBlocks + 83 + warp_event 13, 10, 1, NORTH_POKECENTER_1F, wOverworldMapBlocks + 103 + + db 4 ; bg events + bg_event 12, 4, 0, 1 + bg_event 16, 6, 0, 2 + bg_event 14, 10, 0, 3 + bg_event 8, 12, 0, 4 + + db 3 ; person events + object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +North_Blocks:: +INCBIN "maps/North.blk" diff --git a/data/maps/objects/NorthHouse1.asm b/data/maps/objects/NorthHouse1.asm new file mode 100644 index 0000000..a60ac00 --- /dev/null +++ b/data/maps/objects/NorthHouse1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NorthHouse1.asm", ROMX + + map_attributes NorthHouse1, NORTH_HOUSE_1, 0 + +NorthHouse1_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 1, NORTH, wOverworldMapBlocks + 47 + warp_event 5, 7, 1, NORTH, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NorthHouse1_Blocks:: +INCBIN "maps/NorthHouse1.blk" diff --git a/data/maps/objects/NorthHouse2.asm b/data/maps/objects/NorthHouse2.asm new file mode 100644 index 0000000..f8fce5f --- /dev/null +++ b/data/maps/objects/NorthHouse2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NorthHouse2.asm", ROMX + + map_attributes NorthHouse2, NORTH_HOUSE_2, 0 + +NorthHouse2_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 3, NORTH, wOverworldMapBlocks + 47 + warp_event 5, 7, 3, NORTH, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NorthHouse2_Blocks:: +INCBIN "maps/NorthHouse2.blk" diff --git a/data/maps/objects/NorthMart.asm b/data/maps/objects/NorthMart.asm new file mode 100644 index 0000000..3af319f --- /dev/null +++ b/data/maps/objects/NorthMart.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NorthMart.asm", ROMX + + map_attributes NorthMart, NORTH_MART, 0 + +NorthMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 2, NORTH, wOverworldMapBlocks + 51 + warp_event 5, 7, 2, NORTH, wOverworldMapBlocks + 51 + + db 0 ; bg events + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_GIRL, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NorthMart_Blocks:: +INCBIN "maps/NorthMart.blk" diff --git a/data/maps/objects/NorthPokecenter1F.asm b/data/maps/objects/NorthPokecenter1F.asm new file mode 100644 index 0000000..29fc812 --- /dev/null +++ b/data/maps/objects/NorthPokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NorthPokecenter1F.asm", ROMX + + map_attributes NorthPokecenter1F, NORTH_POKECENTER_1F, 0 + +NorthPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 4, NORTH, wOverworldMapBlocks + 59 + warp_event 6, 7, 4, NORTH, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, NORTH_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NorthPokecenter1F_Blocks:: +INCBIN "maps/NorthPokecenter1F.blk" diff --git a/data/maps/objects/NorthPokecenter2F.asm b/data/maps/objects/NorthPokecenter2F.asm new file mode 100644 index 0000000..e092e41 --- /dev/null +++ b/data/maps/objects/NorthPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/NorthPokecenter2F.asm", ROMX + + map_attributes NorthPokecenter2F, NORTH_POKECENTER_2F, 0 + +NorthPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, NORTH_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +NorthPokecenter2F_Blocks:: +INCBIN "maps/NorthPokecenter2F.blk" diff --git a/data/maps/objects/Office1.asm b/data/maps/objects/Office1.asm new file mode 100644 index 0000000..ae45362 --- /dev/null +++ b/data/maps/objects/Office1.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Office1.asm", ROMX + + map_attributes Office1, OFFICE_1, 0 + +Office1_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +Office1_Blocks:: +INCBIN "maps/Office1.blk" diff --git a/data/maps/objects/Office2.asm b/data/maps/objects/Office2.asm new file mode 100644 index 0000000..24ef079 --- /dev/null +++ b/data/maps/objects/Office2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Office2.asm", ROMX + + map_attributes Office2, OFFICE_2, 0 + +Office2_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +Office2_Blocks:: +INCBIN "maps/Office2.blk" diff --git a/data/maps/objects/Office3.asm b/data/maps/objects/Office3.asm new file mode 100644 index 0000000..7a70ad1 --- /dev/null +++ b/data/maps/objects/Office3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Office3.asm", ROMX + + map_attributes Office3, OFFICE_3, 0 + +Office3_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +Office3_Blocks:: +INCBIN "maps/Office3.blk" diff --git a/data/maps/objects/OldCity.asm b/data/maps/objects/OldCity.asm new file mode 100644 index 0000000..00280e1 --- /dev/null +++ b/data/maps/objects/OldCity.asm @@ -0,0 +1,50 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCity.asm", ROMX + + map_attributes OldCity, OLD_CITY, SOUTH | WEST + connection south, Route1P2, ROUTE_1_P2, 5, 0, 10 + connection west, Route2, ROUTE_2, 5, 0, 9 + +OldCity_MapEvents:: + dw $4000 ; unknown + + db 14 ; warp events + warp_event 4, 14, 1, OLD_CITY_MUSEUM, wOverworldMapBlocks + 211 + warp_event 5, 14, 2, OLD_CITY_MUSEUM, wOverworldMapBlocks + 211 + warp_event 26, 14, 1, OLD_CITY_GYM, wOverworldMapBlocks + 222 + warp_event 27, 14, 2, OLD_CITY_GYM, wOverworldMapBlocks + 222 + warp_event 11, 17, 1, OLD_CITY_TOWER_1F, wOverworldMapBlocks + 240 + warp_event 12, 17, 2, OLD_CITY_TOWER_1F, wOverworldMapBlocks + 241 + warp_event 30, 22, 1, OLD_CITY_BILLS_HOUSE, wOverworldMapBlocks + 328 + warp_event 3, 26, 1, OLD_CITY_MART, wOverworldMapBlocks + 366 + warp_event 10, 26, 1, OLD_CITY_HOUSE, wOverworldMapBlocks + 370 + warp_event 27, 28, 1, OLD_CITY_POKECENTER_1F, wOverworldMapBlocks + 404 + warp_event 3, 31, 1, OLD_CITY_KURTS_HOUSE, wOverworldMapBlocks + 418 + warp_event 18, 30, 3, ROUTE_1_GATE_1F, wOverworldMapBlocks + 426 + warp_event 19, 30, 4, ROUTE_1_GATE_1F, wOverworldMapBlocks + 426 + warp_event 22, 26, 1, OLD_CITY_SCHOOL, wOverworldMapBlocks + 376 + + db 12 ; bg events + bg_event 8, 14, 0, 1 + bg_event 8, 16, 0, 2 + bg_event 28, 16, 0, 3 + bg_event 20, 22, 0, 4 + bg_event 26, 22, 0, 5 + bg_event 8, 26, 0, 6 + bg_event 28, 28, 0, 7 + bg_event 20, 29, 0, 8 + bg_event 4, 32, 0, 9 + bg_event 30, 22, 0, 10 + bg_event 4, 14, 0, 11 + bg_event 5, 14, 0, 11 + + db 5 ; person events + object_event 8, 30, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 20, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 26, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 21, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 17, 19, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCity_Blocks:: +INCBIN "maps/OldCity.blk" diff --git a/data/maps/objects/OldCityBillsHouse.asm b/data/maps/objects/OldCityBillsHouse.asm new file mode 100644 index 0000000..0e79b5c --- /dev/null +++ b/data/maps/objects/OldCityBillsHouse.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityBillsHouse.asm", ROMX + + map_attributes OldCityBillsHouse, OLD_CITY_BILLS_HOUSE, 0 + +OldCityBillsHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 7, OLD_CITY, wOverworldMapBlocks + 42 + warp_event 4, 7, 7, OLD_CITY, wOverworldMapBlocks + 43 + + db 6 ; bg events + bg_event 2, 1, 0, 1 + bg_event 3, 1, 0, 2 + bg_event 4, 1, 0, 3 + bg_event 6, 1, 0, 4 + bg_event 7, 1, 0, 5 + bg_event 1, 1, 0, 6 + + db 1 ; person events + object_event 5, 4, SPRITE_MASAKI, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityBillsHouse_Blocks:: +INCBIN "maps/OldCityBillsHouse.blk" diff --git a/data/maps/objects/OldCityGym.asm b/data/maps/objects/OldCityGym.asm new file mode 100644 index 0000000..3405b04 --- /dev/null +++ b/data/maps/objects/OldCityGym.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityGym.asm", ROMX + + map_attributes OldCityGym, OLD_CITY_GYM, 0 + +OldCityGym_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 17, 3, OLD_CITY, wOverworldMapBlocks + 102 + warp_event 5, 17, 4, OLD_CITY, wOverworldMapBlocks + 102 + + db 2 ; bg events + bg_event 3, 15, 0, 1 + bg_event 6, 15, 0, 1 + + db 6 ; person events + object_event 4, 5, SPRITE_HAYATO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 9, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 + object_event 8, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 + object_event 1, 1, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 + object_event 1, 9, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 + object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 + +OldCityGym_Blocks:: +INCBIN "maps/OldCityGym.blk" diff --git a/data/maps/objects/OldCityHouse.asm b/data/maps/objects/OldCityHouse.asm new file mode 100644 index 0000000..dd140a4 --- /dev/null +++ b/data/maps/objects/OldCityHouse.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityHouse.asm", ROMX + + map_attributes OldCityHouse, OLD_CITY_HOUSE, 0 + +OldCityHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 9, OLD_CITY, wOverworldMapBlocks + 42 + warp_event 4, 7, 9, OLD_CITY, wOverworldMapBlocks + 43 + + db 4 ; bg events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 2, 1, 0, 3 + bg_event 7, 1, 0, 4 + + db 3 ; person events + object_event 2, 3, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 6, SPRITE_LASS, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityHouse_Blocks:: +INCBIN "maps/OldCityHouse.blk" diff --git a/data/maps/objects/OldCityKurtsHouse.asm b/data/maps/objects/OldCityKurtsHouse.asm new file mode 100644 index 0000000..178b8a4 --- /dev/null +++ b/data/maps/objects/OldCityKurtsHouse.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityKurtsHouse.asm", ROMX + + map_attributes OldCityKurtsHouse, OLD_CITY_KURTS_HOUSE, 0 + +OldCityKurtsHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 11, OLD_CITY, wOverworldMapBlocks + 58 + warp_event 4, 7, 11, OLD_CITY, wOverworldMapBlocks + 59 + + db 5 ; bg events + bg_event 4, 1, 0, 1 + bg_event 5, 1, 0, 2 + bg_event 12, 1, 0, 3 + bg_event 14, 0, 0, 4 + bg_event 15, 0, 0, 4 + + db 1 ; person events + object_event 2, 2, SPRITE_GANTETSU, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityKurtsHouse_Blocks:: +INCBIN "maps/OldCityKurtsHouse.blk" diff --git a/data/maps/objects/OldCityMart.asm b/data/maps/objects/OldCityMart.asm new file mode 100644 index 0000000..bbcafd0 --- /dev/null +++ b/data/maps/objects/OldCityMart.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityMart.asm", ROMX + + map_attributes OldCityMart, OLD_CITY_MART, 0 + +OldCityMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 8, OLD_CITY, wOverworldMapBlocks + 51 + warp_event 5, 7, 8, OLD_CITY, wOverworldMapBlocks + 51 + + db 1 ; bg events + bg_event 0, 7, 0, 1 + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityMart_Blocks:: +INCBIN "maps/OldCityMart.blk" diff --git a/data/maps/objects/OldCityMuseum.asm b/data/maps/objects/OldCityMuseum.asm new file mode 100644 index 0000000..60f2505 --- /dev/null +++ b/data/maps/objects/OldCityMuseum.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityMuseum.asm", ROMX + + map_attributes OldCityMuseum, OLD_CITY_MUSEUM, 0 + +OldCityMuseum_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 2, 7, 1, OLD_CITY, wOverworldMapBlocks + 58 + warp_event 3, 7, 2, OLD_CITY, wOverworldMapBlocks + 58 + + db 4 ; bg events + bg_event 2, 3, 0, 1 + bg_event 5, 4, 0, 2 + bg_event 9, 4, 0, 3 + bg_event 13, 4, 0, 4 + + db 2 ; person events + object_event 1, 5, SPRITE_FISHER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 4, SPRITE_EGG, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityMuseum_Blocks:: +INCBIN "maps/OldCityMuseum.blk" diff --git a/data/maps/objects/OldCityPokecenter1F.asm b/data/maps/objects/OldCityPokecenter1F.asm new file mode 100644 index 0000000..28fa3bb --- /dev/null +++ b/data/maps/objects/OldCityPokecenter1F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityPokecenter1F.asm", ROMX + + map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, 0 + +OldCityPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 10, OLD_CITY, wOverworldMapBlocks + 59 + warp_event 6, 7, 10, OLD_CITY, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 1 ; bg events + bg_event 13, 1, 0, 1 + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_35, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityPokecenter1F_Blocks:: +INCBIN "maps/OldCityPokecenter1F.blk" diff --git a/data/maps/objects/OldCityPokecenter2F.asm b/data/maps/objects/OldCityPokecenter2F.asm new file mode 100644 index 0000000..b6354c3 --- /dev/null +++ b/data/maps/objects/OldCityPokecenter2F.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityPokecenter2F.asm", ROMX + + map_attributes OldCityPokecenter2F, OLD_CITY_POKECENTER_2F, 0 + +OldCityPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 0, 7, 3, OLD_CITY_POKECENTER_1F, wOverworldMapBlocks + 57 + warp_event 5, 0, 1, OLD_CITY_POKECENTER_TRADE, wOverworldMapBlocks + 17 + warp_event 9, 0, 1, OLD_CITY_POKECENTER_BATTLE, wOverworldMapBlocks + 19 + warp_event 13, 2, 1, OLD_CITY_POKECENTER_TIME_MACHINE, wOverworldMapBlocks + 35 + + db 1 ; bg events + bg_event 1, 1, 0, 1 + + db 4 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 3, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityPokecenter2F_Blocks:: +INCBIN "maps/OldCityPokecenter2F.blk" diff --git a/data/maps/objects/OldCityPokecenterBattle.asm b/data/maps/objects/OldCityPokecenterBattle.asm new file mode 100644 index 0000000..d9e3704 --- /dev/null +++ b/data/maps/objects/OldCityPokecenterBattle.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityPokecenterBattle.asm", ROMX + + map_attributes OldCityPokecenterBattle, OLD_CITY_POKECENTER_BATTLE, 0 + +OldCityPokecenterBattle_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 3, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 + warp_event 5, 7, 3, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityPokecenterBattle_Blocks:: +INCBIN "maps/OldCityPokecenterBattle.blk" diff --git a/data/maps/objects/OldCityPokecenterTimeMachine.asm b/data/maps/objects/OldCityPokecenterTimeMachine.asm new file mode 100644 index 0000000..d4a91fb --- /dev/null +++ b/data/maps/objects/OldCityPokecenterTimeMachine.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityPokecenterTimeMachine.asm", ROMX + + map_attributes OldCityPokecenterTimeMachine, OLD_CITY_POKECENTER_TIME_MACHINE, 0 + +OldCityPokecenterTimeMachine_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 2, 7, 4, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 58 + warp_event 3, 7, 4, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 58 + + db 1 ; bg events + bg_event 15, 3, 0, 1 + + db 1 ; person events + object_event 13, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityPokecenterTimeMachine_Blocks:: +INCBIN "maps/OldCityPokecenterTimeMachine.blk" diff --git a/data/maps/objects/OldCityPokecenterTrade.asm b/data/maps/objects/OldCityPokecenterTrade.asm new file mode 100644 index 0000000..178cbea --- /dev/null +++ b/data/maps/objects/OldCityPokecenterTrade.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityPokecenterTrade.asm", ROMX + + map_attributes OldCityPokecenterTrade, OLD_CITY_POKECENTER_TRADE, 0 + +OldCityPokecenterTrade_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 2, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 + warp_event 5, 7, 2, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityPokecenterTrade_Blocks:: +INCBIN "maps/OldCityPokecenterTrade.blk" diff --git a/data/maps/objects/OldCitySchool.asm b/data/maps/objects/OldCitySchool.asm new file mode 100644 index 0000000..db27565 --- /dev/null +++ b/data/maps/objects/OldCitySchool.asm @@ -0,0 +1,29 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCitySchool.asm", ROMX + + map_attributes OldCitySchool, OLD_CITY_SCHOOL, 0 + +OldCitySchool_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 15, 14, OLD_CITY, wOverworldMapBlocks + 82 + warp_event 4, 15, 14, OLD_CITY, wOverworldMapBlocks + 83 + + db 4 ; bg events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 1 + bg_event 3, 0, 0, 2 + bg_event 4, 0, 0, 2 + + db 6 ; person events + object_event 2, 5, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_TEACHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCitySchool_Blocks:: +INCBIN "maps/OldCitySchool.blk" diff --git a/data/maps/objects/OldCityTower1F.asm b/data/maps/objects/OldCityTower1F.asm new file mode 100644 index 0000000..64ddb60 --- /dev/null +++ b/data/maps/objects/OldCityTower1F.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityTower1F.asm", ROMX + + map_attributes OldCityTower1F, OLD_CITY_TOWER_1F, 0 + +OldCityTower1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 3, 7, 5, OLD_CITY, wOverworldMapBlocks + 42 + warp_event 4, 7, 6, OLD_CITY, wOverworldMapBlocks + 43 + warp_event 0, 1, 1, OLD_CITY_TOWER_2F, wOverworldMapBlocks + 11 + + db 3 ; bg events + bg_event 2, 6, 0, 1 + bg_event 5, 6, 0, 2 + bg_event 4, 1, 0, 3 + + db 4 ; person events + object_event 0, 2, SPRITE_SAGE, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 1, 5, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 5, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 6, 4, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 + +OldCityTower1F_Blocks:: +INCBIN "maps/OldCityTower1F.blk" diff --git a/data/maps/objects/OldCityTower2F.asm b/data/maps/objects/OldCityTower2F.asm new file mode 100644 index 0000000..078661f --- /dev/null +++ b/data/maps/objects/OldCityTower2F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityTower2F.asm", ROMX + + map_attributes OldCityTower2F, OLD_CITY_TOWER_2F, 0 + +OldCityTower2F_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 0, 1, 3, OLD_CITY_TOWER_1F, wOverworldMapBlocks + 11 + warp_event 7, 7, 2, OLD_CITY_TOWER_3F, wOverworldMapBlocks + 44 + + db 2 ; bg events + bg_event 3, 0, 0, 1 + bg_event 4, 1, 0, 2 + + db 4 ; person events + object_event 2, 3, SPRITE_MEDIUM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 5, 3, SPRITE_MEDIUM, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 2, 6, SPRITE_MEDIUM, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 5, 6, SPRITE_MEDIUM, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + +OldCityTower2F_Blocks:: +INCBIN "maps/OldCityTower2F.blk" diff --git a/data/maps/objects/OldCityTower3F.asm b/data/maps/objects/OldCityTower3F.asm new file mode 100644 index 0000000..fae518e --- /dev/null +++ b/data/maps/objects/OldCityTower3F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityTower3F.asm", ROMX + + map_attributes OldCityTower3F, OLD_CITY_TOWER_3F, 0 + +OldCityTower3F_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 0, 1, 1, OLD_CITY_TOWER_4F, wOverworldMapBlocks + 11 + warp_event 7, 7, 2, OLD_CITY_TOWER_2F, wOverworldMapBlocks + 44 + + db 2 ; bg events + bg_event 3, 0, 0, 1 + bg_event 4, 1, 0, 2 + + db 4 ; person events + object_event 2, 3, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 3, 4, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 4, 4, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 5, 5, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + +OldCityTower3F_Blocks:: +INCBIN "maps/OldCityTower3F.blk" diff --git a/data/maps/objects/OldCityTower4F.asm b/data/maps/objects/OldCityTower4F.asm new file mode 100644 index 0000000..a3bae56 --- /dev/null +++ b/data/maps/objects/OldCityTower4F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityTower4F.asm", ROMX + + map_attributes OldCityTower4F, OLD_CITY_TOWER_4F, 0 + +OldCityTower4F_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 0, 1, 1, OLD_CITY_TOWER_3F, wOverworldMapBlocks + 11 + warp_event 7, 7, 1, OLD_CITY_TOWER_5F, wOverworldMapBlocks + 44 + + db 2 ; bg events + bg_event 3, 0, 0, 1 + bg_event 4, 1, 0, 2 + + db 4 ; person events + object_event 3, 2, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 4, 7, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 + object_event 6, 7, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 + object_event 7, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 + +OldCityTower4F_Blocks:: +INCBIN "maps/OldCityTower4F.blk" diff --git a/data/maps/objects/OldCityTower5F.asm b/data/maps/objects/OldCityTower5F.asm new file mode 100644 index 0000000..590aad9 --- /dev/null +++ b/data/maps/objects/OldCityTower5F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/OldCityTower5F.asm", ROMX + + map_attributes OldCityTower5F, OLD_CITY_TOWER_5F, 0 + +OldCityTower5F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 5, 5, 2, OLD_CITY_TOWER_4F, wOverworldMapBlocks + 30 + + db 3 ; bg events + bg_event 2, 0, 0, 1 + bg_event 3, 0, 0, 2 + bg_event 4, 1, 0, 3 + + db 1 ; person events + object_event 2, 3, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +OldCityTower5F_Blocks:: +INCBIN "maps/OldCityTower5F.blk" diff --git a/data/maps/objects/PlayerHouse1F.asm b/data/maps/objects/PlayerHouse1F.asm new file mode 100644 index 0000000..4721993 --- /dev/null +++ b/data/maps/objects/PlayerHouse1F.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/PlayerHouse1F.asm", ROMX + + map_attributes PlayerHouse1F, PLAYER_HOUSE_1F, 0 + +PlayerHouse1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 6, 7, 1, SILENT_HILL, wOverworldMapBlocks + 48 + warp_event 7, 7, 1, SILENT_HILL, wOverworldMapBlocks + 48 + warp_event 9, 0, 1, PLAYER_HOUSE_2F, wOverworldMapBlocks + 16 + + db 5 ; bg events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 2, 1, 0, 3 + bg_event 4, 1, 0, 4 + bg_event 5, 1, 0, 5 + + db 1 ; person events + object_event 7, 3, SPRITE_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +PlayerHouse1F_Blocks:: +INCBIN "maps/PlayerHouse1F.blk" diff --git a/data/maps/objects/PlayerHouse2F.asm b/data/maps/objects/PlayerHouse2F.asm new file mode 100644 index 0000000..6e6fc68 --- /dev/null +++ b/data/maps/objects/PlayerHouse2F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/PlayerHouse2F.asm", ROMX + + map_attributes PlayerHouse2F, PLAYER_HOUSE_2F, 0 + +PlayerHouse2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 9, 0, 3, PLAYER_HOUSE_1F, wOverworldMapBlocks + 16 + + db 5 ; bg events + bg_event 1, 1, 0, 1 + bg_event 2, 1, 0, 2 + bg_event 3, 1, 0, 3 + bg_event 5, 1, 0, 4 + bg_event 7, 2, 0, 5 + + db 2 ; person events + object_event 8, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 1, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +PlayerHouse2F_Blocks:: +INCBIN "maps/PlayerHouse2F.blk" diff --git a/data/maps/objects/PowerPlant1.asm b/data/maps/objects/PowerPlant1.asm new file mode 100644 index 0000000..9a8f33e --- /dev/null +++ b/data/maps/objects/PowerPlant1.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/PowerPlant1.asm", ROMX + + map_attributes PowerPlant1, POWER_PLANT_1, 0 + +PowerPlant1_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +PowerPlant1_Blocks:: +INCBIN "maps/PowerPlant1.blk" diff --git a/data/maps/objects/PowerPlant2.asm b/data/maps/objects/PowerPlant2.asm new file mode 100644 index 0000000..9f68bb5 --- /dev/null +++ b/data/maps/objects/PowerPlant2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/PowerPlant2.asm", ROMX + + map_attributes PowerPlant2, POWER_PLANT_2, 0 + +PowerPlant2_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +PowerPlant2_Blocks:: +INCBIN "maps/PowerPlant2.blk" diff --git a/data/maps/objects/PowerPlant3.asm b/data/maps/objects/PowerPlant3.asm new file mode 100644 index 0000000..46bdc0f --- /dev/null +++ b/data/maps/objects/PowerPlant3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/PowerPlant3.asm", ROMX + + map_attributes PowerPlant3, POWER_PLANT_3, 0 + +PowerPlant3_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +PowerPlant3_Blocks:: +INCBIN "maps/PowerPlant3.blk" diff --git a/data/maps/objects/PowerPlant4.asm b/data/maps/objects/PowerPlant4.asm new file mode 100644 index 0000000..9c5ee38 --- /dev/null +++ b/data/maps/objects/PowerPlant4.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/PowerPlant4.asm", ROMX + + map_attributes PowerPlant4, POWER_PLANT_4, 0 + +PowerPlant4_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +PowerPlant4_Blocks:: +INCBIN "maps/PowerPlant4.blk" diff --git a/data/maps/objects/Prince.asm b/data/maps/objects/Prince.asm new file mode 100644 index 0000000..8923d37 --- /dev/null +++ b/data/maps/objects/Prince.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Prince.asm", ROMX + + map_attributes Prince, PRINCE, NORTH | SOUTH + connection north, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10 + connection south, PrinceRoute, PRINCE_ROUTE, 0, 0, 10 + +Prince_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +Prince_Blocks:: +INCBIN "maps/Prince.blk" diff --git a/data/maps/objects/PrinceRoute.asm b/data/maps/objects/PrinceRoute.asm new file mode 100644 index 0000000..40ebef3 --- /dev/null +++ b/data/maps/objects/PrinceRoute.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/PrinceRoute.asm", ROMX + + map_attributes PrinceRoute, PRINCE_ROUTE, NORTH | SOUTH + connection north, Prince, PRINCE, 0, 0, 10 + connection south, SilentHill, SILENT_HILL, 0, 0, 10 + +PrinceRoute_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +PrinceRoute_Blocks:: +INCBIN "maps/PrinceRoute.blk" diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm new file mode 100644 index 0000000..7f3329e --- /dev/null +++ b/data/maps/objects/Route15.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route15.asm", ROMX + + map_attributes Route15, ROUTE_15, NORTH | EAST + connection north, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 10 + connection east, Newtype, NEWTYPE, 0, 0, 12 + +Route15_MapEvents:: + dw $4000 ; unknown + + db 7 ; warp events + warp_event 8, 5, 1, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 68 + warp_event 9, 5, 2, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 68 + warp_event 9, 10, 1, ROUTE_15_POKECENTER_1F, wOverworldMapBlocks + 131 + warp_event 14, 12, 6, ROUTE_15, wOverworldMapBlocks + 155 + warp_event 14, 13, 7, ROUTE_15, wOverworldMapBlocks + 155 + warp_event 21, 8, 4, ROUTE_15, wOverworldMapBlocks + 116 + warp_event 21, 9, 5, ROUTE_15, wOverworldMapBlocks + 116 + + db 0 ; bg events + + db 0 ; person events + +Route15_Blocks:: +INCBIN "maps/Route15.blk" diff --git a/data/maps/objects/Route15Pokecenter1F.asm b/data/maps/objects/Route15Pokecenter1F.asm new file mode 100644 index 0000000..a4dd565 --- /dev/null +++ b/data/maps/objects/Route15Pokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route15Pokecenter1F.asm", ROMX + + map_attributes Route15Pokecenter1F, ROUTE_15_POKECENTER_1F, 0 + +Route15Pokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 3, ROUTE_15, wOverworldMapBlocks + 59 + warp_event 6, 7, 3, ROUTE_15, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, ROUTE_15_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Route15Pokecenter1F_Blocks:: +INCBIN "maps/Route15Pokecenter1F.blk" diff --git a/data/maps/objects/Route15Pokecenter2F.asm b/data/maps/objects/Route15Pokecenter2F.asm new file mode 100644 index 0000000..9ac2787 --- /dev/null +++ b/data/maps/objects/Route15Pokecenter2F.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route15Pokecenter2F.asm", ROMX + + map_attributes Route15Pokecenter2F, ROUTE_15_POKECENTER_2F, 0 + +Route15Pokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, ROUTE_15_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 0 ; person events + +Route15Pokecenter2F_Blocks:: +INCBIN "maps/Route15Pokecenter2F.blk" diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm new file mode 100644 index 0000000..95d85f5 --- /dev/null +++ b/data/maps/objects/Route18.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route18.asm", ROMX + + map_attributes Route18, ROUTE_18, NORTH | WEST + connection north, BullForestRoute1, BULL_FOREST_ROUTE_1, 0, 0, 13 + connection west, NewtypeRoute, NEWTYPE_ROUTE, 36, 0, 9 + +Route18_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 8, 5, 1, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 53 + warp_event 9, 5, 2, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 53 + warp_event 13, 28, 1, ROUTE_18_POKECENTER_1F, wOverworldMapBlocks + 247 + + db 0 ; bg events + + db 0 ; person events + +Route18_Blocks:: +INCBIN "maps/Route18.blk" diff --git a/data/maps/objects/Route18Pokecenter1F.asm b/data/maps/objects/Route18Pokecenter1F.asm new file mode 100644 index 0000000..9018bcf --- /dev/null +++ b/data/maps/objects/Route18Pokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route18Pokecenter1F.asm", ROMX + + map_attributes Route18Pokecenter1F, ROUTE_18_POKECENTER_1F, 0 + +Route18Pokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 3, ROUTE_18, wOverworldMapBlocks + 59 + warp_event 6, 7, 3, ROUTE_18, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, ROUTE_18_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Route18Pokecenter1F_Blocks:: +INCBIN "maps/Route18Pokecenter1F.blk" diff --git a/data/maps/objects/Route18Pokecenter2F.asm b/data/maps/objects/Route18Pokecenter2F.asm new file mode 100644 index 0000000..6c95739 --- /dev/null +++ b/data/maps/objects/Route18Pokecenter2F.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route18Pokecenter2F.asm", ROMX + + map_attributes Route18Pokecenter2F, ROUTE_18_POKECENTER_2F, 0 + +Route18Pokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, ROUTE_18_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 0 ; person events + +Route18Pokecenter2F_Blocks:: +INCBIN "maps/Route18Pokecenter2F.blk" diff --git a/data/maps/objects/Route1Gate1F.asm b/data/maps/objects/Route1Gate1F.asm new file mode 100644 index 0000000..fcbd314 --- /dev/null +++ b/data/maps/objects/Route1Gate1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route1Gate1F.asm", ROMX + + map_attributes Route1Gate1F, ROUTE_1_GATE_1F, 0 + +Route1Gate1F_MapEvents:: + dw $4000 ; unknown + + db 5 ; warp events + warp_event 4, 7, 1, ROUTE_1_P2, wOverworldMapBlocks + 47 + warp_event 5, 7, 2, ROUTE_1_P2, wOverworldMapBlocks + 47 + warp_event 4, 0, 12, OLD_CITY, wOverworldMapBlocks + 14 + warp_event 5, 0, 13, OLD_CITY, wOverworldMapBlocks + 14 + warp_event 1, 0, 1, ROUTE_1_GATE_2F, wOverworldMapBlocks + 12 + + db 0 ; bg events + + db 2 ; person events + object_event 6, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Route1Gate1F_Blocks:: +INCBIN "maps/Route1Gate1F.blk" diff --git a/data/maps/objects/Route1Gate2F.asm b/data/maps/objects/Route1Gate2F.asm new file mode 100644 index 0000000..18fe387 --- /dev/null +++ b/data/maps/objects/Route1Gate2F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route1Gate2F.asm", ROMX + + map_attributes Route1Gate2F, ROUTE_1_GATE_2F, 0 + +Route1Gate2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 5, 0, 5, ROUTE_1_GATE_1F, wOverworldMapBlocks + 13 + + db 2 ; bg events + bg_event 1, 0, 0, 1 + bg_event 3, 0, 0, 2 + + db 2 ; person events + object_event 3, 3, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 4, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Route1Gate2F_Blocks:: +INCBIN "maps/Route1Gate2F.blk" diff --git a/data/maps/objects/Route1P1.asm b/data/maps/objects/Route1P1.asm new file mode 100644 index 0000000..f779b26 --- /dev/null +++ b/data/maps/objects/Route1P1.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route1P1.asm", ROMX + + map_attributes Route1P1, ROUTE_1_P1, WEST | EAST + connection west, Route1P2, ROUTE_1_P2, -3, 6, 12 + connection east, SilentHill, SILENT_HILL, 0, 0, 9 + +Route1P1_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 8, 8, 2, SHIZUKANA_OKA, wOverworldMapBlocks + 110 + warp_event 8, 9, 3, SHIZUKANA_OKA, wOverworldMapBlocks + 110 + + db 2 ; bg events + bg_event 12, 7, 0, 1 + bg_event 20, 8, 0, 2 + + db 2 ; person events + object_event 20, 5, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 18, 12, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + +Route1P1_Blocks:: +INCBIN "maps/Route1P1.blk" diff --git a/data/maps/objects/Route1P2.asm b/data/maps/objects/Route1P2.asm new file mode 100644 index 0000000..96b2d46 --- /dev/null +++ b/data/maps/objects/Route1P2.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route1P2.asm", ROMX + + map_attributes Route1P2, ROUTE_1_P2, NORTH | EAST + connection north, OldCity, OLD_CITY, -3, 2, 16 + connection east, Route1P1, ROUTE_1_P1, 9, 0, 9 + +Route1P2_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 8, 5, 1, ROUTE_1_GATE_1F, wOverworldMapBlocks + 53 + warp_event 9, 5, 2, ROUTE_1_GATE_1F, wOverworldMapBlocks + 53 + warp_event 8, 25, 6, SHIZUKANA_OKA, wOverworldMapBlocks + 213 + warp_event 9, 25, 9, SHIZUKANA_OKA, wOverworldMapBlocks + 213 + + db 1 ; bg events + bg_event 10, 20, 0, 1 + + db 2 ; person events + object_event 8, 6, SPRITE_SILVER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 15, SPRITE_TEACHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + +Route1P2_Blocks:: +INCBIN "maps/Route1P2.blk" diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm new file mode 100644 index 0000000..f17db86 --- /dev/null +++ b/data/maps/objects/Route2.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route2.asm", ROMX + + map_attributes Route2, ROUTE_2, WEST | EAST + connection west, West, WEST, -3, 2, 15 + connection east, OldCity, OLD_CITY, -3, 2, 15 + +Route2_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 6, 5, 3, ROUTE_2_GATE_1F, wOverworldMapBlocks + 67 + warp_event 15, 4, 1, ROUTE_2_HOUSE, wOverworldMapBlocks + 71 + + db 3 ; bg events + bg_event 15, 4, 0, 3 + bg_event 14, 5, 0, 1 + bg_event 24, 10, 0, 2 + + db 3 ; person events + object_event 19, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 + object_event 15, 7, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 8, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + +Route2_Blocks:: +INCBIN "maps/Route2.blk" diff --git a/data/maps/objects/Route2Gate1F.asm b/data/maps/objects/Route2Gate1F.asm new file mode 100644 index 0000000..a9639b0 --- /dev/null +++ b/data/maps/objects/Route2Gate1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route2Gate1F.asm", ROMX + + map_attributes Route2Gate1F, ROUTE_2_GATE_1F, 0 + +Route2Gate1F_MapEvents:: + dw $4000 ; unknown + + db 5 ; warp events + warp_event 0, 7, 13, WEST, wOverworldMapBlocks + 45 + warp_event 1, 7, 13, WEST, wOverworldMapBlocks + 45 + warp_event 8, 7, 1, ROUTE_2, wOverworldMapBlocks + 49 + warp_event 9, 7, 1, ROUTE_2, wOverworldMapBlocks + 49 + warp_event 1, 0, 1, ROUTE_2_GATE_2F, wOverworldMapBlocks + 12 + + db 0 ; bg events + + db 2 ; person events + object_event 8, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 1, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Route2Gate1F_Blocks:: +INCBIN "maps/Route2Gate1F.blk" diff --git a/data/maps/objects/Route2Gate2F.asm b/data/maps/objects/Route2Gate2F.asm new file mode 100644 index 0000000..1fc7984 --- /dev/null +++ b/data/maps/objects/Route2Gate2F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route2Gate2F.asm", ROMX + + map_attributes Route2Gate2F, ROUTE_2_GATE_2F, 0 + +Route2Gate2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 5, 0, 5, ROUTE_2_GATE_1F, wOverworldMapBlocks + 13 + + db 2 ; bg events + bg_event 1, 0, 0, 1 + bg_event 3, 0, 0, 2 + + db 2 ; person events + object_event 2, 2, SPRITE_LASS, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 4, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Route2Gate2F_Blocks:: +INCBIN "maps/Route2Gate2F.blk" diff --git a/data/maps/objects/Route2House.asm b/data/maps/objects/Route2House.asm new file mode 100644 index 0000000..2088ef6 --- /dev/null +++ b/data/maps/objects/Route2House.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Route2House.asm", ROMX + + map_attributes Route2House, ROUTE_2_HOUSE, 0 + +Route2House_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 2, ROUTE_2, wOverworldMapBlocks + 43 + warp_event 5, 7, 2, ROUTE_2, wOverworldMapBlocks + 43 + + db 6 ; bg events + bg_event 0, 0, 0, 1 + bg_event 2, 0, 0, 1 + bg_event 4, 0, 0, 1 + bg_event 6, 0, 0, 1 + bg_event 0, 3, 0, 2 + bg_event 4, 3, 0, 3 + + db 1 ; person events + object_event 6, 6, SPRITE_SCIENTIST, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Route2House_Blocks:: +INCBIN "maps/Route2House.blk" diff --git a/data/maps/objects/RouteSilentEast.asm b/data/maps/objects/RouteSilentEast.asm new file mode 100644 index 0000000..825ee45 --- /dev/null +++ b/data/maps/objects/RouteSilentEast.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/RouteSilentEast.asm", ROMX + + map_attributes RouteSilentEast, ROUTE_SILENT_EAST, WEST | EAST + connection west, SilentHill, SILENT_HILL, 0, 0, 9 + connection east, Kanto, KANTO, -3, 6, 15 + +RouteSilentEast_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 55, 9, 1, ROUTE_SILENT_EAST_GATE, wOverworldMapBlocks + 208 + + db 0 ; bg events + + db 0 ; person events + +RouteSilentEast_Blocks:: +INCBIN "maps/RouteSilentEast.blk" diff --git a/data/maps/objects/RouteSilentEastGate.asm b/data/maps/objects/RouteSilentEastGate.asm new file mode 100644 index 0000000..e292b83 --- /dev/null +++ b/data/maps/objects/RouteSilentEastGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/RouteSilentEastGate.asm", ROMX + + map_attributes RouteSilentEastGate, ROUTE_SILENT_EAST_GATE, 0 + +RouteSilentEastGate_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 0, 7, 1, ROUTE_SILENT_EAST, wOverworldMapBlocks + 45 + warp_event 1, 7, 1, ROUTE_SILENT_EAST, wOverworldMapBlocks + 45 + warp_event 8, 7, 29, KANTO, wOverworldMapBlocks + 49 + warp_event 9, 7, 29, KANTO, wOverworldMapBlocks + 49 + + db 0 ; bg events + + db 0 ; person events + +RouteSilentEastGate_Blocks:: +INCBIN "maps/RouteSilentEastGate.blk" diff --git a/data/maps/objects/RuinsOfAlphEntrance.asm b/data/maps/objects/RuinsOfAlphEntrance.asm new file mode 100644 index 0000000..e0e5d1f --- /dev/null +++ b/data/maps/objects/RuinsOfAlphEntrance.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/RuinsOfAlphEntrance.asm", ROMX + + map_attributes RuinsOfAlphEntrance, RUINS_OF_ALPH_ENTRANCE, 0 + +RuinsOfAlphEntrance_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +RuinsOfAlphEntrance_Blocks:: +INCBIN "maps/RuinsOfAlphEntrance.blk" diff --git a/data/maps/objects/RuinsOfAlphMain.asm b/data/maps/objects/RuinsOfAlphMain.asm new file mode 100644 index 0000000..decc978 --- /dev/null +++ b/data/maps/objects/RuinsOfAlphMain.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/RuinsOfAlphMain.asm", ROMX + + map_attributes RuinsOfAlphMain, RUINS_OF_ALPH_MAIN, 0 + +RuinsOfAlphMain_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +RuinsOfAlphMain_Blocks:: +INCBIN "maps/RuinsOfAlphMain.blk" diff --git a/data/maps/objects/ShizukanaOka.asm b/data/maps/objects/ShizukanaOka.asm new file mode 100644 index 0000000..e4c1e51 --- /dev/null +++ b/data/maps/objects/ShizukanaOka.asm @@ -0,0 +1,35 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/ShizukanaOka.asm", ROMX + + map_attributes ShizukanaOka, SHIZUKANA_OKA, 0 + +ShizukanaOka_MapEvents:: + dw $4000 ; unknown + + db 10 ; warp events + warp_event 49, 28, 1, ROUTE_1_P1, wOverworldMapBlocks + 490 + warp_event 49, 29, 1, ROUTE_1_P1, wOverworldMapBlocks + 490 + warp_event 49, 30, 2, ROUTE_1_P1, wOverworldMapBlocks + 521 + warp_event 49, 31, 2, ROUTE_1_P1, wOverworldMapBlocks + 521 + warp_event 4, 0, 3, ROUTE_1_P2, wOverworldMapBlocks + 34 + warp_event 5, 0, 3, ROUTE_1_P2, wOverworldMapBlocks + 34 + warp_event 6, 0, 3, ROUTE_1_P2, wOverworldMapBlocks + 35 + warp_event 7, 0, 4, ROUTE_1_P2, wOverworldMapBlocks + 35 + warp_event 8, 0, 4, ROUTE_1_P2, wOverworldMapBlocks + 36 + warp_event 9, 0, 4, ROUTE_1_P2, wOverworldMapBlocks + 36 + + db 2 ; bg events + bg_event 9, 2, 0, 1 + bg_event 47, 28, 0, 2 + + db 6 ; person events + object_event 41, 28, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 7, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 + object_event 41, 19, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 + object_event 27, 14, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 36, 16, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 + object_event 9, 25, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 + +ShizukanaOka_Blocks:: +INCBIN "maps/ShizukanaOka.blk" diff --git a/data/maps/objects/SilentHill.asm b/data/maps/objects/SilentHill.asm new file mode 100644 index 0000000..1e3d49f --- /dev/null +++ b/data/maps/objects/SilentHill.asm @@ -0,0 +1,34 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SilentHill.asm", ROMX + + map_attributes SilentHill, SILENT_HILL, NORTH | WEST | EAST + connection north, PrinceRoute, PRINCE_ROUTE, 0, 0, 10 + connection west, Route1P1, ROUTE_1_P1, 0, 0, 9 + connection east, RouteSilentEast, ROUTE_SILENT_EAST, 0, 0, 9 + +SilentHill_MapEvents:: + dw $4000 ; unknown + + db 5 ; warp events + warp_event 5, 4, 1, PLAYER_HOUSE_1F, wOverworldMapBlocks + 51 + warp_event 13, 4, 1, SILENT_HILL_POKECENTER, wOverworldMapBlocks + 55 + warp_event 3, 12, 1, SILENT_HILL_HOUSE, wOverworldMapBlocks + 114 + warp_event 14, 11, 1, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 104 + warp_event 15, 11, 2, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 104 + + db 5 ; bg events + bg_event 8, 4, 0, 1 + bg_event 14, 4, 0, 2 + bg_event 16, 5, 0, 3 + bg_event 10, 11, 0, 4 + bg_event 6, 12, 0, 5 + + db 4 ; person events + object_event 6, 10, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 9, SPRITE_BLUE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 6, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 13, SPRITE_SUPER_NERD, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SilentHill_Blocks:: +INCBIN "maps/SilentHill.blk" diff --git a/data/maps/objects/SilentHillHouse.asm b/data/maps/objects/SilentHillHouse.asm new file mode 100644 index 0000000..eb2fb03 --- /dev/null +++ b/data/maps/objects/SilentHillHouse.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SilentHillHouse.asm", ROMX + + map_attributes SilentHillHouse, SILENT_HILL_HOUSE, 0 + +SilentHillHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 3, SILENT_HILL, wOverworldMapBlocks + 47 + warp_event 5, 7, 3, SILENT_HILL, wOverworldMapBlocks + 47 + + db 6 ; bg events + bg_event 0, 1, 0, 1 + bg_event 4, 1, 0, 2 + bg_event 5, 1, 0, 3 + bg_event 9, 1, 0, 4 + bg_event 8, 1, 0, 5 + bg_event 2, 0, 0, 6 + + db 2 ; person events + object_event 5, 3, SPRITE_SILVERS_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SilentHillHouse_Blocks:: +INCBIN "maps/SilentHillHouse.blk" diff --git a/data/maps/objects/SilentHillLabBack.asm b/data/maps/objects/SilentHillLabBack.asm new file mode 100644 index 0000000..ed60cec --- /dev/null +++ b/data/maps/objects/SilentHillLabBack.asm @@ -0,0 +1,29 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SilentHillLabBack.asm", ROMX + + map_attributes SilentHillLabBack, SILENT_HILL_LAB_BACK, 0 + +SilentHillLabBack_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 3, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 42 + warp_event 4, 7, 3, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 43 + + db 5 ; bg events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 2, 1, 0, 3 + bg_event 3, 1, 0, 4 + bg_event 6, 0, 0, 5 + + db 5 ; person events + object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 4, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SilentHillLabBack_Blocks:: +INCBIN "maps/SilentHillLabBack.blk" diff --git a/data/maps/objects/SilentHillLabFront.asm b/data/maps/objects/SilentHillLabFront.asm new file mode 100644 index 0000000..66cb05a --- /dev/null +++ b/data/maps/objects/SilentHillLabFront.asm @@ -0,0 +1,46 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SilentHillLabFront.asm", ROMX + + map_attributes SilentHillLabFront, SILENT_HILL_LAB_FRONT, 0 + +SilentHillLabFront_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 3, 15, 4, SILENT_HILL, wOverworldMapBlocks + 82 + warp_event 4, 15, 5, SILENT_HILL, wOverworldMapBlocks + 83 + warp_event 4, 0, 2, SILENT_HILL_LAB_BACK, wOverworldMapBlocks + 13 + + db 15 ; bg events + bg_event 6, 1, 0, 1 + bg_event 2, 0, 0, 2 + bg_event 0, 7, 0, 3 + bg_event 1, 7, 0, 4 + bg_event 2, 7, 0, 5 + bg_event 5, 7, 0, 6 + bg_event 6, 7, 0, 7 + bg_event 7, 7, 0, 8 + bg_event 0, 11, 0, 9 + bg_event 1, 11, 0, 10 + bg_event 2, 11, 0, 11 + bg_event 5, 11, 0, 12 + bg_event 6, 11, 0, 13 + bg_event 7, 11, 0, 14 + bg_event 4, 0, 0, 15 + + db 11 ; person events + object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 0, SPRITE_OKIDO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 4, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 0, SPRITE_SILVER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 14, SPRITE_BLUE, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 3, SPRITE_BLUE, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 13, SPRITE_NANAMI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 8, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 12, SPRITE_SCIENTIST, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SilentHillLabFront_Blocks:: +INCBIN "maps/SilentHillLabFront.blk" diff --git a/data/maps/objects/SilentHillPokecenter.asm b/data/maps/objects/SilentHillPokecenter.asm new file mode 100644 index 0000000..cd68ffc --- /dev/null +++ b/data/maps/objects/SilentHillPokecenter.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SilentHillPokecenter.asm", ROMX + + map_attributes SilentHillPokecenter, SILENT_HILL_POKECENTER, 0 + +SilentHillPokecenter_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 5, 7, 2, SILENT_HILL, wOverworldMapBlocks + 59 + warp_event 6, 7, 2, SILENT_HILL, wOverworldMapBlocks + 60 + + db 1 ; bg events + bg_event 13, 1, 0, 1 + + db 5 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 4, SPRITE_24, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_SIDON, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SilentHillPokecenter_Blocks:: +INCBIN "maps/SilentHillPokecenter.blk" diff --git a/data/maps/objects/SlowpokeWellEntrance.asm b/data/maps/objects/SlowpokeWellEntrance.asm new file mode 100644 index 0000000..3c7ede6 --- /dev/null +++ b/data/maps/objects/SlowpokeWellEntrance.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SlowpokeWellEntrance.asm", ROMX + + map_attributes SlowpokeWellEntrance, SLOWPOKE_WELL_ENTRANCE, 0 + +SlowpokeWellEntrance_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +SlowpokeWellEntrance_Blocks:: +INCBIN "maps/SlowpokeWellEntrance.blk" diff --git a/data/maps/objects/SlowpokeWellMain.asm b/data/maps/objects/SlowpokeWellMain.asm new file mode 100644 index 0000000..0a20a6f --- /dev/null +++ b/data/maps/objects/SlowpokeWellMain.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SlowpokeWellMain.asm", ROMX + + map_attributes SlowpokeWellMain, SLOWPOKE_WELL_MAIN, 0 + +SlowpokeWellMain_MapEvents:: + dw $0 ; unknown + + db 0 ; warp events + + db 0 ; bg events + + db 0 ; person events + +SlowpokeWellMain_Blocks:: +INCBIN "maps/SlowpokeWellMain.blk" diff --git a/data/maps/objects/South.asm b/data/maps/objects/South.asm new file mode 100644 index 0000000..8c7dd82 --- /dev/null +++ b/data/maps/objects/South.asm @@ -0,0 +1,38 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/South.asm", ROMX + + map_attributes South, SOUTH, NORTH | SOUTH | EAST + connection north, FontoRoute5, FONTO_ROUTE_5, 10, 0, 10 + connection south, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, 10, 0, 10 + connection east, FontoRoute1, FONTO_ROUTE_1, 0, 0, 9 + +South_MapEvents:: + dw $4000 ; unknown + + db 9 ; warp events + warp_event 26, 10, 1, SOUTH_HOUSE_1, wOverworldMapBlocks + 170 + warp_event 33, 14, 1, SOUTH_POKECENTER_1F, wOverworldMapBlocks + 225 + warp_event 19, 22, 1, SOUTH_MART, wOverworldMapBlocks + 322 + warp_event 33, 23, 1, SOUTH_HOUSE_2, wOverworldMapBlocks + 329 + warp_event 30, 5, 1, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 94 + warp_event 31, 5, 2, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 94 + warp_event 35, 19, 2, FONTO_ROUTE_GATE_1, wOverworldMapBlocks + 278 + warp_event 30, 30, 3, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 432 + warp_event 31, 30, 4, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 432 + + db 5 ; bg events + bg_event 30, 14, 0, 1 + bg_event 34, 14, 0, 2 + bg_event 28, 17, 0, 3 + bg_event 16, 22, 0, 4 + bg_event 20, 22, 0, 5 + + db 4 ; person events + object_event 25, 21, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 24, 21, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 22, 16, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 30, 11, SPRITE_FISHING_GURU, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + +South_Blocks:: +INCBIN "maps/South.blk" diff --git a/data/maps/objects/SouthHouse1.asm b/data/maps/objects/SouthHouse1.asm new file mode 100644 index 0000000..07db5fa --- /dev/null +++ b/data/maps/objects/SouthHouse1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SouthHouse1.asm", ROMX + + map_attributes SouthHouse1, SOUTH_HOUSE_1, 0 + +SouthHouse1_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 1, SOUTH, wOverworldMapBlocks + 47 + warp_event 5, 7, 1, SOUTH, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 2, 3, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SouthHouse1_Blocks:: +INCBIN "maps/SouthHouse1.blk" diff --git a/data/maps/objects/SouthHouse2.asm b/data/maps/objects/SouthHouse2.asm new file mode 100644 index 0000000..2474d72 --- /dev/null +++ b/data/maps/objects/SouthHouse2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SouthHouse2.asm", ROMX + + map_attributes SouthHouse2, SOUTH_HOUSE_2, 0 + +SouthHouse2_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 4, SOUTH, wOverworldMapBlocks + 47 + warp_event 5, 7, 4, SOUTH, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 1, 2, SPRITE_FISHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SouthHouse2_Blocks:: +INCBIN "maps/SouthHouse2.blk" diff --git a/data/maps/objects/SouthMart.asm b/data/maps/objects/SouthMart.asm new file mode 100644 index 0000000..a173179 --- /dev/null +++ b/data/maps/objects/SouthMart.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SouthMart.asm", ROMX + + map_attributes SouthMart, SOUTH_MART, 0 + +SouthMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 3, SOUTH, wOverworldMapBlocks + 59 + warp_event 5, 7, 3, SOUTH, wOverworldMapBlocks + 59 + + db 0 ; bg events + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SouthMart_Blocks:: +INCBIN "maps/SouthMart.blk" diff --git a/data/maps/objects/SouthPokecenter1F.asm b/data/maps/objects/SouthPokecenter1F.asm new file mode 100644 index 0000000..3cfe73c --- /dev/null +++ b/data/maps/objects/SouthPokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SouthPokecenter1F.asm", ROMX + + map_attributes SouthPokecenter1F, SOUTH_POKECENTER_1F, 0 + +SouthPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 2, SOUTH, wOverworldMapBlocks + 59 + warp_event 6, 7, 2, SOUTH, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, SOUTH_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SouthPokecenter1F_Blocks:: +INCBIN "maps/SouthPokecenter1F.blk" diff --git a/data/maps/objects/SouthPokecenter2F.asm b/data/maps/objects/SouthPokecenter2F.asm new file mode 100644 index 0000000..5674b0e --- /dev/null +++ b/data/maps/objects/SouthPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SouthPokecenter2F.asm", ROMX + + map_attributes SouthPokecenter2F, SOUTH_POKECENTER_2F, 0 + +SouthPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, SOUTH_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SouthPokecenter2F_Blocks:: +INCBIN "maps/SouthPokecenter2F.blk" diff --git a/data/maps/objects/Stand.asm b/data/maps/objects/Stand.asm new file mode 100644 index 0000000..730f369 --- /dev/null +++ b/data/maps/objects/Stand.asm @@ -0,0 +1,48 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Stand.asm", ROMX + + map_attributes Stand, STAND, NORTH | SOUTH + connection north, BullForestRoute2, BULL_FOREST_ROUTE_2, 10, 0, 10 + connection south, StandRoute, STAND_ROUTE, 10, 0, 10 + +Stand_MapEvents:: + dw $4000 ; unknown + + db 10 ; warp events + warp_event 24, 17, 1, STAND_LAB, wOverworldMapBlocks + 247 + warp_event 33, 20, 1, STAND_POKECENTER_1F, wOverworldMapBlocks + 303 + warp_event 16, 21, 1, STAND_OFFICE, wOverworldMapBlocks + 295 + warp_event 35, 26, 1, STAND_MART, wOverworldMapBlocks + 382 + warp_event 26, 29, 1, STAND_HOUSE, wOverworldMapBlocks + 404 + warp_event 17, 31, 1, STAND_ROCKET_HOUSE_1F, wOverworldMapBlocks + 425 + warp_event 34, 31, 1, STAND_LEAGUE_1F, wOverworldMapBlocks + 434 + warp_event 35, 31, 2, STAND_LEAGUE_1F, wOverworldMapBlocks + 434 + warp_event 30, 13, 1, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 198 + warp_event 31, 13, 2, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 198 + + db 10 ; bg events + bg_event 8, 8, 0, 1 + bg_event 14, 8, 0, 2 + bg_event 20, 10, 0, 3 + bg_event 16, 16, 0, 4 + bg_event 10, 20, 0, 5 + bg_event 18, 21, 0, 6 + bg_event 24, 20, 0, 7 + bg_event 34, 20, 0, 8 + bg_event 36, 26, 0, 9 + bg_event 32, 35, 0, 10 + + db 9 ; person events + object_event 10, 10, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 17, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 28, 19, SPRITE_ROCKER, FACE_RIGHT, 0, 3, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 30, 31, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 21, 8, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 6, SPRITE_PIPPI, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 15, SPRITE_POPPO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 21, SPRITE_SIDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Stand_Blocks:: +INCBIN "maps/Stand.blk" diff --git a/data/maps/objects/StandHouse.asm b/data/maps/objects/StandHouse.asm new file mode 100644 index 0000000..75655c0 --- /dev/null +++ b/data/maps/objects/StandHouse.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandHouse.asm", ROMX + + map_attributes StandHouse, STAND_HOUSE, 0 + +StandHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 5, STAND, wOverworldMapBlocks + 47 + warp_event 5, 7, 5, STAND, wOverworldMapBlocks + 47 + + db 0 ; bg events + + db 1 ; person events + object_event 2, 3, SPRITE_SUPER_NERD, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + +StandHouse_Blocks:: +INCBIN "maps/StandHouse.blk" diff --git a/data/maps/objects/StandLab.asm b/data/maps/objects/StandLab.asm new file mode 100644 index 0000000..eabce9c --- /dev/null +++ b/data/maps/objects/StandLab.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandLab.asm", ROMX + + map_attributes StandLab, STAND_LAB, 0 + +StandLab_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 1, STAND, wOverworldMapBlocks + 42 + warp_event 4, 7, 1, STAND, wOverworldMapBlocks + 43 + + db 0 ; bg events + + db 1 ; person events + object_event 2, 3, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +StandLab_Blocks:: +INCBIN "maps/StandLab.blk" diff --git a/data/maps/objects/StandLeague1F.asm b/data/maps/objects/StandLeague1F.asm new file mode 100644 index 0000000..00d550c --- /dev/null +++ b/data/maps/objects/StandLeague1F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandLeague1F.asm", ROMX + + map_attributes StandLeague1F, STAND_LEAGUE_1F, 0 + +StandLeague1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 3, 15, 7, STAND, wOverworldMapBlocks + 82 + warp_event 4, 15, 8, STAND, wOverworldMapBlocks + 83 + warp_event 7, 1, 1, STAND_LEAGUE_2F, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 5 ; person events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +StandLeague1F_Blocks:: +INCBIN "maps/StandLeague1F.blk" diff --git a/data/maps/objects/StandLeague2F.asm b/data/maps/objects/StandLeague2F.asm new file mode 100644 index 0000000..9b80537 --- /dev/null +++ b/data/maps/objects/StandLeague2F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandLeague2F.asm", ROMX + + map_attributes StandLeague2F, STAND_LEAGUE_2F, 0 + +StandLeague2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 7, 15, 3, STAND_LEAGUE_1F, wOverworldMapBlocks + 92 + + db 0 ; bg events + + db 5 ; person events + object_event 4, 7, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +StandLeague2F_Blocks:: +INCBIN "maps/StandLeague2F.blk" diff --git a/data/maps/objects/StandMart.asm b/data/maps/objects/StandMart.asm new file mode 100644 index 0000000..f05bc5b --- /dev/null +++ b/data/maps/objects/StandMart.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandMart.asm", ROMX + + map_attributes StandMart, STAND_MART, 0 + +StandMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 4, STAND, wOverworldMapBlocks + 59 + warp_event 5, 7, 4, STAND, wOverworldMapBlocks + 59 + + db 0 ; bg events + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +StandMart_Blocks:: +INCBIN "maps/StandMart.blk" diff --git a/data/maps/objects/StandOffice.asm b/data/maps/objects/StandOffice.asm new file mode 100644 index 0000000..a85dbeb --- /dev/null +++ b/data/maps/objects/StandOffice.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandOffice.asm", ROMX + + map_attributes StandOffice, STAND_OFFICE, 0 + +StandOffice_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 2, 7, 3, STAND, wOverworldMapBlocks + 58 + warp_event 3, 7, 3, STAND, wOverworldMapBlocks + 58 + + db 0 ; bg events + + db 3 ; person events + object_event 13, 4, SPRITE_ROCKER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 6, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 7, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +StandOffice_Blocks:: +INCBIN "maps/StandOffice.blk" diff --git a/data/maps/objects/StandPokecenter1F.asm b/data/maps/objects/StandPokecenter1F.asm new file mode 100644 index 0000000..76bfa3f --- /dev/null +++ b/data/maps/objects/StandPokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandPokecenter1F.asm", ROMX + + map_attributes StandPokecenter1F, STAND_POKECENTER_1F, 0 + +StandPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 2, STAND, wOverworldMapBlocks + 59 + warp_event 6, 7, 2, STAND, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, STAND_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +StandPokecenter1F_Blocks:: +INCBIN "maps/StandPokecenter1F.blk" diff --git a/data/maps/objects/StandPokecenter2F.asm b/data/maps/objects/StandPokecenter2F.asm new file mode 100644 index 0000000..ced417c --- /dev/null +++ b/data/maps/objects/StandPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandPokecenter2F.asm", ROMX + + map_attributes StandPokecenter2F, STAND_POKECENTER_2F, 0 + +StandPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, STAND_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +StandPokecenter2F_Blocks:: +INCBIN "maps/StandPokecenter2F.blk" diff --git a/data/maps/objects/StandRocketHouse1F.asm b/data/maps/objects/StandRocketHouse1F.asm new file mode 100644 index 0000000..6bda8de --- /dev/null +++ b/data/maps/objects/StandRocketHouse1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandRocketHouse1F.asm", ROMX + + map_attributes StandRocketHouse1F, STAND_ROCKET_HOUSE_1F, 0 + +StandRocketHouse1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 2, 7, 6, STAND, wOverworldMapBlocks + 58 + warp_event 3, 7, 6, STAND, wOverworldMapBlocks + 58 + warp_event 15, 1, 1, STAND_ROCKET_HOUSE_2F, wOverworldMapBlocks + 22 + + db 0 ; bg events + + db 1 ; person events + object_event 11, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +StandRocketHouse1F_Blocks:: +INCBIN "maps/StandRocketHouse1F.blk" diff --git a/data/maps/objects/StandRocketHouse2F.asm b/data/maps/objects/StandRocketHouse2F.asm new file mode 100644 index 0000000..5ed8d35 --- /dev/null +++ b/data/maps/objects/StandRocketHouse2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandRocketHouse2F.asm", ROMX + + map_attributes StandRocketHouse2F, STAND_ROCKET_HOUSE_2F, 0 + +StandRocketHouse2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 15, 1, 3, STAND_ROCKET_HOUSE_1F, wOverworldMapBlocks + 22 + + db 0 ; bg events + + db 1 ; person events + object_event 5, 4, SPRITE_ROCKET_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +StandRocketHouse2F_Blocks:: +INCBIN "maps/StandRocketHouse2F.blk" diff --git a/data/maps/objects/StandRoute.asm b/data/maps/objects/StandRoute.asm new file mode 100644 index 0000000..fabb1ae --- /dev/null +++ b/data/maps/objects/StandRoute.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandRoute.asm", ROMX + + map_attributes StandRoute, STAND_ROUTE, NORTH | SOUTH + connection north, Stand, STAND, -3, 7, 13 + connection south, KantoEastRoute, KANTO_EAST_ROUTE, -3, 7, 13 + +StandRoute_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 8, 48, 3, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 405 + warp_event 9, 48, 4, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 405 + + db 0 ; bg events + + db 0 ; person events + +StandRoute_Blocks:: +INCBIN "maps/StandRoute.blk" diff --git a/data/maps/objects/StandRouteGateKanto.asm b/data/maps/objects/StandRouteGateKanto.asm new file mode 100644 index 0000000..a80039f --- /dev/null +++ b/data/maps/objects/StandRouteGateKanto.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/StandRouteGateKanto.asm", ROMX + + map_attributes StandRouteGateKanto, STAND_ROUTE_GATE_KANTO, 0 + +StandRouteGateKanto_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 4, 7, 1, KANTO_EAST_ROUTE, wOverworldMapBlocks + 47 + warp_event 5, 7, 2, KANTO_EAST_ROUTE, wOverworldMapBlocks + 47 + warp_event 4, 0, 1, STAND_ROUTE, wOverworldMapBlocks + 14 + warp_event 5, 0, 2, STAND_ROUTE, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 0 ; person events + +StandRouteGateKanto_Blocks:: +INCBIN "maps/StandRouteGateKanto.blk" diff --git a/data/maps/objects/Sugar.asm b/data/maps/objects/Sugar.asm new file mode 100644 index 0000000..43fd16e --- /dev/null +++ b/data/maps/objects/Sugar.asm @@ -0,0 +1,29 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Sugar.asm", ROMX + + map_attributes Sugar, SUGAR, SOUTH + connection south, SugarRoute, SUGAR_ROUTE, 0, 0, 10 + +Sugar_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 5, 5, 1, SUGAR_HOUSE, wOverworldMapBlocks + 51 + warp_event 15, 9, 1, SUGAR_HOUSE_2, wOverworldMapBlocks + 88 + warp_event 5, 10, 1, SUGAR_MART, wOverworldMapBlocks + 99 + warp_event 9, 10, 1, SUGAR_POKECENTER_1F, wOverworldMapBlocks + 101 + + db 4 ; bg events + bg_event 14, 6, 0, 1 + bg_event 6, 10, 0, 2 + bg_event 10, 10, 0, 3 + bg_event 10, 14, 0, 4 + + db 3 ; person events + object_event 8, 12, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 11, SPRITE_GRAMPS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + +Sugar_Blocks:: +INCBIN "maps/Sugar.blk" diff --git a/data/maps/objects/SugarHouse.asm b/data/maps/objects/SugarHouse.asm new file mode 100644 index 0000000..9e1f697 --- /dev/null +++ b/data/maps/objects/SugarHouse.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SugarHouse.asm", ROMX + + map_attributes SugarHouse, SUGAR_HOUSE, 0 + +SugarHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 15, 1, SUGAR, wOverworldMapBlocks + 82 + warp_event 4, 15, 1, SUGAR, wOverworldMapBlocks + 83 + + db 0 ; bg events + + db 3 ; person events + object_event 3, 5, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 5, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SugarHouse_Blocks:: +INCBIN "maps/SugarHouse.blk" diff --git a/data/maps/objects/SugarHouse2.asm b/data/maps/objects/SugarHouse2.asm new file mode 100644 index 0000000..4d74ca0 --- /dev/null +++ b/data/maps/objects/SugarHouse2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SugarHouse2.asm", ROMX + + map_attributes SugarHouse2, SUGAR_HOUSE_2, 0 + +SugarHouse2_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 3, 7, 2, SUGAR, wOverworldMapBlocks + 42 + warp_event 4, 7, 2, SUGAR, wOverworldMapBlocks + 43 + + db 0 ; bg events + + db 1 ; person events + object_event 2, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SugarHouse2_Blocks:: +INCBIN "maps/SugarHouse2.blk" diff --git a/data/maps/objects/SugarMart.asm b/data/maps/objects/SugarMart.asm new file mode 100644 index 0000000..8bae8e3 --- /dev/null +++ b/data/maps/objects/SugarMart.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SugarMart.asm", ROMX + + map_attributes SugarMart, SUGAR_MART, 0 + +SugarMart_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 3, SUGAR, wOverworldMapBlocks + 59 + warp_event 5, 7, 3, SUGAR, wOverworldMapBlocks + 59 + + db 0 ; bg events + + db 3 ; person events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SugarMart_Blocks:: +INCBIN "maps/SugarMart.blk" diff --git a/data/maps/objects/SugarPokecenter1F.asm b/data/maps/objects/SugarPokecenter1F.asm new file mode 100644 index 0000000..f43eae9 --- /dev/null +++ b/data/maps/objects/SugarPokecenter1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SugarPokecenter1F.asm", ROMX + + map_attributes SugarPokecenter1F, SUGAR_POKECENTER_1F, 0 + +SugarPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 4, SUGAR, wOverworldMapBlocks + 59 + warp_event 6, 7, 4, SUGAR, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, SUGAR_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SugarPokecenter1F_Blocks:: +INCBIN "maps/SugarPokecenter1F.blk" diff --git a/data/maps/objects/SugarPokecenter2F.asm b/data/maps/objects/SugarPokecenter2F.asm new file mode 100644 index 0000000..903a0b3 --- /dev/null +++ b/data/maps/objects/SugarPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SugarPokecenter2F.asm", ROMX + + map_attributes SugarPokecenter2F, SUGAR_POKECENTER_2F, 0 + +SugarPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, SUGAR_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 0 ; bg events + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +SugarPokecenter2F_Blocks:: +INCBIN "maps/SugarPokecenter2F.blk" diff --git a/data/maps/objects/SugarRoute.asm b/data/maps/objects/SugarRoute.asm new file mode 100644 index 0000000..9f8469a --- /dev/null +++ b/data/maps/objects/SugarRoute.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SugarRoute.asm", ROMX + + map_attributes SugarRoute, SUGAR_ROUTE, NORTH | SOUTH + connection north, Sugar, SUGAR, 0, 0, 10 + connection south, Newtype, NEWTYPE, -3, 2, 16 + +SugarRoute_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 8, 48, 3, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 405 + warp_event 9, 48, 4, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 405 + + db 0 ; bg events + + db 0 ; person events + +SugarRoute_Blocks:: +INCBIN "maps/SugarRoute.blk" diff --git a/data/maps/objects/SugarRouteGate.asm b/data/maps/objects/SugarRouteGate.asm new file mode 100644 index 0000000..2ebce43 --- /dev/null +++ b/data/maps/objects/SugarRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/SugarRouteGate.asm", ROMX + + map_attributes SugarRouteGate, SUGAR_ROUTE_GATE, 0 + +SugarRouteGate_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 4, 7, 12, NEWTYPE, wOverworldMapBlocks + 47 + warp_event 5, 7, 13, NEWTYPE, wOverworldMapBlocks + 47 + warp_event 4, 0, 1, SUGAR_ROUTE, wOverworldMapBlocks + 14 + warp_event 5, 0, 2, SUGAR_ROUTE, wOverworldMapBlocks + 14 + + db 0 ; bg events + + db 0 ; person events + +SugarRouteGate_Blocks:: +INCBIN "maps/SugarRouteGate.blk" diff --git a/data/maps/objects/UnusedMap13.asm b/data/maps/objects/UnusedMap13.asm new file mode 100644 index 0000000..f5564e3 --- /dev/null +++ b/data/maps/objects/UnusedMap13.asm @@ -0,0 +1,9 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/UnusedMap13.asm", ROMX + + map_attributes UnusedMap13, UNUSED_MAP_13, 0 + +UnusedMap13_MapEvents:: +UnusedMap13_Blocks:: +INCBIN "maps/UnusedMap13.blk" diff --git a/data/maps/objects/West.asm b/data/maps/objects/West.asm new file mode 100644 index 0000000..3884b21 --- /dev/null +++ b/data/maps/objects/West.asm @@ -0,0 +1,45 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/West.asm", ROMX + + map_attributes West, WEST, NORTH | EAST + connection north, BaadonRoute1, BAADON_ROUTE_1, 5, 0, 10 + connection east, Route2, ROUTE_2, 5, 0, 9 + +West_MapEvents:: + dw $4000 ; unknown + + db 13 ; warp events + warp_event 13, 5, 1, WEST_MART_1F, wOverworldMapBlocks + 85 + warp_event 14, 5, 2, WEST_MART_1F, wOverworldMapBlocks + 86 + warp_event 31, 7, 1, WEST_RADIO_TOWER_1F, wOverworldMapBlocks + 120 + warp_event 32, 7, 2, WEST_RADIO_TOWER_1F, wOverworldMapBlocks + 121 + warp_event 18, 12, 1, WEST_ROCKET_RAIDED_HOUSE, wOverworldMapBlocks + 192 + warp_event 25, 14, 1, WEST_POKECENTER_1F, wOverworldMapBlocks + 221 + warp_event 14, 19, 1, WEST_GYM, wOverworldMapBlocks + 268 + warp_event 15, 19, 2, WEST_GYM, wOverworldMapBlocks + 268 + warp_event 26, 19, 1, WEST_HOUSE_1, wOverworldMapBlocks + 274 + warp_event 32, 19, 1, WEST_HOUSE_2, wOverworldMapBlocks + 277 + warp_event 22, 5, 1, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 90 + warp_event 23, 5, 2, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 90 + warp_event 35, 15, 1, ROUTE_2_GATE_1F, wOverworldMapBlocks + 226 + + db 6 ; bg events + bg_event 16, 7, 0, 1 + bg_event 28, 9, 0, 2 + bg_event 12, 10, 0, 3 + bg_event 32, 12, 0, 4 + bg_event 26, 14, 0, 5 + bg_event 18, 20, 0, 6 + + db 7 ; person events + object_event 6, 8, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 12, 7, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 26, 10, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 30, 14, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 29, 14, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 22, 19, SPRITE_COOLTRAINER_F, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 18, 13, SPRITE_36, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +West_Blocks:: +INCBIN "maps/West.blk" diff --git a/data/maps/objects/WestGym.asm b/data/maps/objects/WestGym.asm new file mode 100644 index 0000000..de11175 --- /dev/null +++ b/data/maps/objects/WestGym.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestGym.asm", ROMX + + map_attributes WestGym, WEST_GYM, 0 + +WestGym_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 17, 7, WEST, wOverworldMapBlocks + 102 + warp_event 5, 17, 8, WEST, wOverworldMapBlocks + 102 + + db 2 ; bg events + bg_event 3, 15, 0, 1 + bg_event 6, 15, 0, 1 + + db 6 ; person events + object_event 4, 4, SPRITE_TSUKUSHI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 7, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 3, 11, SPRITE_COOLTRAINER_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 5, 9, SPRITE_LASS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 4, 6, SPRITE_TWIN, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestGym_Blocks:: +INCBIN "maps/WestGym.blk" diff --git a/data/maps/objects/WestHouse1.asm b/data/maps/objects/WestHouse1.asm new file mode 100644 index 0000000..5796355 --- /dev/null +++ b/data/maps/objects/WestHouse1.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestHouse1.asm", ROMX + + map_attributes WestHouse1, WEST_HOUSE_1, 0 + +WestHouse1_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 9, WEST, wOverworldMapBlocks + 47 + warp_event 5, 7, 9, WEST, wOverworldMapBlocks + 47 + + db 4 ; bg events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 5, 1, 0, 3 + bg_event 8, 0, 0, 4 + + db 3 ; person events + object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 6, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 4, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestHouse1_Blocks:: +INCBIN "maps/WestHouse1.blk" diff --git a/data/maps/objects/WestHouse2.asm b/data/maps/objects/WestHouse2.asm new file mode 100644 index 0000000..be8ea8f --- /dev/null +++ b/data/maps/objects/WestHouse2.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestHouse2.asm", ROMX + + map_attributes WestHouse2, WEST_HOUSE_2, 0 + +WestHouse2_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 10, WEST, wOverworldMapBlocks + 47 + warp_event 5, 7, 10, WEST, wOverworldMapBlocks + 47 + + db 4 ; bg events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 5, 1, 0, 3 + bg_event 8, 0, 0, 4 + + db 3 ; person events + object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 6, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_BUG_CATCHER_BOY, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +WestHouse2_Blocks:: +INCBIN "maps/WestHouse2.blk" diff --git a/data/maps/objects/WestMart1F.asm b/data/maps/objects/WestMart1F.asm new file mode 100644 index 0000000..f3a0415 --- /dev/null +++ b/data/maps/objects/WestMart1F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestMart1F.asm", ROMX + + map_attributes WestMart1F, WEST_MART_1F, 0 + +WestMart1F_MapEvents:: + dw $4000 ; unknown + + db 4 ; warp events + warp_event 13, 7, 1, WEST, wOverworldMapBlocks + 63 + warp_event 14, 7, 2, WEST, wOverworldMapBlocks + 64 + warp_event 15, 0, 2, WEST_MART_2F, wOverworldMapBlocks + 22 + warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 + + db 2 ; bg events + bg_event 14, 0, 0, 1 + bg_event 3, 0, 0, 2 + + db 1 ; person events + object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestMart1F_Blocks:: +INCBIN "maps/WestMart1F.blk" diff --git a/data/maps/objects/WestMart2F.asm b/data/maps/objects/WestMart2F.asm new file mode 100644 index 0000000..853fe93 --- /dev/null +++ b/data/maps/objects/WestMart2F.asm @@ -0,0 +1,40 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestMart2F.asm", ROMX + + map_attributes WestMart2F, WEST_MART_2F, 0 + +WestMart2F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 12, 0, 1, WEST_MART_3F, wOverworldMapBlocks + 21 + warp_event 15, 0, 3, WEST_MART_1F, wOverworldMapBlocks + 22 + warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 + + db 16 ; bg events + bg_event 14, 0, 0, 1 + bg_event 3, 0, 0, 2 + bg_event 3, 4, 0, 3 + bg_event 3, 5, 0, 3 + bg_event 3, 6, 0, 3 + bg_event 3, 7, 0, 3 + bg_event 7, 4, 0, 3 + bg_event 7, 5, 0, 3 + bg_event 7, 6, 0, 3 + bg_event 7, 7, 0, 3 + bg_event 4, 1, 0, 3 + bg_event 5, 1, 0, 3 + bg_event 6, 1, 0, 3 + bg_event 7, 1, 0, 3 + bg_event 8, 1, 0, 3 + bg_event 9, 1, 0, 3 + + db 4 ; person events + object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 6, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_BURGLAR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_ROCKET_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestMart2F_Blocks:: +INCBIN "maps/WestMart2F.blk" diff --git a/data/maps/objects/WestMart3F.asm b/data/maps/objects/WestMart3F.asm new file mode 100644 index 0000000..3665b94 --- /dev/null +++ b/data/maps/objects/WestMart3F.asm @@ -0,0 +1,37 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestMart3F.asm", ROMX + + map_attributes WestMart3F, WEST_MART_3F, 0 + +WestMart3F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 12, 0, 1, WEST_MART_2F, wOverworldMapBlocks + 21 + warp_event 15, 0, 2, WEST_MART_4F, wOverworldMapBlocks + 22 + warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 + + db 14 ; bg events + bg_event 14, 0, 0, 1 + bg_event 3, 0, 0, 2 + bg_event 1, 4, 0, 3 + bg_event 1, 5, 0, 3 + bg_event 1, 6, 0, 3 + bg_event 1, 7, 0, 3 + bg_event 5, 4, 0, 3 + bg_event 5, 5, 0, 3 + bg_event 5, 6, 0, 3 + bg_event 5, 7, 0, 3 + bg_event 9, 4, 0, 3 + bg_event 9, 5, 0, 3 + bg_event 9, 6, 0, 3 + bg_event 9, 7, 0, 3 + + db 3 ; person events + object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 4, SPRITE_GENTLEMAN, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 5, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestMart3F_Blocks:: +INCBIN "maps/WestMart3F.blk" diff --git a/data/maps/objects/WestMart4F.asm b/data/maps/objects/WestMart4F.asm new file mode 100644 index 0000000..0b1f857 --- /dev/null +++ b/data/maps/objects/WestMart4F.asm @@ -0,0 +1,37 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestMart4F.asm", ROMX + + map_attributes WestMart4F, WEST_MART_4F, 0 + +WestMart4F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 12, 0, 1, WEST_MART_5F, wOverworldMapBlocks + 21 + warp_event 15, 0, 2, WEST_MART_3F, wOverworldMapBlocks + 22 + warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 + + db 14 ; bg events + bg_event 14, 0, 0, 1 + bg_event 3, 0, 0, 2 + bg_event 2, 5, 0, 3 + bg_event 3, 5, 0, 3 + bg_event 4, 5, 0, 3 + bg_event 5, 5, 0, 3 + bg_event 6, 5, 0, 3 + bg_event 7, 5, 0, 3 + bg_event 8, 5, 0, 3 + bg_event 9, 5, 0, 3 + bg_event 6, 1, 0, 3 + bg_event 7, 1, 0, 3 + bg_event 8, 1, 0, 3 + bg_event 9, 1, 0, 3 + + db 3 ; person events + object_event 13, 5, SPRITE_CLERK, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 6, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestMart4F_Blocks:: +INCBIN "maps/WestMart4F.blk" diff --git a/data/maps/objects/WestMart5F.asm b/data/maps/objects/WestMart5F.asm new file mode 100644 index 0000000..bf963f0 --- /dev/null +++ b/data/maps/objects/WestMart5F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestMart5F.asm", ROMX + + map_attributes WestMart5F, WEST_MART_5F, 0 + +WestMart5F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 12, 0, 1, WEST_MART_4F, wOverworldMapBlocks + 21 + warp_event 15, 0, 1, WEST_MART_6F, wOverworldMapBlocks + 22 + warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 + + db 2 ; bg events + bg_event 14, 0, 0, 1 + bg_event 3, 0, 0, 2 + + db 3 ; person events + object_event 8, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 5, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 4, SPRITE_NYOROBON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestMart5F_Blocks:: +INCBIN "maps/WestMart5F.blk" diff --git a/data/maps/objects/WestMart6F.asm b/data/maps/objects/WestMart6F.asm new file mode 100644 index 0000000..8228270 --- /dev/null +++ b/data/maps/objects/WestMart6F.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestMart6F.asm", ROMX + + map_attributes WestMart6F, WEST_MART_6F, 0 + +WestMart6F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 15, 0, 2, WEST_MART_5F, wOverworldMapBlocks + 22 + + db 5 ; bg events + bg_event 8, 1, 0, 1 + bg_event 9, 1, 0, 2 + bg_event 10, 1, 0, 3 + bg_event 11, 1, 0, 4 + bg_event 14, 0, 0, 5 + + db 3 ; person events + object_event 12, 3, SPRITE_OFFICER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 4, SPRITE_SIDON, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 6, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestMart6F_Blocks:: +INCBIN "maps/WestMart6F.blk" diff --git a/data/maps/objects/WestMartElevator.asm b/data/maps/objects/WestMartElevator.asm new file mode 100644 index 0000000..18861c9 --- /dev/null +++ b/data/maps/objects/WestMartElevator.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestMartElevator.asm", ROMX + + map_attributes WestMartElevator, WEST_MART_ELEVATOR, 0 + +WestMartElevator_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 1, 3, 4, WEST_MART_1F, wOverworldMapBlocks + 17 + warp_event 2, 3, 4, WEST_MART_1F, wOverworldMapBlocks + 18 + + db 0 ; bg events + + db 0 ; person events + +WestMartElevator_Blocks:: +INCBIN "maps/WestMartElevator.blk" diff --git a/data/maps/objects/WestPokecenter1F.asm b/data/maps/objects/WestPokecenter1F.asm new file mode 100644 index 0000000..27a39e2 --- /dev/null +++ b/data/maps/objects/WestPokecenter1F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestPokecenter1F.asm", ROMX + + map_attributes WestPokecenter1F, WEST_POKECENTER_1F, 0 + +WestPokecenter1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 5, 7, 6, WEST, wOverworldMapBlocks + 59 + warp_event 6, 7, 6, WEST, wOverworldMapBlocks + 60 + warp_event 0, 7, 1, WEST_POKECENTER_2F, wOverworldMapBlocks + 57 + + db 1 ; bg events + bg_event 13, 1, 0, 1 + + db 4 ; person events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_LASS, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_ROCKET_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestPokecenter1F_Blocks:: +INCBIN "maps/WestPokecenter1F.blk" diff --git a/data/maps/objects/WestPokecenter2F.asm b/data/maps/objects/WestPokecenter2F.asm new file mode 100644 index 0000000..7e2c0e3 --- /dev/null +++ b/data/maps/objects/WestPokecenter2F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestPokecenter2F.asm", ROMX + + map_attributes WestPokecenter2F, WEST_POKECENTER_2F, 0 + +WestPokecenter2F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 7, 3, WEST_POKECENTER_1F, wOverworldMapBlocks + 57 + + db 1 ; bg events + bg_event 1, 1, 0, 1 + + db 3 ; person events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestPokecenter2F_Blocks:: +INCBIN "maps/WestPokecenter2F.blk" diff --git a/data/maps/objects/WestRadioTower1F.asm b/data/maps/objects/WestRadioTower1F.asm new file mode 100644 index 0000000..baa2d7f --- /dev/null +++ b/data/maps/objects/WestRadioTower1F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestRadioTower1F.asm", ROMX + + map_attributes WestRadioTower1F, WEST_RADIO_TOWER_1F, 0 + +WestRadioTower1F_MapEvents:: + dw $4000 ; unknown + + db 3 ; warp events + warp_event 2, 7, 3, WEST, wOverworldMapBlocks + 42 + warp_event 3, 7, 4, WEST, wOverworldMapBlocks + 42 + warp_event 7, 0, 2, WEST_RADIO_TOWER_2F, wOverworldMapBlocks + 14 + + db 2 ; bg events + bg_event 5, 0, 0, 1 + bg_event 0, 1, 0, 2 + + db 3 ; person events + object_event 6, 6, SPRITE_RECEPTIONIST, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 3, SPRITE_SUPER_NERD, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestRadioTower1F_Blocks:: +INCBIN "maps/WestRadioTower1F.blk" diff --git a/data/maps/objects/WestRadioTower2F.asm b/data/maps/objects/WestRadioTower2F.asm new file mode 100644 index 0000000..5efdd72 --- /dev/null +++ b/data/maps/objects/WestRadioTower2F.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestRadioTower2F.asm", ROMX + + map_attributes WestRadioTower2F, WEST_RADIO_TOWER_2F, 0 + +WestRadioTower2F_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 0, 0, 1, WEST_RADIO_TOWER_3F, wOverworldMapBlocks + 11 + warp_event 7, 0, 3, WEST_RADIO_TOWER_1F, wOverworldMapBlocks + 14 + + db 1 ; bg events + bg_event 5, 0, 0, 1 + + db 7 ; person events + object_event 4, 6, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 5, SPRITE_ROCKER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_SUPER_NERD, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 2, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestRadioTower2F_Blocks:: +INCBIN "maps/WestRadioTower2F.blk" diff --git a/data/maps/objects/WestRadioTower3F.asm b/data/maps/objects/WestRadioTower3F.asm new file mode 100644 index 0000000..db9f966 --- /dev/null +++ b/data/maps/objects/WestRadioTower3F.asm @@ -0,0 +1,28 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestRadioTower3F.asm", ROMX + + map_attributes WestRadioTower3F, WEST_RADIO_TOWER_3F, 0 + +WestRadioTower3F_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 0, 0, 1, WEST_RADIO_TOWER_2F, wOverworldMapBlocks + 11 + warp_event 7, 0, 2, WEST_RADIO_TOWER_4F, wOverworldMapBlocks + 14 + + db 1 ; bg events + bg_event 5, 0, 0, 1 + + db 8 ; person events + object_event 4, 6, SPRITE_SUPER_NERD, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 6, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 5, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 2, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 3, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestRadioTower3F_Blocks:: +INCBIN "maps/WestRadioTower3F.blk" diff --git a/data/maps/objects/WestRadioTower4F.asm b/data/maps/objects/WestRadioTower4F.asm new file mode 100644 index 0000000..c3a5175 --- /dev/null +++ b/data/maps/objects/WestRadioTower4F.asm @@ -0,0 +1,29 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestRadioTower4F.asm", ROMX + + map_attributes WestRadioTower4F, WEST_RADIO_TOWER_4F, 0 + +WestRadioTower4F_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 0, 0, 1, WEST_RADIO_TOWER_5F, wOverworldMapBlocks + 11 + warp_event 7, 0, 2, WEST_RADIO_TOWER_3F, wOverworldMapBlocks + 14 + + db 1 ; bg events + bg_event 5, 0, 0, 1 + + db 9 ; person events + object_event 2, 6, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 5, SPRITE_BURGLAR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 6, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 5, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 5, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 4, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 2, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestRadioTower4F_Blocks:: +INCBIN "maps/WestRadioTower4F.blk" diff --git a/data/maps/objects/WestRadioTower5F.asm b/data/maps/objects/WestRadioTower5F.asm new file mode 100644 index 0000000..9cbd21a --- /dev/null +++ b/data/maps/objects/WestRadioTower5F.asm @@ -0,0 +1,29 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestRadioTower5F.asm", ROMX + + map_attributes WestRadioTower5F, WEST_RADIO_TOWER_5F, 0 + +WestRadioTower5F_MapEvents:: + dw $4000 ; unknown + + db 1 ; warp events + warp_event 0, 0, 1, WEST_RADIO_TOWER_4F, wOverworldMapBlocks + 11 + + db 3 ; bg events + bg_event 3, 0, 0, 1 + bg_event 6, 4, 0, 2 + bg_event 7, 4, 0, 2 + + db 8 ; person events + object_event 6, 6, SPRITE_SCIENTIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 2, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 6, SPRITE_PIPPI, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 7, SPRITE_SAKAKI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 4, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 7, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestRadioTower5F_Blocks:: +INCBIN "maps/WestRadioTower5F.blk" diff --git a/data/maps/objects/WestRocketRaidedHouse.asm b/data/maps/objects/WestRocketRaidedHouse.asm new file mode 100644 index 0000000..5ae6133 --- /dev/null +++ b/data/maps/objects/WestRocketRaidedHouse.asm @@ -0,0 +1,31 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/WestRocketRaidedHouse.asm", ROMX + + map_attributes WestRocketRaidedHouse, WEST_ROCKET_RAIDED_HOUSE, 0 + +WestRocketRaidedHouse_MapEvents:: + dw $4000 ; unknown + + db 2 ; warp events + warp_event 4, 7, 5, WEST, wOverworldMapBlocks + 47 + warp_event 5, 7, 5, WEST, wOverworldMapBlocks + 47 + + db 7 ; bg events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 2, 1, 0, 3 + bg_event 4, 1, 0, 4 + bg_event 5, 1, 0, 4 + bg_event 7, 1, 0, 5 + bg_event 8, 0, 0, 6 + + db 5 ; person events + object_event 8, 1, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 5, SPRITE_36, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 4, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 3, SPRITE_POKEFAN_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +WestRocketRaidedHouse_Blocks:: +INCBIN "maps/WestRocketRaidedHouse.blk" diff --git a/layout.link b/layout.link index 7f44f9b..5cd1c25 100644 --- a/layout.link +++ b/layout.link @@ -376,373 +376,373 @@ ROMX $24 ROMX $25 org $4000 - "data/maps/attributes/placeholder/Route2Gate1F.asm" - "maps/placeholder/Route2Gate1F.asm" - "data/maps/attributes/placeholder/Route2Gate2F.asm" - "maps/placeholder/Route2Gate2F.asm" - "data/maps/attributes/placeholder/Route2House.asm" - "maps/placeholder/Route2House.asm" - "data/maps/attributes/placeholder/OldCityMuseum.asm" - "maps/placeholder/OldCityMuseum.asm" - "data/maps/attributes/placeholder/OldCityGym.asm" - "maps/placeholder/OldCityGym.asm" - "data/maps/attributes/placeholder/OldCityTower1F.asm" - "maps/placeholder/OldCityTower1F.asm" - "data/maps/attributes/placeholder/OldCityTower2F.asm" - "maps/placeholder/OldCityTower2F.asm" - "data/maps/attributes/placeholder/OldCityTower3F.asm" - "maps/placeholder/OldCityTower3F.asm" - "data/maps/attributes/placeholder/OldCityTower4F.asm" - "maps/placeholder/OldCityTower4F.asm" - "data/maps/attributes/placeholder/OldCityTower5F.asm" - "maps/placeholder/OldCityTower5F.asm" - "data/maps/attributes/placeholder/OldCityBillsHouse.asm" - "maps/placeholder/OldCityBillsHouse.asm" - "data/maps/attributes/placeholder/OldCityMart.asm" - "maps/placeholder/OldCityMart.asm" - "data/maps/attributes/placeholder/OldCityHouse.asm" - "maps/placeholder/OldCityHouse.asm" - "data/maps/attributes/placeholder/OldCityPokecenter1F.asm" - "maps/placeholder/OldCityPokecenter1F.asm" - "data/maps/attributes/OldCityPokecenter2F.asm" - "maps/OldCityPokecenter2F.asm" - "data/maps/attributes/OldCityPokecenterTrade.asm" - "maps/OldCityPokecenterTrade.asm" - "data/maps/attributes/OldCityPokecenterBattle.asm" - "maps/OldCityPokecenterBattle.asm" - "data/maps/attributes/OldCityPokecenterTimeMachine.asm" - "maps/OldCityPokecenterTimeMachine.asm" - "data/maps/attributes/placeholder/OldCityKurtsHouse.asm" - "maps/placeholder/OldCityKurtsHouse.asm" - "data/maps/attributes/placeholder/OldCitySchool.asm" - "maps/placeholder/OldCitySchool.asm" + "data/maps/objects/Route2Gate1F.asm" + "scripts/Route2Gate1F.asm" + "data/maps/objects/Route2Gate2F.asm" + "scripts/Route2Gate2F.asm" + "data/maps/objects/Route2House.asm" + "scripts/Route2House.asm" + "data/maps/objects/OldCityMuseum.asm" + "scripts/OldCityMuseum.asm" + "data/maps/objects/OldCityGym.asm" + "scripts/OldCityGym.asm" + "data/maps/objects/OldCityTower1F.asm" + "scripts/OldCityTower1F.asm" + "data/maps/objects/OldCityTower2F.asm" + "scripts/OldCityTower2F.asm" + "data/maps/objects/OldCityTower3F.asm" + "scripts/OldCityTower3F.asm" + "data/maps/objects/OldCityTower4F.asm" + "scripts/OldCityTower4F.asm" + "data/maps/objects/OldCityTower5F.asm" + "scripts/OldCityTower5F.asm" + "data/maps/objects/OldCityBillsHouse.asm" + "scripts/OldCityBillsHouse.asm" + "data/maps/objects/OldCityMart.asm" + "scripts/OldCityMart.asm" + "data/maps/objects/OldCityHouse.asm" + "scripts/OldCityHouse.asm" + "data/maps/objects/OldCityPokecenter1F.asm" + "scripts/OldCityPokecenter1F.asm" + "data/maps/objects/OldCityPokecenter2F.asm" + "scripts/OldCityPokecenter2F.asm" + "data/maps/objects/OldCityPokecenterTrade.asm" + "scripts/OldCityPokecenterTrade.asm" + "data/maps/objects/OldCityPokecenterBattle.asm" + "scripts/OldCityPokecenterBattle.asm" + "data/maps/objects/OldCityPokecenterTimeMachine.asm" + "scripts/OldCityPokecenterTimeMachine.asm" + "data/maps/objects/OldCityKurtsHouse.asm" + "scripts/OldCityKurtsHouse.asm" + "data/maps/objects/OldCitySchool.asm" + "scripts/OldCitySchool.asm" ROMX $26 org $4000 - "data/maps/attributes/Route1Gate1F.asm" - "maps/Route1Gate1F.asm" - "data/maps/attributes/Route1Gate2F.asm" - "maps/Route1Gate2F.asm" - "data/maps/attributes/placeholder/WestMart1F.asm" - "maps/placeholder/WestMart1F.asm" - "data/maps/attributes/placeholder/WestMart2F.asm" - "maps/placeholder/WestMart2F.asm" - "data/maps/attributes/placeholder/WestMart3F.asm" - "maps/placeholder/WestMart3F.asm" - "data/maps/attributes/placeholder/WestMart4F.asm" - "maps/placeholder/WestMart4F.asm" - "data/maps/attributes/placeholder/WestMart5F.asm" - "maps/placeholder/WestMart5F.asm" - "data/maps/attributes/placeholder/WestMart6F.asm" - "maps/placeholder/WestMart6F.asm" - "data/maps/attributes/placeholder/WestMartElevator.asm" - "maps/placeholder/WestMartElevator.asm" - "data/maps/attributes/placeholder/WestRadioTower1F.asm" - "maps/placeholder/WestRadioTower1F.asm" - "data/maps/attributes/placeholder/WestRadioTower2F.asm" - "maps/placeholder/WestRadioTower2F.asm" - "data/maps/attributes/placeholder/WestRadioTower3F.asm" - "maps/placeholder/WestRadioTower3F.asm" - "data/maps/attributes/placeholder/WestRadioTower4F.asm" - "maps/placeholder/WestRadioTower4F.asm" - "data/maps/attributes/placeholder/WestRadioTower5F.asm" - "maps/placeholder/WestRadioTower5F.asm" - "data/maps/attributes/placeholder/WestRocketRaidedHouse.asm" - "maps/placeholder/WestRocketRaidedHouse.asm" - "data/maps/attributes/placeholder/WestPokecenter1F.asm" - "maps/placeholder/WestPokecenter1F.asm" - "data/maps/attributes/placeholder/WestPokecenter2F.asm" - "maps/placeholder/WestPokecenter2F.asm" - "data/maps/attributes/placeholder/WestGym.asm" - "maps/placeholder/WestGym.asm" - "data/maps/attributes/placeholder/WestHouse1.asm" - "maps/placeholder/WestHouse1.asm" - "data/maps/attributes/placeholder/WestHouse2.asm" - "maps/placeholder/WestHouse2.asm" + "data/maps/objects/Route1Gate1F.asm" + "scripts/Route1Gate1F.asm" + "data/maps/objects/Route1Gate2F.asm" + "scripts/Route1Gate2F.asm" + "data/maps/objects/WestMart1F.asm" + "scripts/WestMart1F.asm" + "data/maps/objects/WestMart2F.asm" + "scripts/WestMart2F.asm" + "data/maps/objects/WestMart3F.asm" + "scripts/WestMart3F.asm" + "data/maps/objects/WestMart4F.asm" + "scripts/WestMart4F.asm" + "data/maps/objects/WestMart5F.asm" + "scripts/WestMart5F.asm" + "data/maps/objects/WestMart6F.asm" + "scripts/WestMart6F.asm" + "data/maps/objects/WestMartElevator.asm" + "scripts/WestMartElevator.asm" + "data/maps/objects/WestRadioTower1F.asm" + "scripts/WestRadioTower1F.asm" + "data/maps/objects/WestRadioTower2F.asm" + "scripts/WestRadioTower2F.asm" + "data/maps/objects/WestRadioTower3F.asm" + "scripts/WestRadioTower3F.asm" + "data/maps/objects/WestRadioTower4F.asm" + "scripts/WestRadioTower4F.asm" + "data/maps/objects/WestRadioTower5F.asm" + "scripts/WestRadioTower5F.asm" + "data/maps/objects/WestRocketRaidedHouse.asm" + "scripts/WestRocketRaidedHouse.asm" + "data/maps/objects/WestPokecenter1F.asm" + "scripts/WestPokecenter1F.asm" + "data/maps/objects/WestPokecenter2F.asm" + "scripts/WestPokecenter2F.asm" + "data/maps/objects/WestGym.asm" + "scripts/WestGym.asm" + "data/maps/objects/WestHouse1.asm" + "scripts/WestHouse1.asm" + "data/maps/objects/WestHouse2.asm" + "scripts/WestHouse2.asm" ROMX $27 org $4000 - "data/maps/attributes/placeholder/HaitekuWestRouteGate.asm" - "maps/placeholder/HaitekuWestRouteGate.asm" - "data/maps/attributes/placeholder/HaitekuPokecenter1F.asm" - "maps/placeholder/HaitekuPokecenter1F.asm" - "data/maps/attributes/placeholder/HaitekuPokecenter2F.asm" - "maps/placeholder/HaitekuPokecenter2F.asm" - "data/maps/attributes/placeholder/HaitekuLeague1F.asm" - "maps/placeholder/HaitekuLeague1F.asm" - "data/maps/attributes/placeholder/HaitekuLeague2F.asm" - "maps/placeholder/HaitekuLeague2F.asm" - "data/maps/attributes/placeholder/HaitekuMart.asm" - "maps/placeholder/HaitekuMart.asm" - "data/maps/attributes/placeholder/HaitekuHouse1.asm" - "maps/placeholder/HaitekuHouse1.asm" - "data/maps/attributes/placeholder/HaitekuHouse2.asm" - "maps/placeholder/HaitekuHouse2.asm" - "data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm" - "maps/placeholder/HaitekuImposterOakHouse.asm" - "data/maps/attributes/placeholder/HaitekuAquarium1F.asm" - "maps/placeholder/HaitekuAquarium1F.asm" - "data/maps/attributes/placeholder/HaitekuAquarium2F.asm" - "maps/placeholder/HaitekuAquarium2F.asm" - "data/maps/attributes/placeholder/FontoRouteGate1.asm" - "maps/placeholder/FontoRouteGate1.asm" - "data/maps/attributes/placeholder/FontoRouteGate2.asm" - "maps/placeholder/FontoRouteGate2.asm" - "data/maps/attributes/placeholder/FontoRouteGate3.asm" - "maps/placeholder/FontoRouteGate3.asm" - "data/maps/attributes/placeholder/FontoRocketHouse.asm" - "maps/placeholder/FontoRocketHouse.asm" - "data/maps/attributes/placeholder/FontoMart.asm" - "maps/placeholder/FontoMart.asm" - "data/maps/attributes/placeholder/FontoHouse.asm" - "maps/placeholder/FontoHouse.asm" - "data/maps/attributes/placeholder/FontoPokecenter1F.asm" - "maps/placeholder/FontoPokecenter1F.asm" - "data/maps/attributes/placeholder/FontoPokecenter2F.asm" - "maps/placeholder/FontoPokecenter2F.asm" - "data/maps/attributes/placeholder/FontoLab.asm" - "maps/placeholder/FontoLab.asm" - "data/maps/attributes/placeholder/BaadonMart.asm" - "maps/placeholder/BaadonMart.asm" - "data/maps/attributes/placeholder/BaadonPokecenter1F.asm" - "maps/placeholder/BaadonPokecenter1F.asm" - "data/maps/attributes/placeholder/BaadonPokecenter2F.asm" - "maps/placeholder/BaadonPokecenter2F.asm" - "data/maps/attributes/placeholder/BaadonHouse1.asm" - "maps/placeholder/BaadonHouse1.asm" - "data/maps/attributes/placeholder/BaadonWallpaperHouse.asm" - "maps/placeholder/BaadonWallpaperHouse.asm" - "data/maps/attributes/placeholder/BaadonHouse2.asm" - "maps/placeholder/BaadonHouse2.asm" - "data/maps/attributes/placeholder/BaadonLeague1F.asm" - "maps/placeholder/BaadonLeague1F.asm" - "data/maps/attributes/placeholder/BaadonLeague2F.asm" - "maps/placeholder/BaadonLeague2F.asm" - "data/maps/attributes/placeholder/BaadonRouteGateWest.asm" - "maps/placeholder/BaadonRouteGateWest.asm" - "data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm" - "maps/placeholder/BaadonRouteGateNewtype.asm" - "data/maps/attributes/placeholder/NewtypePokecenter1F.asm" - "maps/placeholder/NewtypePokecenter1F.asm" - "data/maps/attributes/placeholder/NewtypePokecenter2F.asm" - "maps/placeholder/NewtypePokecenter2F.asm" - "data/maps/attributes/placeholder/NewtypeLeague1F.asm" - "maps/placeholder/NewtypeLeague1F.asm" - "data/maps/attributes/placeholder/NewtypeLeague2F.asm" - "maps/placeholder/NewtypeLeague2F.asm" - "data/maps/attributes/placeholder/NewtypeSailorHouse.asm" - "maps/placeholder/NewtypeSailorHouse.asm" - "data/maps/attributes/placeholder/NewtypeMart.asm" - "maps/placeholder/NewtypeMart.asm" - "data/maps/attributes/placeholder/NewtypeDojo.asm" - "maps/placeholder/NewtypeDojo.asm" - "data/maps/attributes/placeholder/NewtypeHouse1.asm" - "maps/placeholder/NewtypeHouse1.asm" - "data/maps/attributes/placeholder/NewtypeDiner.asm" - "maps/placeholder/NewtypeDiner.asm" - "data/maps/attributes/placeholder/NewtypeHouse2.asm" - "maps/placeholder/NewtypeHouse2.asm" - "data/maps/attributes/placeholder/NewtypeHouse3.asm" - "maps/placeholder/NewtypeHouse3.asm" - "data/maps/attributes/placeholder/Route15Pokecenter1F.asm" - "maps/placeholder/Route15Pokecenter1F.asm" - "data/maps/attributes/placeholder/Route15Pokecenter2F.asm" - "maps/placeholder/Route15Pokecenter2F.asm" - "data/maps/attributes/placeholder/NewtypeRouteGate.asm" - "maps/placeholder/NewtypeRouteGate.asm" - "data/maps/attributes/placeholder/Route18Pokecenter1F.asm" - "maps/placeholder/Route18Pokecenter1F.asm" - "data/maps/attributes/placeholder/Route18Pokecenter2F.asm" - "maps/placeholder/Route18Pokecenter2F.asm" - "data/maps/attributes/placeholder/SugarRouteGate.asm" - "maps/placeholder/SugarRouteGate.asm" - "data/maps/attributes/placeholder/SugarHouse.asm" - "maps/placeholder/SugarHouse.asm" - "data/maps/attributes/placeholder/SugarHouse2.asm" - "maps/placeholder/SugarHouse2.asm" - "data/maps/attributes/placeholder/SugarMart.asm" - "maps/placeholder/SugarMart.asm" - "data/maps/attributes/placeholder/SugarPokecenter1F.asm" - "maps/placeholder/SugarPokecenter1F.asm" - "data/maps/attributes/placeholder/SugarPokecenter2F.asm" - "maps/placeholder/SugarPokecenter2F.asm" - "data/maps/attributes/placeholder/BullForestRoute1House.asm" - "maps/placeholder/BullForestRoute1House.asm" - "data/maps/attributes/placeholder/BullForestRouteGateStand.asm" - "maps/placeholder/BullForestRouteGateStand.asm" - "data/maps/attributes/placeholder/BullMart.asm" - "maps/placeholder/BullMart.asm" - "data/maps/attributes/placeholder/BullHouse1.asm" - "maps/placeholder/BullHouse1.asm" - "data/maps/attributes/placeholder/BullHouse2.asm" - "maps/placeholder/BullHouse2.asm" - "data/maps/attributes/placeholder/BullHouse3.asm" - "maps/placeholder/BullHouse3.asm" - "data/maps/attributes/placeholder/BullPokecenter1F.asm" - "maps/placeholder/BullPokecenter1F.asm" - "data/maps/attributes/placeholder/BullPokecenter2F.asm" - "maps/placeholder/BullPokecenter2F.asm" - "data/maps/attributes/placeholder/BullLeague1F.asm" - "maps/placeholder/BullLeague1F.asm" - "data/maps/attributes/placeholder/BullLeague2F.asm" - "maps/placeholder/BullLeague2F.asm" - "data/maps/attributes/placeholder/BullHouse4.asm" - "maps/placeholder/BullHouse4.asm" - "data/maps/attributes/placeholder/StandRouteGateKanto.asm" - "maps/placeholder/StandRouteGateKanto.asm" - "data/maps/attributes/placeholder/StandLab.asm" - "maps/placeholder/StandLab.asm" - "data/maps/attributes/placeholder/StandPokecenter1F.asm" - "maps/placeholder/StandPokecenter1F.asm" - "data/maps/attributes/placeholder/StandPokecenter2F.asm" - "maps/placeholder/StandPokecenter2F.asm" - "data/maps/attributes/placeholder/StandOffice.asm" - "maps/placeholder/StandOffice.asm" - "data/maps/attributes/placeholder/StandMart.asm" - "maps/placeholder/StandMart.asm" - "data/maps/attributes/placeholder/StandHouse.asm" - "maps/placeholder/StandHouse.asm" - "data/maps/attributes/placeholder/StandRocketHouse1F.asm" - "maps/placeholder/StandRocketHouse1F.asm" - "data/maps/attributes/placeholder/StandRocketHouse2F.asm" - "maps/placeholder/StandRocketHouse2F.asm" - "data/maps/attributes/placeholder/StandLeague1F.asm" - "maps/placeholder/StandLeague1F.asm" - "data/maps/attributes/placeholder/StandLeague2F.asm" - "maps/placeholder/StandLeague2F.asm" - "data/maps/attributes/placeholder/KantoCeruleanHouse.asm" - "maps/placeholder/KantoCeruleanHouse.asm" - "data/maps/attributes/placeholder/KantoPokecenter1F.asm" - "maps/placeholder/KantoPokecenter1F.asm" - "data/maps/attributes/placeholder/KantoPokecenter2F.asm" - "maps/placeholder/KantoPokecenter2F.asm" - "data/maps/attributes/placeholder/KantoLeague1F.asm" - "maps/placeholder/KantoLeague1F.asm" - "data/maps/attributes/placeholder/KantoLeague2F.asm" - "maps/placeholder/KantoLeague2F.asm" - "data/maps/attributes/placeholder/KantoLavenderHouse.asm" - "maps/placeholder/KantoLavenderHouse.asm" - "data/maps/attributes/placeholder/KantoCeladonMart1F.asm" - "maps/placeholder/KantoCeladonMart1F.asm" - "data/maps/attributes/placeholder/KantoCeladonMart2F.asm" - "maps/placeholder/KantoCeladonMart2F.asm" - "data/maps/attributes/placeholder/KantoCeladonMart3F.asm" - "maps/placeholder/KantoCeladonMart3F.asm" - "data/maps/attributes/placeholder/KantoCeladonMart4F.asm" - "maps/placeholder/KantoCeladonMart4F.asm" - "data/maps/attributes/placeholder/KantoCeladonMart5F.asm" - "maps/placeholder/KantoCeladonMart5F.asm" - "data/maps/attributes/placeholder/KantoCeladonElevator.asm" - "maps/placeholder/KantoCeladonElevator.asm" - "data/maps/attributes/placeholder/KantoMart.asm" - "maps/placeholder/KantoMart.asm" - "data/maps/attributes/placeholder/KantoGamefreakHQ1.asm" - "maps/placeholder/KantoGamefreakHQ1.asm" - "data/maps/attributes/placeholder/KantoGamefreakHQ2.asm" - "maps/placeholder/KantoGamefreakHQ2.asm" - "data/maps/attributes/placeholder/KantoGamefreakHQ3.asm" - "maps/placeholder/KantoGamefreakHQ3.asm" - "data/maps/attributes/placeholder/KantoGamefreakHQ4.asm" - "maps/placeholder/KantoGamefreakHQ4.asm" - "data/maps/attributes/placeholder/KantoGamefreakHQ5.asm" - "maps/placeholder/KantoGamefreakHQ5.asm" - "data/maps/attributes/placeholder/KantoSilphCo.asm" - "maps/placeholder/KantoSilphCo.asm" - "data/maps/attributes/placeholder/KantoViridianHouse.asm" - "maps/placeholder/KantoViridianHouse.asm" - "data/maps/attributes/placeholder/KantoGameCorner.asm" - "maps/placeholder/KantoGameCorner.asm" - "data/maps/attributes/placeholder/KantoUnusedArea.asm" - "maps/placeholder/KantoUnusedArea.asm" - "data/maps/attributes/placeholder/KantoGameCornerPrizes.asm" - "maps/placeholder/KantoGameCornerPrizes.asm" - "data/maps/attributes/placeholder/KantoDiner.asm" - "maps/placeholder/KantoDiner.asm" - "data/maps/attributes/placeholder/KantoSchool.asm" - "maps/placeholder/KantoSchool.asm" - "data/maps/attributes/placeholder/KantoHospital.asm" - "maps/placeholder/KantoHospital.asm" - "data/maps/attributes/placeholder/KantoPokecenter21F.asm" - "maps/placeholder/KantoPokecenter21F.asm" - "data/maps/attributes/placeholder/KantoPokecenter22F.asm" - "maps/placeholder/KantoPokecenter22F.asm" - "data/maps/attributes/placeholder/KantoRedsHouse.asm" - "maps/placeholder/KantoRedsHouse.asm" - "data/maps/attributes/placeholder/KantoGreensHouse1F.asm" - "maps/placeholder/KantoGreensHouse1F.asm" - "data/maps/attributes/placeholder/KantoGreensHouse2F.asm" - "maps/placeholder/KantoGreensHouse2F.asm" - "data/maps/attributes/placeholder/KantoEldersHouse.asm" - "maps/placeholder/KantoEldersHouse.asm" - "data/maps/attributes/placeholder/KantoOaksLab.asm" - "maps/placeholder/KantoOaksLab.asm" - "data/maps/attributes/placeholder/KantoLeague21F.asm" - "maps/placeholder/KantoLeague21F.asm" - "data/maps/attributes/placeholder/KantoLeague22F.asm" - "maps/placeholder/KantoLeague22F.asm" - "data/maps/attributes/placeholder/KantoFishingGuru.asm" - "maps/placeholder/KantoFishingGuru.asm" - "data/maps/attributes/placeholder/SouthHouse1.asm" - "maps/placeholder/SouthHouse1.asm" - "data/maps/attributes/placeholder/SouthPokecenter1F.asm" - "maps/placeholder/SouthPokecenter1F.asm" - "data/maps/attributes/placeholder/SouthPokecenter2F.asm" - "maps/placeholder/SouthPokecenter2F.asm" - "data/maps/attributes/placeholder/SouthMart.asm" - "maps/placeholder/SouthMart.asm" - "data/maps/attributes/placeholder/SouthHouse2.asm" - "maps/placeholder/SouthHouse2.asm" - "data/maps/attributes/placeholder/NorthHouse1.asm" - "maps/placeholder/NorthHouse1.asm" - "data/maps/attributes/placeholder/NorthMart.asm" - "maps/placeholder/NorthMart.asm" - "data/maps/attributes/placeholder/NorthHouse2.asm" - "maps/placeholder/NorthHouse2.asm" - "data/maps/attributes/placeholder/NorthPokecenter1F.asm" - "maps/placeholder/NorthPokecenter1F.asm" - "data/maps/attributes/placeholder/NorthPokecenter2F.asm" - "maps/placeholder/NorthPokecenter2F.asm" + "data/maps/objects/HaitekuWestRouteGate.asm" + "scripts/HaitekuWestRouteGate.asm" + "data/maps/objects/HaitekuPokecenter1F.asm" + "scripts/HaitekuPokecenter1F.asm" + "data/maps/objects/HaitekuPokecenter2F.asm" + "scripts/HaitekuPokecenter2F.asm" + "data/maps/objects/HaitekuLeague1F.asm" + "scripts/HaitekuLeague1F.asm" + "data/maps/objects/HaitekuLeague2F.asm" + "scripts/HaitekuLeague2F.asm" + "data/maps/objects/HaitekuMart.asm" + "scripts/HaitekuMart.asm" + "data/maps/objects/HaitekuHouse1.asm" + "scripts/HaitekuHouse1.asm" + "data/maps/objects/HaitekuHouse2.asm" + "scripts/HaitekuHouse2.asm" + "data/maps/objects/HaitekuImposterOakHouse.asm" + "scripts/HaitekuImposterOakHouse.asm" + "data/maps/objects/HaitekuAquarium1F.asm" + "scripts/HaitekuAquarium1F.asm" + "data/maps/objects/HaitekuAquarium2F.asm" + "scripts/HaitekuAquarium2F.asm" + "data/maps/objects/FontoRouteGate1.asm" + "scripts/FontoRouteGate1.asm" + "data/maps/objects/FontoRouteGate2.asm" + "scripts/FontoRouteGate2.asm" + "data/maps/objects/FontoRouteGate3.asm" + "scripts/FontoRouteGate3.asm" + "data/maps/objects/FontoRocketHouse.asm" + "scripts/FontoRocketHouse.asm" + "data/maps/objects/FontoMart.asm" + "scripts/FontoMart.asm" + "data/maps/objects/FontoHouse.asm" + "scripts/FontoHouse.asm" + "data/maps/objects/FontoPokecenter1F.asm" + "scripts/FontoPokecenter1F.asm" + "data/maps/objects/FontoPokecenter2F.asm" + "scripts/FontoPokecenter2F.asm" + "data/maps/objects/FontoLab.asm" + "scripts/FontoLab.asm" + "data/maps/objects/BaadonMart.asm" + "scripts/BaadonMart.asm" + "data/maps/objects/BaadonPokecenter1F.asm" + "scripts/BaadonPokecenter1F.asm" + "data/maps/objects/BaadonPokecenter2F.asm" + "scripts/BaadonPokecenter2F.asm" + "data/maps/objects/BaadonHouse1.asm" + "scripts/BaadonHouse1.asm" + "data/maps/objects/BaadonWallpaperHouse.asm" + "scripts/BaadonWallpaperHouse.asm" + "data/maps/objects/BaadonHouse2.asm" + "scripts/BaadonHouse2.asm" + "data/maps/objects/BaadonLeague1F.asm" + "scripts/BaadonLeague1F.asm" + "data/maps/objects/BaadonLeague2F.asm" + "scripts/BaadonLeague2F.asm" + "data/maps/objects/BaadonRouteGateWest.asm" + "scripts/BaadonRouteGateWest.asm" + "data/maps/objects/BaadonRouteGateNewtype.asm" + "scripts/BaadonRouteGateNewtype.asm" + "data/maps/objects/NewtypePokecenter1F.asm" + "scripts/NewtypePokecenter1F.asm" + "data/maps/objects/NewtypePokecenter2F.asm" + "scripts/NewtypePokecenter2F.asm" + "data/maps/objects/NewtypeLeague1F.asm" + "scripts/NewtypeLeague1F.asm" + "data/maps/objects/NewtypeLeague2F.asm" + "scripts/NewtypeLeague2F.asm" + "data/maps/objects/NewtypeSailorHouse.asm" + "scripts/NewtypeSailorHouse.asm" + "data/maps/objects/NewtypeMart.asm" + "scripts/NewtypeMart.asm" + "data/maps/objects/NewtypeDojo.asm" + "scripts/NewtypeDojo.asm" + "data/maps/objects/NewtypeHouse1.asm" + "scripts/NewtypeHouse1.asm" + "data/maps/objects/NewtypeDiner.asm" + "scripts/NewtypeDiner.asm" + "data/maps/objects/NewtypeHouse2.asm" + "scripts/NewtypeHouse2.asm" + "data/maps/objects/NewtypeHouse3.asm" + "scripts/NewtypeHouse3.asm" + "data/maps/objects/Route15Pokecenter1F.asm" + "scripts/Route15Pokecenter1F.asm" + "data/maps/objects/Route15Pokecenter2F.asm" + "scripts/Route15Pokecenter2F.asm" + "data/maps/objects/NewtypeRouteGate.asm" + "scripts/NewtypeRouteGate.asm" + "data/maps/objects/Route18Pokecenter1F.asm" + "scripts/Route18Pokecenter1F.asm" + "data/maps/objects/Route18Pokecenter2F.asm" + "scripts/Route18Pokecenter2F.asm" + "data/maps/objects/SugarRouteGate.asm" + "scripts/SugarRouteGate.asm" + "data/maps/objects/SugarHouse.asm" + "scripts/SugarHouse.asm" + "data/maps/objects/SugarHouse2.asm" + "scripts/SugarHouse2.asm" + "data/maps/objects/SugarMart.asm" + "scripts/SugarMart.asm" + "data/maps/objects/SugarPokecenter1F.asm" + "scripts/SugarPokecenter1F.asm" + "data/maps/objects/SugarPokecenter2F.asm" + "scripts/SugarPokecenter2F.asm" + "data/maps/objects/BullForestRoute1House.asm" + "scripts/BullForestRoute1House.asm" + "data/maps/objects/BullForestRouteGateStand.asm" + "scripts/BullForestRouteGateStand.asm" + "data/maps/objects/BullMart.asm" + "scripts/BullMart.asm" + "data/maps/objects/BullHouse1.asm" + "scripts/BullHouse1.asm" + "data/maps/objects/BullHouse2.asm" + "scripts/BullHouse2.asm" + "data/maps/objects/BullHouse3.asm" + "scripts/BullHouse3.asm" + "data/maps/objects/BullPokecenter1F.asm" + "scripts/BullPokecenter1F.asm" + "data/maps/objects/BullPokecenter2F.asm" + "scripts/BullPokecenter2F.asm" + "data/maps/objects/BullLeague1F.asm" + "scripts/BullLeague1F.asm" + "data/maps/objects/BullLeague2F.asm" + "scripts/BullLeague2F.asm" + "data/maps/objects/BullHouse4.asm" + "scripts/BullHouse4.asm" + "data/maps/objects/StandRouteGateKanto.asm" + "scripts/StandRouteGateKanto.asm" + "data/maps/objects/StandLab.asm" + "scripts/StandLab.asm" + "data/maps/objects/StandPokecenter1F.asm" + "scripts/StandPokecenter1F.asm" + "data/maps/objects/StandPokecenter2F.asm" + "scripts/StandPokecenter2F.asm" + "data/maps/objects/StandOffice.asm" + "scripts/StandOffice.asm" + "data/maps/objects/StandMart.asm" + "scripts/StandMart.asm" + "data/maps/objects/StandHouse.asm" + "scripts/StandHouse.asm" + "data/maps/objects/StandRocketHouse1F.asm" + "scripts/StandRocketHouse1F.asm" + "data/maps/objects/StandRocketHouse2F.asm" + "scripts/StandRocketHouse2F.asm" + "data/maps/objects/StandLeague1F.asm" + "scripts/StandLeague1F.asm" + "data/maps/objects/StandLeague2F.asm" + "scripts/StandLeague2F.asm" + "data/maps/objects/KantoCeruleanHouse.asm" + "scripts/KantoCeruleanHouse.asm" + "data/maps/objects/KantoPokecenter1F.asm" + "scripts/KantoPokecenter1F.asm" + "data/maps/objects/KantoPokecenter2F.asm" + "scripts/KantoPokecenter2F.asm" + "data/maps/objects/KantoLeague1F.asm" + "scripts/KantoLeague1F.asm" + "data/maps/objects/KantoLeague2F.asm" + "scripts/KantoLeague2F.asm" + "data/maps/objects/KantoLavenderHouse.asm" + "scripts/KantoLavenderHouse.asm" + "data/maps/objects/KantoCeladonMart1F.asm" + "scripts/KantoCeladonMart1F.asm" + "data/maps/objects/KantoCeladonMart2F.asm" + "scripts/KantoCeladonMart2F.asm" + "data/maps/objects/KantoCeladonMart3F.asm" + "scripts/KantoCeladonMart3F.asm" + "data/maps/objects/KantoCeladonMart4F.asm" + "scripts/KantoCeladonMart4F.asm" + "data/maps/objects/KantoCeladonMart5F.asm" + "scripts/KantoCeladonMart5F.asm" + "data/maps/objects/KantoCeladonElevator.asm" + "scripts/KantoCeladonElevator.asm" + "data/maps/objects/KantoMart.asm" + "scripts/KantoMart.asm" + "data/maps/objects/KantoGamefreakHQ1.asm" + "scripts/KantoGamefreakHQ1.asm" + "data/maps/objects/KantoGamefreakHQ2.asm" + "scripts/KantoGamefreakHQ2.asm" + "data/maps/objects/KantoGamefreakHQ3.asm" + "scripts/KantoGamefreakHQ3.asm" + "data/maps/objects/KantoGamefreakHQ4.asm" + "scripts/KantoGamefreakHQ4.asm" + "data/maps/objects/KantoGamefreakHQ5.asm" + "scripts/KantoGamefreakHQ5.asm" + "data/maps/objects/KantoSilphCo.asm" + "scripts/KantoSilphCo.asm" + "data/maps/objects/KantoViridianHouse.asm" + "scripts/KantoViridianHouse.asm" + "data/maps/objects/KantoGameCorner.asm" + "scripts/KantoGameCorner.asm" + "data/maps/objects/KantoUnusedArea.asm" + "scripts/KantoUnusedArea.asm" + "data/maps/objects/KantoGameCornerPrizes.asm" + "scripts/KantoGameCornerPrizes.asm" + "data/maps/objects/KantoDiner.asm" + "scripts/KantoDiner.asm" + "data/maps/objects/KantoSchool.asm" + "scripts/KantoSchool.asm" + "data/maps/objects/KantoHospital.asm" + "scripts/KantoHospital.asm" + "data/maps/objects/KantoPokecenter21F.asm" + "scripts/KantoPokecenter21F.asm" + "data/maps/objects/KantoPokecenter22F.asm" + "scripts/KantoPokecenter22F.asm" + "data/maps/objects/KantoRedsHouse.asm" + "scripts/KantoRedsHouse.asm" + "data/maps/objects/KantoGreensHouse1F.asm" + "scripts/KantoGreensHouse1F.asm" + "data/maps/objects/KantoGreensHouse2F.asm" + "scripts/KantoGreensHouse2F.asm" + "data/maps/objects/KantoEldersHouse.asm" + "scripts/KantoEldersHouse.asm" + "data/maps/objects/KantoOaksLab.asm" + "scripts/KantoOaksLab.asm" + "data/maps/objects/KantoLeague21F.asm" + "scripts/KantoLeague21F.asm" + "data/maps/objects/KantoLeague22F.asm" + "scripts/KantoLeague22F.asm" + "data/maps/objects/KantoFishingGuru.asm" + "scripts/KantoFishingGuru.asm" + "data/maps/objects/SouthHouse1.asm" + "scripts/SouthHouse1.asm" + "data/maps/objects/SouthPokecenter1F.asm" + "scripts/SouthPokecenter1F.asm" + "data/maps/objects/SouthPokecenter2F.asm" + "scripts/SouthPokecenter2F.asm" + "data/maps/objects/SouthMart.asm" + "scripts/SouthMart.asm" + "data/maps/objects/SouthHouse2.asm" + "scripts/SouthHouse2.asm" + "data/maps/objects/NorthHouse1.asm" + "scripts/NorthHouse1.asm" + "data/maps/objects/NorthMart.asm" + "scripts/NorthMart.asm" + "data/maps/objects/NorthHouse2.asm" + "scripts/NorthHouse2.asm" + "data/maps/objects/NorthPokecenter1F.asm" + "scripts/NorthPokecenter1F.asm" + "data/maps/objects/NorthPokecenter2F.asm" + "scripts/NorthPokecenter2F.asm" ROMX $2f org $4000 - "data/maps/attributes/placeholder/PowerPlant1.asm" - "maps/placeholder/PowerPlant1.asm" - "data/maps/attributes/placeholder/PowerPlant2.asm" - "maps/placeholder/PowerPlant2.asm" - "data/maps/attributes/placeholder/PowerPlant3.asm" - "maps/placeholder/PowerPlant3.asm" - "data/maps/attributes/placeholder/PowerPlant4.asm" - "maps/placeholder/PowerPlant4.asm" - "data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm" - "maps/placeholder/RuinsOfAlphEntrance.asm" - "data/maps/attributes/placeholder/RuinsOfAlphMain.asm" - "maps/placeholder/RuinsOfAlphMain.asm" - "data/maps/attributes/placeholder/CaveMinecarts1.asm" - "maps/placeholder/CaveMinecarts1.asm" - "data/maps/attributes/placeholder/CaveMinecarts2.asm" - "maps/placeholder/CaveMinecarts2.asm" - "data/maps/attributes/placeholder/CaveMinecarts3.asm" - "maps/placeholder/CaveMinecarts3.asm" - "data/maps/attributes/placeholder/CaveMinecarts4.asm" - "maps/placeholder/CaveMinecarts4.asm" - "data/maps/attributes/placeholder/CaveMinecarts5.asm" - "maps/placeholder/CaveMinecarts5.asm" - "data/maps/attributes/placeholder/CaveMinecarts6.asm" - "maps/placeholder/CaveMinecarts6.asm" - "data/maps/attributes/placeholder/CaveMinecarts7.asm" - "maps/placeholder/CaveMinecarts7.asm" - "data/maps/attributes/placeholder/Office1.asm" - "maps/placeholder/Office1.asm" - "data/maps/attributes/placeholder/Office2.asm" - "maps/placeholder/Office2.asm" - "data/maps/attributes/placeholder/Office3.asm" - "maps/placeholder/Office3.asm" - "data/maps/attributes/placeholder/SlowpokeWellEntrance.asm" - "maps/placeholder/SlowpokeWellEntrance.asm" - "data/maps/attributes/placeholder/SlowpokeWellMain.asm" - "maps/placeholder/SlowpokeWellMain.asm" - "data/maps/attributes/ShizukanaOka.asm" - "maps/ShizukanaOka.asm" + "data/maps/objects/PowerPlant1.asm" + "scripts/PowerPlant1.asm" + "data/maps/objects/PowerPlant2.asm" + "scripts/PowerPlant2.asm" + "data/maps/objects/PowerPlant3.asm" + "scripts/PowerPlant3.asm" + "data/maps/objects/PowerPlant4.asm" + "scripts/PowerPlant4.asm" + "data/maps/objects/RuinsOfAlphEntrance.asm" + "scripts/RuinsOfAlphEntrance.asm" + "data/maps/objects/RuinsOfAlphMain.asm" + "scripts/RuinsOfAlphMain.asm" + "data/maps/objects/CaveMinecarts1.asm" + "scripts/CaveMinecarts1.asm" + "data/maps/objects/CaveMinecarts2.asm" + "scripts/CaveMinecarts2.asm" + "data/maps/objects/CaveMinecarts3.asm" + "scripts/CaveMinecarts3.asm" + "data/maps/objects/CaveMinecarts4.asm" + "scripts/CaveMinecarts4.asm" + "data/maps/objects/CaveMinecarts5.asm" + "scripts/CaveMinecarts5.asm" + "data/maps/objects/CaveMinecarts6.asm" + "scripts/CaveMinecarts6.asm" + "data/maps/objects/CaveMinecarts7.asm" + "scripts/CaveMinecarts7.asm" + "data/maps/objects/Office1.asm" + "scripts/Office1.asm" + "data/maps/objects/Office2.asm" + "scripts/Office2.asm" + "data/maps/objects/Office3.asm" + "scripts/Office3.asm" + "data/maps/objects/SlowpokeWellEntrance.asm" + "scripts/SlowpokeWellEntrance.asm" + "data/maps/objects/SlowpokeWellMain.asm" + "scripts/SlowpokeWellMain.asm" + "data/maps/objects/ShizukanaOka.asm" + "scripts/ShizukanaOka.asm" ROMX $30 org $4000 @@ -761,109 +761,109 @@ ROMX $33 ROMX $34 org $4000 - "data/maps/attributes/placeholder/RouteSilentEastGate.asm" - "maps/placeholder/RouteSilentEastGate.asm" - "data/maps/attributes/PlayerHouse1F.asm" - "maps/PlayerHouse1F.asm" - "data/maps/attributes/PlayerHouse2F.asm" - "maps/PlayerHouse2F.asm" - "data/maps/attributes/SilentHillPokecenter.asm" - "maps/SilentHillPokecenter.asm" - "data/maps/attributes/SilentHillHouse.asm" - "maps/SilentHillHouse.asm" - "data/maps/attributes/SilentHillLabFront.asm" - "maps/SilentHillLabFront.asm" - "data/maps/attributes/SilentHillLabBack.asm" - "maps/SilentHillLabBack.asm" - "data/maps/attributes/UnusedMap13.asm" - "maps/UnusedMap13.asm" + "data/maps/objects/RouteSilentEastGate.asm" + "scripts/RouteSilentEastGate.asm" + "data/maps/objects/PlayerHouse1F.asm" + "scripts/PlayerHouse1F.asm" + "data/maps/objects/PlayerHouse2F.asm" + "scripts/PlayerHouse2F.asm" + "data/maps/objects/SilentHillPokecenter.asm" + "scripts/SilentHillPokecenter.asm" + "data/maps/objects/SilentHillHouse.asm" + "scripts/SilentHillHouse.asm" + "data/maps/objects/SilentHillLabFront.asm" + "scripts/SilentHillLabFront.asm" + "data/maps/objects/SilentHillLabBack.asm" + "scripts/SilentHillLabBack.asm" + "data/maps/objects/UnusedMap13.asm" + "scripts/UnusedMap13.asm" ROMX $36 org $4000 - "maps/placeholder/dummy_text_pointers.asm" - "data/maps/attributes/SilentHill.asm" - "data/maps/attributes/placeholder/OldCity.asm" - "maps/placeholder/OldCity.asm" - "data/maps/attributes/placeholder/West.asm" - "maps/placeholder/West.asm" - "data/maps/attributes/placeholder/Haiteku.asm" - "maps/placeholder/Haiteku.asm" - "data/maps/attributes/placeholder/Fonto.asm" - "maps/placeholder/Fonto.asm" - "data/maps/attributes/placeholder/Baadon.asm" - "maps/placeholder/Baadon.asm" - "data/maps/attributes/placeholder/Newtype.asm" - "maps/placeholder/Newtype.asm" - "data/maps/attributes/placeholder/Sugar.asm" - "maps/placeholder/Sugar.asm" - "data/maps/attributes/placeholder/BullForest.asm" - "maps/placeholder/BullForest.asm" - "data/maps/attributes/placeholder/Stand.asm" - "maps/placeholder/Stand.asm" - "data/maps/attributes/placeholder/Kanto.asm" - "maps/placeholder/Kanto.asm" - "data/maps/attributes/placeholder/Prince.asm" - "maps/placeholder/Prince.asm" - "data/maps/attributes/placeholder/MtFuji.asm" - "maps/placeholder/MtFuji.asm" - "data/maps/attributes/placeholder/South.asm" - "maps/placeholder/South.asm" - "data/maps/attributes/placeholder/North.asm" - "maps/placeholder/North.asm" - "data/maps/attributes/Route1P1.asm" - "data/maps/attributes/Route1P2.asm" - "data/maps/attributes/placeholder/Route2.asm" - "maps/placeholder/Route2.asm" - "data/maps/attributes/placeholder/HaitekuWestRoute.asm" - "maps/placeholder/HaitekuWestRoute.asm" - "data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm" - "maps/placeholder/HaitekuWestRouteOcean.asm" - "data/maps/attributes/placeholder/FontoRoute1.asm" - "maps/placeholder/FontoRoute1.asm" - "data/maps/attributes/placeholder/FontoRoute6.asm" - "maps/placeholder/FontoRoute6.asm" - "data/maps/attributes/placeholder/FontoRoute2.asm" - "maps/placeholder/FontoRoute2.asm" - "data/maps/attributes/placeholder/FontoRoute4.asm" - "maps/placeholder/FontoRoute4.asm" - "data/maps/attributes/placeholder/FontoRoute3.asm" - "maps/placeholder/FontoRoute3.asm" - "data/maps/attributes/placeholder/BaadonRoute1.asm" - "maps/placeholder/BaadonRoute1.asm" - "data/maps/attributes/placeholder/BaadonRoute2.asm" - "maps/placeholder/BaadonRoute2.asm" - "data/maps/attributes/placeholder/BaadonRoute3.asm" - "maps/placeholder/BaadonRoute3.asm" - "data/maps/attributes/placeholder/Route15.asm" - "maps/placeholder/Route15.asm" - "data/maps/attributes/placeholder/NewtypeRoute.asm" - "maps/placeholder/NewtypeRoute.asm" - "data/maps/attributes/placeholder/Route18.asm" - "maps/placeholder/Route18.asm" - "data/maps/attributes/placeholder/BullForestRoute1.asm" - "maps/placeholder/BullForestRoute1.asm" - "data/maps/attributes/placeholder/SugarRoute.asm" - "maps/placeholder/SugarRoute.asm" - "data/maps/attributes/placeholder/BullForestRoute2.asm" - "maps/placeholder/BullForestRoute2.asm" - "data/maps/attributes/placeholder/StandRoute.asm" - "maps/placeholder/StandRoute.asm" - "data/maps/attributes/placeholder/KantoEastRoute.asm" - "maps/placeholder/KantoEastRoute.asm" - "data/maps/attributes/placeholder/RouteSilentEast.asm" - "maps/placeholder/RouteSilentEast.asm" - "data/maps/attributes/placeholder/PrinceRoute.asm" - "maps/placeholder/PrinceRoute.asm" - "data/maps/attributes/placeholder/MtFujiRoute.asm" - "maps/placeholder/MtFujiRoute.asm" - "data/maps/attributes/placeholder/FontoRoute5.asm" - "maps/placeholder/FontoRoute5.asm" - "data/maps/attributes/placeholder/BullForestRoute3.asm" - "maps/placeholder/BullForestRoute3.asm" - "maps/SilentHill.asm" + "scripts/dummy_text_pointers.asm" + "data/maps/objects/SilentHill.asm" + "data/maps/objects/OldCity.asm" + "scripts/OldCity.asm" + "data/maps/objects/West.asm" + "scripts/West.asm" + "data/maps/objects/Haiteku.asm" + "scripts/Haiteku.asm" + "data/maps/objects/Fonto.asm" + "scripts/Fonto.asm" + "data/maps/objects/Baadon.asm" + "scripts/Baadon.asm" + "data/maps/objects/Newtype.asm" + "scripts/Newtype.asm" + "data/maps/objects/Sugar.asm" + "scripts/Sugar.asm" + "data/maps/objects/BullForest.asm" + "scripts/BullForest.asm" + "data/maps/objects/Stand.asm" + "scripts/Stand.asm" + "data/maps/objects/Kanto.asm" + "scripts/Kanto.asm" + "data/maps/objects/Prince.asm" + "scripts/Prince.asm" + "data/maps/objects/MtFuji.asm" + "scripts/MtFuji.asm" + "data/maps/objects/South.asm" + "scripts/South.asm" + "data/maps/objects/North.asm" + "scripts/North.asm" + "data/maps/objects/Route1P1.asm" + "data/maps/objects/Route1P2.asm" + "data/maps/objects/Route2.asm" + "scripts/Route2.asm" + "data/maps/objects/HaitekuWestRoute.asm" + "scripts/HaitekuWestRoute.asm" + "data/maps/objects/HaitekuWestRouteOcean.asm" + "scripts/HaitekuWestRouteOcean.asm" + "data/maps/objects/FontoRoute1.asm" + "scripts/FontoRoute1.asm" + "data/maps/objects/FontoRoute6.asm" + "scripts/FontoRoute6.asm" + "data/maps/objects/FontoRoute2.asm" + "scripts/FontoRoute2.asm" + "data/maps/objects/FontoRoute4.asm" + "scripts/FontoRoute4.asm" + "data/maps/objects/FontoRoute3.asm" + "scripts/FontoRoute3.asm" + "data/maps/objects/BaadonRoute1.asm" + "scripts/BaadonRoute1.asm" + "data/maps/objects/BaadonRoute2.asm" + "scripts/BaadonRoute2.asm" + "data/maps/objects/BaadonRoute3.asm" + "scripts/BaadonRoute3.asm" + "data/maps/objects/Route15.asm" + "scripts/Route15.asm" + "data/maps/objects/NewtypeRoute.asm" + "scripts/NewtypeRoute.asm" + "data/maps/objects/Route18.asm" + "scripts/Route18.asm" + "data/maps/objects/BullForestRoute1.asm" + "scripts/BullForestRoute1.asm" + "data/maps/objects/SugarRoute.asm" + "scripts/SugarRoute.asm" + "data/maps/objects/BullForestRoute2.asm" + "scripts/BullForestRoute2.asm" + "data/maps/objects/StandRoute.asm" + "scripts/StandRoute.asm" + "data/maps/objects/KantoEastRoute.asm" + "scripts/KantoEastRoute.asm" + "data/maps/objects/RouteSilentEast.asm" + "scripts/RouteSilentEast.asm" + "data/maps/objects/PrinceRoute.asm" + "scripts/PrinceRoute.asm" + "data/maps/objects/MtFujiRoute.asm" + "scripts/MtFujiRoute.asm" + "data/maps/objects/FontoRoute5.asm" + "scripts/FontoRoute5.asm" + "data/maps/objects/BullForestRoute3.asm" + "scripts/BullForestRoute3.asm" + "scripts/SilentHill.asm" "engine/menu/set_time.asm" - "maps/Route1P1.asm" - "maps/Route1P2.asm" + "scripts/Route1P1.asm" + "scripts/Route1P2.asm" ROMX $37 org $4000 diff --git a/maps/placeholder/blk/Baadon.blk b/maps/Baadon.blk index eee9928..eee9928 100644 --- a/maps/placeholder/blk/Baadon.blk +++ b/maps/Baadon.blk diff --git a/maps/placeholder/blk/BaadonHouse1.blk b/maps/BaadonHouse1.blk index 71eb33c..71eb33c 100644 --- a/maps/placeholder/blk/BaadonHouse1.blk +++ b/maps/BaadonHouse1.blk diff --git a/maps/placeholder/blk/BaadonHouse2.blk b/maps/BaadonHouse2.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/BaadonHouse2.blk +++ b/maps/BaadonHouse2.blk diff --git a/maps/placeholder/blk/BaadonLeague1F.blk b/maps/BaadonLeague1F.blk index b4060b3..b4060b3 100644 --- a/maps/placeholder/blk/BaadonLeague1F.blk +++ b/maps/BaadonLeague1F.blk diff --git a/maps/placeholder/blk/BaadonLeague2F.blk b/maps/BaadonLeague2F.blk index 444e479..444e479 100644 --- a/maps/placeholder/blk/BaadonLeague2F.blk +++ b/maps/BaadonLeague2F.blk diff --git a/maps/placeholder/blk/BaadonMart.blk b/maps/BaadonMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/BaadonMart.blk +++ b/maps/BaadonMart.blk diff --git a/maps/placeholder/blk/BaadonPokecenter1F.blk b/maps/BaadonPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/BaadonPokecenter1F.blk +++ b/maps/BaadonPokecenter1F.blk diff --git a/maps/placeholder/blk/BaadonPokecenter2F.blk b/maps/BaadonPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/BaadonPokecenter2F.blk +++ b/maps/BaadonPokecenter2F.blk diff --git a/maps/placeholder/blk/BaadonRoute1.blk b/maps/BaadonRoute1.blk index 95f2f31..95f2f31 100644 --- a/maps/placeholder/blk/BaadonRoute1.blk +++ b/maps/BaadonRoute1.blk diff --git a/maps/placeholder/blk/BaadonRoute2.blk b/maps/BaadonRoute2.blk index 228c9f6..228c9f6 100644 --- a/maps/placeholder/blk/BaadonRoute2.blk +++ b/maps/BaadonRoute2.blk diff --git a/maps/placeholder/blk/BaadonRoute3.blk b/maps/BaadonRoute3.blk index 3b98916..3b98916 100644 --- a/maps/placeholder/blk/BaadonRoute3.blk +++ b/maps/BaadonRoute3.blk diff --git a/maps/placeholder/blk/BaadonRouteGateNewtype.blk b/maps/BaadonRouteGateNewtype.blk index 0ba6b01..0ba6b01 100644 --- a/maps/placeholder/blk/BaadonRouteGateNewtype.blk +++ b/maps/BaadonRouteGateNewtype.blk diff --git a/maps/placeholder/blk/BaadonRouteGateWest.blk b/maps/BaadonRouteGateWest.blk index 0ba6b01..0ba6b01 100644 --- a/maps/placeholder/blk/BaadonRouteGateWest.blk +++ b/maps/BaadonRouteGateWest.blk diff --git a/maps/placeholder/blk/BaadonWallpaperHouse.blk b/maps/BaadonWallpaperHouse.blk index 3cee918..3cee918 100644 --- a/maps/placeholder/blk/BaadonWallpaperHouse.blk +++ b/maps/BaadonWallpaperHouse.blk diff --git a/maps/placeholder/blk/BullForest.blk b/maps/BullForest.blk index 9ad1681..9ad1681 100644 --- a/maps/placeholder/blk/BullForest.blk +++ b/maps/BullForest.blk diff --git a/maps/placeholder/blk/BullForestRoute1.blk b/maps/BullForestRoute1.blk index 8b071f7..8b071f7 100644 --- a/maps/placeholder/blk/BullForestRoute1.blk +++ b/maps/BullForestRoute1.blk diff --git a/maps/placeholder/blk/BullForestRoute1House.blk b/maps/BullForestRoute1House.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/BullForestRoute1House.blk +++ b/maps/BullForestRoute1House.blk diff --git a/maps/placeholder/blk/BullForestRoute2.blk b/maps/BullForestRoute2.blk index 712f222..712f222 100644 --- a/maps/placeholder/blk/BullForestRoute2.blk +++ b/maps/BullForestRoute2.blk diff --git a/maps/placeholder/blk/BullForestRoute3.blk b/maps/BullForestRoute3.blk index 66f48ab..66f48ab 100644 --- a/maps/placeholder/blk/BullForestRoute3.blk +++ b/maps/BullForestRoute3.blk diff --git a/maps/placeholder/blk/BullForestRouteGateStand.blk b/maps/BullForestRouteGateStand.blk index 0ba6b01..0ba6b01 100644 --- a/maps/placeholder/blk/BullForestRouteGateStand.blk +++ b/maps/BullForestRouteGateStand.blk diff --git a/maps/placeholder/blk/BullHouse1.blk b/maps/BullHouse1.blk index 923d6f0..923d6f0 100644 --- a/maps/placeholder/blk/BullHouse1.blk +++ b/maps/BullHouse1.blk diff --git a/maps/placeholder/blk/BullHouse2.blk b/maps/BullHouse2.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/BullHouse2.blk +++ b/maps/BullHouse2.blk diff --git a/maps/placeholder/blk/BullHouse3.blk b/maps/BullHouse3.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/BullHouse3.blk +++ b/maps/BullHouse3.blk diff --git a/maps/placeholder/blk/BullHouse4.blk b/maps/BullHouse4.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/BullHouse4.blk +++ b/maps/BullHouse4.blk diff --git a/maps/placeholder/blk/BullLeague1F.blk b/maps/BullLeague1F.blk index b4060b3..b4060b3 100644 --- a/maps/placeholder/blk/BullLeague1F.blk +++ b/maps/BullLeague1F.blk diff --git a/maps/placeholder/blk/BullLeague2F.blk b/maps/BullLeague2F.blk index 36bbe14..36bbe14 100644 --- a/maps/placeholder/blk/BullLeague2F.blk +++ b/maps/BullLeague2F.blk diff --git a/maps/placeholder/blk/BullMart.blk b/maps/BullMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/BullMart.blk +++ b/maps/BullMart.blk diff --git a/maps/placeholder/blk/BullPokecenter1F.blk b/maps/BullPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/BullPokecenter1F.blk +++ b/maps/BullPokecenter1F.blk diff --git a/maps/placeholder/blk/BullPokecenter2F.blk b/maps/BullPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/BullPokecenter2F.blk +++ b/maps/BullPokecenter2F.blk diff --git a/maps/placeholder/blk/CaveMinecarts1.blk b/maps/CaveMinecarts1.blk index 2d940be..2d940be 100644 --- a/maps/placeholder/blk/CaveMinecarts1.blk +++ b/maps/CaveMinecarts1.blk diff --git a/maps/placeholder/blk/CaveMinecarts2.blk b/maps/CaveMinecarts2.blk index 91d989c..91d989c 100644 --- a/maps/placeholder/blk/CaveMinecarts2.blk +++ b/maps/CaveMinecarts2.blk diff --git a/maps/placeholder/blk/CaveMinecarts3.blk b/maps/CaveMinecarts3.blk index 91d989c..91d989c 100644 --- a/maps/placeholder/blk/CaveMinecarts3.blk +++ b/maps/CaveMinecarts3.blk diff --git a/maps/placeholder/blk/CaveMinecarts4.blk b/maps/CaveMinecarts4.blk index fda3a95..fda3a95 100644 --- a/maps/placeholder/blk/CaveMinecarts4.blk +++ b/maps/CaveMinecarts4.blk diff --git a/maps/placeholder/blk/CaveMinecarts5.blk b/maps/CaveMinecarts5.blk index 31ba890..31ba890 100644 --- a/maps/placeholder/blk/CaveMinecarts5.blk +++ b/maps/CaveMinecarts5.blk diff --git a/maps/placeholder/blk/CaveMinecarts6.blk b/maps/CaveMinecarts6.blk index 36788e6..36788e6 100644 --- a/maps/placeholder/blk/CaveMinecarts6.blk +++ b/maps/CaveMinecarts6.blk diff --git a/maps/placeholder/blk/CaveMinecarts7.blk b/maps/CaveMinecarts7.blk index bbafdd4..bbafdd4 100644 --- a/maps/placeholder/blk/CaveMinecarts7.blk +++ b/maps/CaveMinecarts7.blk diff --git a/maps/placeholder/blk/Fonto.blk b/maps/Fonto.blk index daeb894..daeb894 100644 --- a/maps/placeholder/blk/Fonto.blk +++ b/maps/Fonto.blk diff --git a/maps/placeholder/blk/FontoHouse.blk b/maps/FontoHouse.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/FontoHouse.blk +++ b/maps/FontoHouse.blk diff --git a/maps/placeholder/blk/FontoLab.blk b/maps/FontoLab.blk index a358ac9..a358ac9 100644 --- a/maps/placeholder/blk/FontoLab.blk +++ b/maps/FontoLab.blk diff --git a/maps/placeholder/blk/FontoMart.blk b/maps/FontoMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/FontoMart.blk +++ b/maps/FontoMart.blk diff --git a/maps/placeholder/blk/FontoPokecenter1F.blk b/maps/FontoPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/FontoPokecenter1F.blk +++ b/maps/FontoPokecenter1F.blk diff --git a/maps/placeholder/blk/FontoPokecenter2F.blk b/maps/FontoPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/FontoPokecenter2F.blk +++ b/maps/FontoPokecenter2F.blk diff --git a/maps/placeholder/blk/FontoRocketHouse.blk b/maps/FontoRocketHouse.blk index 8f3b907..8f3b907 100644 --- a/maps/placeholder/blk/FontoRocketHouse.blk +++ b/maps/FontoRocketHouse.blk diff --git a/maps/placeholder/blk/FontoRoute1.blk b/maps/FontoRoute1.blk index a90f189..a90f189 100644 --- a/maps/placeholder/blk/FontoRoute1.blk +++ b/maps/FontoRoute1.blk diff --git a/maps/placeholder/blk/FontoRoute2.blk b/maps/FontoRoute2.blk index ef62cf7..ef62cf7 100644 --- a/maps/placeholder/blk/FontoRoute2.blk +++ b/maps/FontoRoute2.blk diff --git a/maps/placeholder/blk/FontoRoute3.blk b/maps/FontoRoute3.blk index 06622fe..06622fe 100644 --- a/maps/placeholder/blk/FontoRoute3.blk +++ b/maps/FontoRoute3.blk diff --git a/maps/placeholder/blk/FontoRoute4.blk b/maps/FontoRoute4.blk index 213f24a..213f24a 100644 --- a/maps/placeholder/blk/FontoRoute4.blk +++ b/maps/FontoRoute4.blk diff --git a/maps/placeholder/blk/FontoRoute5.blk b/maps/FontoRoute5.blk index b26250d..b26250d 100644 --- a/maps/placeholder/blk/FontoRoute5.blk +++ b/maps/FontoRoute5.blk diff --git a/maps/placeholder/blk/FontoRoute6.blk b/maps/FontoRoute6.blk index 50a0dec..50a0dec 100644 --- a/maps/placeholder/blk/FontoRoute6.blk +++ b/maps/FontoRoute6.blk diff --git a/maps/placeholder/blk/FontoRouteGate1.blk b/maps/FontoRouteGate1.blk index ac08a0a..ac08a0a 100644 --- a/maps/placeholder/blk/FontoRouteGate1.blk +++ b/maps/FontoRouteGate1.blk diff --git a/maps/placeholder/blk/FontoRouteGate2.blk b/maps/FontoRouteGate2.blk index 0ba6b01..0ba6b01 100644 --- a/maps/placeholder/blk/FontoRouteGate2.blk +++ b/maps/FontoRouteGate2.blk diff --git a/maps/placeholder/blk/FontoRouteGate3.blk b/maps/FontoRouteGate3.blk index 0ba6b01..0ba6b01 100644 --- a/maps/placeholder/blk/FontoRouteGate3.blk +++ b/maps/FontoRouteGate3.blk diff --git a/maps/placeholder/blk/Haiteku.blk b/maps/Haiteku.blk index 9c0ed26..9c0ed26 100644 --- a/maps/placeholder/blk/Haiteku.blk +++ b/maps/Haiteku.blk diff --git a/maps/placeholder/blk/HaitekuAquarium1F.blk b/maps/HaitekuAquarium1F.blk index 7df5533..7df5533 100644 --- a/maps/placeholder/blk/HaitekuAquarium1F.blk +++ b/maps/HaitekuAquarium1F.blk diff --git a/maps/placeholder/blk/HaitekuAquarium2F.blk b/maps/HaitekuAquarium2F.blk index 3e74655..3e74655 100644 --- a/maps/placeholder/blk/HaitekuAquarium2F.blk +++ b/maps/HaitekuAquarium2F.blk diff --git a/maps/placeholder/blk/HaitekuHouse1.blk b/maps/HaitekuHouse1.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/HaitekuHouse1.blk +++ b/maps/HaitekuHouse1.blk diff --git a/maps/placeholder/blk/HaitekuHouse2.blk b/maps/HaitekuHouse2.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/HaitekuHouse2.blk +++ b/maps/HaitekuHouse2.blk diff --git a/maps/placeholder/blk/HaitekuImposterOakHouse.blk b/maps/HaitekuImposterOakHouse.blk index 9acf892..9acf892 100644 --- a/maps/placeholder/blk/HaitekuImposterOakHouse.blk +++ b/maps/HaitekuImposterOakHouse.blk diff --git a/maps/placeholder/blk/HaitekuLeague1F.blk b/maps/HaitekuLeague1F.blk index b4060b3..b4060b3 100644 --- a/maps/placeholder/blk/HaitekuLeague1F.blk +++ b/maps/HaitekuLeague1F.blk diff --git a/maps/placeholder/blk/HaitekuLeague2F.blk b/maps/HaitekuLeague2F.blk index 9326b70..9326b70 100644 --- a/maps/placeholder/blk/HaitekuLeague2F.blk +++ b/maps/HaitekuLeague2F.blk diff --git a/maps/placeholder/blk/HaitekuMart.blk b/maps/HaitekuMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/HaitekuMart.blk +++ b/maps/HaitekuMart.blk diff --git a/maps/placeholder/blk/HaitekuPokecenter1F.blk b/maps/HaitekuPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/HaitekuPokecenter1F.blk +++ b/maps/HaitekuPokecenter1F.blk diff --git a/maps/placeholder/blk/HaitekuPokecenter2F.blk b/maps/HaitekuPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/HaitekuPokecenter2F.blk +++ b/maps/HaitekuPokecenter2F.blk diff --git a/maps/placeholder/blk/HaitekuWestRoute.blk b/maps/HaitekuWestRoute.blk index ab728ef..ab728ef 100644 --- a/maps/placeholder/blk/HaitekuWestRoute.blk +++ b/maps/HaitekuWestRoute.blk diff --git a/maps/placeholder/blk/HaitekuWestRouteGate.blk b/maps/HaitekuWestRouteGate.blk index 0ba6b01..0ba6b01 100644 --- a/maps/placeholder/blk/HaitekuWestRouteGate.blk +++ b/maps/HaitekuWestRouteGate.blk diff --git a/maps/placeholder/blk/HaitekuWestRouteOcean.blk b/maps/HaitekuWestRouteOcean.blk index 84d4ca7..84d4ca7 100644 --- a/maps/placeholder/blk/HaitekuWestRouteOcean.blk +++ b/maps/HaitekuWestRouteOcean.blk diff --git a/maps/placeholder/blk/Kanto.blk b/maps/Kanto.blk index f9c90c7..f9c90c7 100644 --- a/maps/placeholder/blk/Kanto.blk +++ b/maps/Kanto.blk diff --git a/maps/placeholder/blk/KantoCeladonElevator.blk b/maps/KantoCeladonElevator.blk index 2a0fe57..2a0fe57 100644 --- a/maps/placeholder/blk/KantoCeladonElevator.blk +++ b/maps/KantoCeladonElevator.blk diff --git a/maps/placeholder/blk/KantoCeladonMart1F.blk b/maps/KantoCeladonMart1F.blk index 06ddb4d..06ddb4d 100644 --- a/maps/placeholder/blk/KantoCeladonMart1F.blk +++ b/maps/KantoCeladonMart1F.blk diff --git a/maps/placeholder/blk/KantoCeladonMart2F.blk b/maps/KantoCeladonMart2F.blk index e5a6605..e5a6605 100644 --- a/maps/placeholder/blk/KantoCeladonMart2F.blk +++ b/maps/KantoCeladonMart2F.blk diff --git a/maps/placeholder/blk/KantoCeladonMart3F.blk b/maps/KantoCeladonMart3F.blk index f7c657e..f7c657e 100644 --- a/maps/placeholder/blk/KantoCeladonMart3F.blk +++ b/maps/KantoCeladonMart3F.blk diff --git a/maps/placeholder/blk/KantoCeladonMart4F.blk b/maps/KantoCeladonMart4F.blk index 540dc4c..540dc4c 100644 --- a/maps/placeholder/blk/KantoCeladonMart4F.blk +++ b/maps/KantoCeladonMart4F.blk diff --git a/maps/placeholder/blk/KantoCeladonMart5F.blk b/maps/KantoCeladonMart5F.blk index 447ad4d..447ad4d 100644 --- a/maps/placeholder/blk/KantoCeladonMart5F.blk +++ b/maps/KantoCeladonMart5F.blk diff --git a/maps/placeholder/blk/KantoCeruleanHouse.blk b/maps/KantoCeruleanHouse.blk index 2e78955..2e78955 100644 --- a/maps/placeholder/blk/KantoCeruleanHouse.blk +++ b/maps/KantoCeruleanHouse.blk diff --git a/maps/placeholder/blk/KantoDiner.blk b/maps/KantoDiner.blk index 0e5ed4b..0e5ed4b 100644 --- a/maps/placeholder/blk/KantoDiner.blk +++ b/maps/KantoDiner.blk diff --git a/maps/placeholder/blk/KantoEastRoute.blk b/maps/KantoEastRoute.blk index 62c82e6..62c82e6 100644 --- a/maps/placeholder/blk/KantoEastRoute.blk +++ b/maps/KantoEastRoute.blk diff --git a/maps/placeholder/blk/KantoEldersHouse.blk b/maps/KantoEldersHouse.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/KantoEldersHouse.blk +++ b/maps/KantoEldersHouse.blk diff --git a/maps/placeholder/blk/KantoFishingGuru.blk b/maps/KantoFishingGuru.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/KantoFishingGuru.blk +++ b/maps/KantoFishingGuru.blk diff --git a/maps/placeholder/blk/KantoGameCorner.blk b/maps/KantoGameCorner.blk index df126bb..df126bb 100644 --- a/maps/placeholder/blk/KantoGameCorner.blk +++ b/maps/KantoGameCorner.blk diff --git a/maps/placeholder/blk/KantoGameCornerPrizes.blk b/maps/KantoGameCornerPrizes.blk index c069bf9..c069bf9 100644 --- a/maps/placeholder/blk/KantoGameCornerPrizes.blk +++ b/maps/KantoGameCornerPrizes.blk diff --git a/maps/placeholder/blk/KantoGamefreakHQ1.blk b/maps/KantoGamefreakHQ1.blk index fa26b13..fa26b13 100644 --- a/maps/placeholder/blk/KantoGamefreakHQ1.blk +++ b/maps/KantoGamefreakHQ1.blk diff --git a/maps/placeholder/blk/KantoGamefreakHQ2.blk b/maps/KantoGamefreakHQ2.blk index 6e09a15..6e09a15 100644 --- a/maps/placeholder/blk/KantoGamefreakHQ2.blk +++ b/maps/KantoGamefreakHQ2.blk diff --git a/maps/placeholder/blk/KantoGamefreakHQ3.blk b/maps/KantoGamefreakHQ3.blk index f26a916..f26a916 100644 --- a/maps/placeholder/blk/KantoGamefreakHQ3.blk +++ b/maps/KantoGamefreakHQ3.blk diff --git a/maps/placeholder/blk/KantoGamefreakHQ4.blk b/maps/KantoGamefreakHQ4.blk index e5908b7..e5908b7 100644 --- a/maps/placeholder/blk/KantoGamefreakHQ4.blk +++ b/maps/KantoGamefreakHQ4.blk diff --git a/maps/placeholder/blk/KantoGamefreakHQ5.blk b/maps/KantoGamefreakHQ5.blk index 189cf67..189cf67 100644 --- a/maps/placeholder/blk/KantoGamefreakHQ5.blk +++ b/maps/KantoGamefreakHQ5.blk diff --git a/maps/placeholder/blk/KantoGreensHouse1F.blk b/maps/KantoGreensHouse1F.blk index 5fbd05e..5fbd05e 100644 --- a/maps/placeholder/blk/KantoGreensHouse1F.blk +++ b/maps/KantoGreensHouse1F.blk diff --git a/maps/placeholder/blk/KantoGreensHouse2F.blk b/maps/KantoGreensHouse2F.blk index 5b68e93..5b68e93 100644 --- a/maps/placeholder/blk/KantoGreensHouse2F.blk +++ b/maps/KantoGreensHouse2F.blk diff --git a/maps/placeholder/blk/KantoHospital.blk b/maps/KantoHospital.blk index f9dc77b..f9dc77b 100644 --- a/maps/placeholder/blk/KantoHospital.blk +++ b/maps/KantoHospital.blk diff --git a/maps/placeholder/blk/KantoLavenderHouse.blk b/maps/KantoLavenderHouse.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/KantoLavenderHouse.blk +++ b/maps/KantoLavenderHouse.blk diff --git a/maps/placeholder/blk/KantoLeague1F.blk b/maps/KantoLeague1F.blk index b4060b3..b4060b3 100644 --- a/maps/placeholder/blk/KantoLeague1F.blk +++ b/maps/KantoLeague1F.blk diff --git a/maps/placeholder/blk/KantoLeague21F.blk b/maps/KantoLeague21F.blk index b4060b3..b4060b3 100644 --- a/maps/placeholder/blk/KantoLeague21F.blk +++ b/maps/KantoLeague21F.blk diff --git a/maps/placeholder/blk/KantoLeague22F.blk b/maps/KantoLeague22F.blk index 0883f4a..0883f4a 100644 --- a/maps/placeholder/blk/KantoLeague22F.blk +++ b/maps/KantoLeague22F.blk diff --git a/maps/placeholder/blk/KantoLeague2F.blk b/maps/KantoLeague2F.blk index 0883f4a..0883f4a 100644 --- a/maps/placeholder/blk/KantoLeague2F.blk +++ b/maps/KantoLeague2F.blk diff --git a/maps/placeholder/blk/KantoMart.blk b/maps/KantoMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/KantoMart.blk +++ b/maps/KantoMart.blk diff --git a/maps/placeholder/blk/KantoOaksLab.blk b/maps/KantoOaksLab.blk index a14cbaa..a14cbaa 100644 --- a/maps/placeholder/blk/KantoOaksLab.blk +++ b/maps/KantoOaksLab.blk diff --git a/maps/placeholder/blk/KantoPokecenter1F.blk b/maps/KantoPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/KantoPokecenter1F.blk +++ b/maps/KantoPokecenter1F.blk diff --git a/maps/placeholder/blk/KantoPokecenter21F.blk b/maps/KantoPokecenter21F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/KantoPokecenter21F.blk +++ b/maps/KantoPokecenter21F.blk diff --git a/maps/placeholder/blk/KantoPokecenter22F.blk b/maps/KantoPokecenter22F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/KantoPokecenter22F.blk +++ b/maps/KantoPokecenter22F.blk diff --git a/maps/placeholder/blk/KantoPokecenter2F.blk b/maps/KantoPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/KantoPokecenter2F.blk +++ b/maps/KantoPokecenter2F.blk diff --git a/maps/placeholder/blk/KantoRedsHouse.blk b/maps/KantoRedsHouse.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/KantoRedsHouse.blk +++ b/maps/KantoRedsHouse.blk diff --git a/maps/placeholder/blk/KantoSchool.blk b/maps/KantoSchool.blk index 4450749..4450749 100644 --- a/maps/placeholder/blk/KantoSchool.blk +++ b/maps/KantoSchool.blk diff --git a/maps/placeholder/blk/KantoSilphCo.blk b/maps/KantoSilphCo.blk index 8276215..8276215 100644 --- a/maps/placeholder/blk/KantoSilphCo.blk +++ b/maps/KantoSilphCo.blk diff --git a/maps/placeholder/blk/KantoUnusedArea.blk b/maps/KantoUnusedArea.blk index 990dc3c..990dc3c 100644 --- a/maps/placeholder/blk/KantoUnusedArea.blk +++ b/maps/KantoUnusedArea.blk diff --git a/maps/placeholder/blk/KantoViridianHouse.blk b/maps/KantoViridianHouse.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/KantoViridianHouse.blk +++ b/maps/KantoViridianHouse.blk diff --git a/maps/placeholder/blk/MtFuji.blk b/maps/MtFuji.blk index eed5797..eed5797 100644 --- a/maps/placeholder/blk/MtFuji.blk +++ b/maps/MtFuji.blk diff --git a/maps/placeholder/blk/MtFujiRoute.blk b/maps/MtFujiRoute.blk index 2437a8a..2437a8a 100644 --- a/maps/placeholder/blk/MtFujiRoute.blk +++ b/maps/MtFujiRoute.blk diff --git a/maps/placeholder/blk/Newtype.blk b/maps/Newtype.blk index 9e04fec..9e04fec 100644 --- a/maps/placeholder/blk/Newtype.blk +++ b/maps/Newtype.blk diff --git a/maps/placeholder/blk/NewtypeDiner.blk b/maps/NewtypeDiner.blk index c8c147d..c8c147d 100644 --- a/maps/placeholder/blk/NewtypeDiner.blk +++ b/maps/NewtypeDiner.blk diff --git a/maps/placeholder/blk/NewtypeDojo.blk b/maps/NewtypeDojo.blk index eef748d..eef748d 100644 --- a/maps/placeholder/blk/NewtypeDojo.blk +++ b/maps/NewtypeDojo.blk diff --git a/maps/placeholder/blk/NewtypeHouse1.blk b/maps/NewtypeHouse1.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/NewtypeHouse1.blk +++ b/maps/NewtypeHouse1.blk diff --git a/maps/placeholder/blk/NewtypeHouse2.blk b/maps/NewtypeHouse2.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/NewtypeHouse2.blk +++ b/maps/NewtypeHouse2.blk diff --git a/maps/placeholder/blk/NewtypeHouse3.blk b/maps/NewtypeHouse3.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/NewtypeHouse3.blk +++ b/maps/NewtypeHouse3.blk diff --git a/maps/placeholder/blk/NewtypeLeague1F.blk b/maps/NewtypeLeague1F.blk index b4060b3..b4060b3 100644 --- a/maps/placeholder/blk/NewtypeLeague1F.blk +++ b/maps/NewtypeLeague1F.blk diff --git a/maps/placeholder/blk/NewtypeLeague2F.blk b/maps/NewtypeLeague2F.blk index f046577..f046577 100644 --- a/maps/placeholder/blk/NewtypeLeague2F.blk +++ b/maps/NewtypeLeague2F.blk diff --git a/maps/placeholder/blk/NewtypeMart.blk b/maps/NewtypeMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/NewtypeMart.blk +++ b/maps/NewtypeMart.blk diff --git a/maps/placeholder/blk/NewtypePokecenter1F.blk b/maps/NewtypePokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/NewtypePokecenter1F.blk +++ b/maps/NewtypePokecenter1F.blk diff --git a/maps/placeholder/blk/NewtypePokecenter2F.blk b/maps/NewtypePokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/NewtypePokecenter2F.blk +++ b/maps/NewtypePokecenter2F.blk diff --git a/maps/placeholder/blk/NewtypeRoute.blk b/maps/NewtypeRoute.blk index 3973f11..3973f11 100644 --- a/maps/placeholder/blk/NewtypeRoute.blk +++ b/maps/NewtypeRoute.blk diff --git a/maps/placeholder/blk/NewtypeRouteGate.blk b/maps/NewtypeRouteGate.blk index 0ba6b01..0ba6b01 100644 --- a/maps/placeholder/blk/NewtypeRouteGate.blk +++ b/maps/NewtypeRouteGate.blk diff --git a/maps/placeholder/blk/NewtypeSailorHouse.blk b/maps/NewtypeSailorHouse.blk index 9acf892..9acf892 100644 --- a/maps/placeholder/blk/NewtypeSailorHouse.blk +++ b/maps/NewtypeSailorHouse.blk diff --git a/maps/placeholder/blk/North.blk b/maps/North.blk index 6517275..6517275 100644 --- a/maps/placeholder/blk/North.blk +++ b/maps/North.blk diff --git a/maps/placeholder/blk/NorthHouse1.blk b/maps/NorthHouse1.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/NorthHouse1.blk +++ b/maps/NorthHouse1.blk diff --git a/maps/placeholder/blk/NorthHouse2.blk b/maps/NorthHouse2.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/NorthHouse2.blk +++ b/maps/NorthHouse2.blk diff --git a/maps/placeholder/blk/NorthMart.blk b/maps/NorthMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/NorthMart.blk +++ b/maps/NorthMart.blk diff --git a/maps/placeholder/blk/NorthPokecenter1F.blk b/maps/NorthPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/NorthPokecenter1F.blk +++ b/maps/NorthPokecenter1F.blk diff --git a/maps/placeholder/blk/NorthPokecenter2F.blk b/maps/NorthPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/NorthPokecenter2F.blk +++ b/maps/NorthPokecenter2F.blk diff --git a/maps/placeholder/blk/Office1.blk b/maps/Office1.blk index 2cc3b05..2cc3b05 100644 --- a/maps/placeholder/blk/Office1.blk +++ b/maps/Office1.blk diff --git a/maps/placeholder/blk/Office2.blk b/maps/Office2.blk index d746f18..d746f18 100644 --- a/maps/placeholder/blk/Office2.blk +++ b/maps/Office2.blk diff --git a/maps/placeholder/blk/Office3.blk b/maps/Office3.blk index a90acc0..a90acc0 100644 --- a/maps/placeholder/blk/Office3.blk +++ b/maps/Office3.blk diff --git a/maps/placeholder/blk/OldCity.blk b/maps/OldCity.blk index b097bad..b097bad 100644 --- a/maps/placeholder/blk/OldCity.blk +++ b/maps/OldCity.blk diff --git a/maps/placeholder/blk/OldCityBillsHouse.blk b/maps/OldCityBillsHouse.blk index 323fe84..323fe84 100644 --- a/maps/placeholder/blk/OldCityBillsHouse.blk +++ b/maps/OldCityBillsHouse.blk diff --git a/maps/placeholder/blk/OldCityGym.blk b/maps/OldCityGym.blk index 53298ca..53298ca 100644 --- a/maps/placeholder/blk/OldCityGym.blk +++ b/maps/OldCityGym.blk diff --git a/maps/placeholder/blk/OldCityHouse.blk b/maps/OldCityHouse.blk index 923d6f0..923d6f0 100644 --- a/maps/placeholder/blk/OldCityHouse.blk +++ b/maps/OldCityHouse.blk diff --git a/maps/placeholder/blk/OldCityKurtsHouse.blk b/maps/OldCityKurtsHouse.blk index 5879f0b..5879f0b 100644 --- a/maps/placeholder/blk/OldCityKurtsHouse.blk +++ b/maps/OldCityKurtsHouse.blk diff --git a/maps/placeholder/blk/OldCityMart.blk b/maps/OldCityMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/OldCityMart.blk +++ b/maps/OldCityMart.blk diff --git a/maps/placeholder/blk/OldCityMuseum.blk b/maps/OldCityMuseum.blk index 5806366..5806366 100644 --- a/maps/placeholder/blk/OldCityMuseum.blk +++ b/maps/OldCityMuseum.blk diff --git a/maps/placeholder/blk/OldCityPokecenter1F.blk b/maps/OldCityPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/OldCityPokecenter1F.blk +++ b/maps/OldCityPokecenter1F.blk diff --git a/maps/OldCityPokecenter2F.asm b/maps/OldCityPokecenter2F.asm deleted file mode 100644 index f574296..0000000 --- a/maps/OldCityPokecenter2F.asm +++ /dev/null @@ -1,88 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/OldCityPokecenter2F.asm", ROMX - -OldCityPokecenter2FScriptLoader: - call Unreferenced_Function7e6 - ld hl, OldCityPokecenter2FScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -OldCityPokecenter2FScriptPointers: - dw OldCityPokecenter2FScript1 - dw OldCityPokecenter2FNPCIds - -OldCityPokecenter2FScript1: - ld hl, OldCityPokecenter2FNPCIds - ld de, OldCityPokecenter2FSignPointers - call CallMapTextSubroutine - ret - -OldCityPokecenter2FNPCIds: - db $00, $01, $02, $03, $ff - -OldCityPokecenter2FSignPointers: - dw MapDefaultText - -OldCityPokecenter2FTextPointers: - dw OldCityPokecenter2FText1 - dw OldCityPokecenter2FText2 - dw OldCityPokecenter2FText3 - dw OldCityPokecenter2FText4 - -OldCityPokecenter2FText1: - ld a, $01 - ld [wce37], a - ld hl, wJoypadFlags - set 5, [hl] - callab Function29abf - ld hl, wJoypadFlags - res 5, [hl] - ret - -OldCityPokecenter2FText2: - ld a, $02 - ld [wce37], a - ld hl, wJoypadFlags - set 5, [hl] - callab Function29abf - ld hl, wJoypadFlags - res 5, [hl] - ret - -OldCityPokecenter2FText3: - ld hl, Text947e3 - call OpenTextbox - ret - -Text947e3: - text "おりゃ！" - done - -OldCityPokecenter2FText4: - ld hl, OldCityPokecenter2FTextString4 - call OpenTextbox - callab Function29a1f - jr c, .asm_9480c - ld a, $05 - call Function169f ; something related to follow - jr .asm_9480c -; unreferenced? - ld hl, Data14824 - ld a, $5 - call Function16fb - ld hl, $0000 - nop -.asm_9480c - ret - -OldCityPokecenter2FTextString4: - text "うしろにあるのは" - line "タイムマシンです" - done - - db $05, $25, $24, $48 - -Data14824: ; movement data - db $07, $32 diff --git a/maps/blk/OldCityPokecenter2F.blk b/maps/OldCityPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/blk/OldCityPokecenter2F.blk +++ b/maps/OldCityPokecenter2F.blk diff --git a/maps/OldCityPokecenterBattle.asm b/maps/OldCityPokecenterBattle.asm deleted file mode 100644 index 6e9d1d9..0000000 --- a/maps/OldCityPokecenterBattle.asm +++ /dev/null @@ -1,43 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/OldCityPokecenterBattle.asm", ROMX - -OldCityPokecenterBattleScriptLoader: - ld hl, OldCityPokecenterBattleScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -OldCityPokecenterBattleScriptPointers: - dw OldCityPokecenterBattleScript1 - dw OldCityPokecenterBattleNPCIds - -OldCityPokecenterBattleScript1: - ld hl, OldCityPokecenterBattleNPCIds - ld de, OldCityPokecenterBattleSignPointers - call CallMapTextSubroutine - ret - -OldCityPokecenterBattleNPCIds: - db $00, $ff - -OldCityPokecenterBattleSignPointers: - dw MapDefaultText - -OldCityPokecenterBattleTextPointers: - dw OldCityPokecenterBattleText1 - -OldCityPokecenterBattleText1: - ld hl, wJoypadFlags - set 5, [hl] - ld hl, OldCityPokecenterBattleTextString1 - call OpenTextbox - ld hl, wJoypadFlags - res 5, [hl] - callab Function28000 - ret - -OldCityPokecenterBattleTextString1: - text "ちょっとまってね！@" - text_exit - db "@" diff --git a/maps/blk/OldCityPokecenterBattle.blk b/maps/OldCityPokecenterBattle.blk index 2366a43..2366a43 100644 --- a/maps/blk/OldCityPokecenterBattle.blk +++ b/maps/OldCityPokecenterBattle.blk diff --git a/maps/OldCityPokecenterTimeMachine.asm b/maps/OldCityPokecenterTimeMachine.asm deleted file mode 100644 index d1db284..0000000 --- a/maps/OldCityPokecenterTimeMachine.asm +++ /dev/null @@ -1,35 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/OldCityPokecenterTimeMachine.asm", ROMX - -OldCityPokecenterTimeMachineScriptLoader: - call Unreferenced_Function7e6 - ld hl, OldCityPokecenterTimeMachineScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -OldCityPokecenterTimeMachineScriptPointers: - dw OldCityPokecenterTimeMachineScript1 - dw OldCityPokecenterTimeMachineNPCIds - -OldCityPokecenterTimeMachineScript1: - ld hl, OldCityPokecenterTimeMachineNPCIds - ld de, OldCityPokecenterTimeMachineSignPointers - call CallMapTextSubroutine - ret - -OldCityPokecenterTimeMachineNPCIds: - db $00, $ff - -OldCityPokecenterTimeMachineSignPointers: - dw MapDefaultText - -OldCityPokecenterTimeMachineTextPointers: - dw OldCityPokecenterTimeMachineText1 - -OldCityPokecenterTimeMachineText1: - xor a - ld [wce37], a - callab Function29abf - ret diff --git a/maps/blk/OldCityPokecenterTimeMachine.blk b/maps/OldCityPokecenterTimeMachine.blk index ccd07b6..ccd07b6 100644 --- a/maps/blk/OldCityPokecenterTimeMachine.blk +++ b/maps/OldCityPokecenterTimeMachine.blk diff --git a/maps/OldCityPokecenterTrade.asm b/maps/OldCityPokecenterTrade.asm deleted file mode 100644 index 1dc50c3..0000000 --- a/maps/OldCityPokecenterTrade.asm +++ /dev/null @@ -1,45 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/OldCityPokecenterTrade.asm", ROMX - -OldCityPokecenterTradeScriptLoader: - ld hl, OldCityPokecenterTradeScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -OldCityPokecenterTradeScriptPointers: - dw OldCityPokecenterTradeScript1 - dw OldCityPokecenterTradeNPCIds - -OldCityPokecenterTradeScript1: - ld hl, OldCityPokecenterTradeNPCIds - ld de, OldCityPokecenterTradeSignPointers - call CallMapTextSubroutine - ret - -OldCityPokecenterTradeNPCIds: - db $00, $ff - -OldCityPokecenterTradeSignPointers: - dw MapDefaultText - -OldCityPokecenterTradeTextPointers: - dw OldCityPokecenterTradeText1 - -OldCityPokecenterTradeText1: - ld hl, wJoypadFlags - set 5, [hl] - ld hl, OldCityPokecenterTradeTextString1 - call OpenTextbox - ld hl, wJoypadFlags - res 5, [hl] - callab Function28000 - ret - -OldCityPokecenterTradeTextString1: - text "ちょっとまってね！@" - text_exit - text_exit - text_exit - db "@" diff --git a/maps/blk/OldCityPokecenterTrade.blk b/maps/OldCityPokecenterTrade.blk index 56e9374..56e9374 100644 --- a/maps/blk/OldCityPokecenterTrade.blk +++ b/maps/OldCityPokecenterTrade.blk diff --git a/maps/placeholder/blk/OldCitySchool.blk b/maps/OldCitySchool.blk index 4450749..4450749 100644 --- a/maps/placeholder/blk/OldCitySchool.blk +++ b/maps/OldCitySchool.blk diff --git a/maps/placeholder/blk/OldCityTower1F.blk b/maps/OldCityTower1F.blk index 8e62ed2..8e62ed2 100644 --- a/maps/placeholder/blk/OldCityTower1F.blk +++ b/maps/OldCityTower1F.blk diff --git a/maps/placeholder/blk/OldCityTower2F.blk b/maps/OldCityTower2F.blk index a25e4a1..a25e4a1 100644 --- a/maps/placeholder/blk/OldCityTower2F.blk +++ b/maps/OldCityTower2F.blk diff --git a/maps/placeholder/blk/OldCityTower3F.blk b/maps/OldCityTower3F.blk index f1458c4..f1458c4 100644 --- a/maps/placeholder/blk/OldCityTower3F.blk +++ b/maps/OldCityTower3F.blk diff --git a/maps/placeholder/blk/OldCityTower4F.blk b/maps/OldCityTower4F.blk index fcbda17..fcbda17 100644 --- a/maps/placeholder/blk/OldCityTower4F.blk +++ b/maps/OldCityTower4F.blk diff --git a/maps/placeholder/blk/OldCityTower5F.blk b/maps/OldCityTower5F.blk index 177059a..177059a 100644 --- a/maps/placeholder/blk/OldCityTower5F.blk +++ b/maps/OldCityTower5F.blk diff --git a/maps/PlayerHouse1F.asm b/maps/PlayerHouse1F.asm deleted file mode 100644 index 162a47f..0000000 --- a/maps/PlayerHouse1F.asm +++ /dev/null @@ -1,59 +0,0 @@ -include "constants.asm" - -SECTION "maps/PlayerHouse1F.asm", ROMX - -PlayerHouse1FScriptLoader:: - ld hl, PlayerHouse1FScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -PlayerHouse1FScriptPointers: - dw PlayerHouse1FScript1 - dw PlayerHouse1FNPCIDs1 - dw PlayerHouse1FScript2 - dw PlayerHouse1FNPCIDs2 - -PlayerHouse1FNPCIDs1: - db $FF - -PlayerHouse1FNPCIDs2: - db 0 - db $FF - -PlayerHouse1FScript1: - ld hl, PlayerHouse1FNPCIDs1 - ld de, PlayerHouse1FSignPointers - call CallMapTextSubroutine - ret - -PlayerHouse1FScript2: - ld hl, PlayerHouse1FNPCIDs2 - ld de, PlayerHouse1FSignPointers - call CallMapTextSubroutine - ret - -PlayerHouse1FSignPointers: - dw Function38ab - dw Function38b4 - dw Function38a2 - dw Function38bd - dw Function3899 -PlayerHouse1FTextPointers:: - dw PlayerHouse1FNPCText1 - -PlayerHouse1FNPCText1: - ld hl, PlayerHouse1FTextString1 - call OpenTextbox - ret - -PlayerHouse1FTextString1: - text "おかあさん『えっ あなた" - line "オーキドはかせに" - cont "ポケモンずかんを つくってくれって" - cont "たのまれたの？" - - para "すごいじゃない！" - line "わたしも ポケモン きらいって" - cont "わけじゃないし がんばるのよ！" - done diff --git a/maps/blk/PlayerHouse1F.blk b/maps/PlayerHouse1F.blk index 8b85e15..8b85e15 100644 --- a/maps/blk/PlayerHouse1F.blk +++ b/maps/PlayerHouse1F.blk diff --git a/maps/PlayerHouse2F.asm b/maps/PlayerHouse2F.asm deleted file mode 100644 index 30840e8..0000000 --- a/maps/PlayerHouse2F.asm +++ /dev/null @@ -1,260 +0,0 @@ -include "constants.asm" - -SECTION "maps/PlayerHouse2F.asm", ROMX - -PlayerHouse2FScriptLoader:: - ld hl, PlayerHouse2FScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -PlayerHouse2FScriptPointers: - dw PlayerHouse2FScript1 - dw PlayerHouse2FNPCIDs1 - dw PlayerHouse2FScript2 - dw PlayerHouse2FNPCIDs2 - -PlayerHouse2FTextPointers:: - dw PlayerHouse2FText1 - dw PlayerHouse2FDollText - -PlayerHouse2FNPCIDs1: - db 0 - db 1 - db $FF - -PlayerHouse2FNPCIDs2: - db 1 - db $FF - -PlayerHouse2FSignPointers: - dw Function3899 - dw PlayerHouse2FRadioText - dw PlayerHouse2FComputerText - dw Function3899 - dw PlayerHouse2FN64Text - -PlayerHouse2FScript1: - call PlayerHouse2PositionCheck - ret z - ld hl, PlayerHouse2FNPCIDs1 - ld de, PlayerHouse2FSignPointers - call CallMapTextSubroutine - ret nz - ret - -PlayerHouse2PositionCheck: - ld hl, wd41a - bit 0, [hl] - ret nz - ld a, [wYCoord] - cp 1 - ret nz - ld a, [wXCoord] - cp 9 - ret nz - ld hl, wJoypadFlags - set 6, [hl] - ld a, LEFT - ld d, 0 - call SetObjectFacing - ld hl, PlayerHouse2FTextString2 - call OpenTextbox - call PlayerHouse2FMovePlayer - call ClearAccumulator - ret - -PlayerHouse2FMovePlayer: - ld a, 0 - ld hl, Movement - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 1 - call WriteIntod637 - ret - -Movement: - db $08 - db $04 - db $32 - -PlayerHouse2FScript2: - ld hl, PlayerHouse2FNPCIDs2 - ld de, PlayerHouse2FSignPointers - call CallMapTextSubroutine - ret - -PlayerHouse2FText1: - ld hl, wd41a - bit 3, [hl] - jr nz, .jump - ld hl, PlayerHouse2FTextString1 - call OpenTextbox - ld hl, wd41a - set 3, [hl] - ld c, 3 - call DelayFrames -.jump - ld hl, PlayerHouse2FTextString2 - call OpenTextbox - ret - -PlayerHouse2FDollText: - ld hl, PlayerHouse2FTextString3 - call OpenTextbox - ret - -PlayerHouse2FRadioText: - ld hl, PlayerHouse2FTextString9 - call OpenTextbox - ret - -PlayerHouse2FComputerText: - ld hl, wd41a - bit 0, [hl] - jr nz, .jump - ld hl, PlayerHouse2FTextString5 - call OpenTextbox - ret - -.jump - call RefreshScreen - callab Function1477D - call Function1fea - ret - -PlayerHouse2FCheckEmail: - call YesNoBox - jr c, .jump2 - ld hl, wd41a - set 0, [hl] - ld hl, PlayerHouse2FTextString6 - call PrintText - ret - -.jump2 - ld hl, PlayerHouse2FTextString7 - call PrintText - ret - -PlayerHouse2FN64Text: - ld hl, PlayerHouse2FTextString4 - call OpenTextbox - ret - -PlayerHouse2FTextString1: - text "ケン『おっ おまえの うでで" - line "ひかりかがやく そのとけいは⋯⋯" - cont "<PLAYER>も ついに" - cont "トレーナーギアを かったのか！" - - para "すごいじゃないか！" - line "でも かったばかりじゃ じかんしか" - cont "わからないだろ？" - cont "あとで マップが" - cont "みられるように してやるよ！" - cont "おまえ どうせ" - cont "あそびに いくんだろう？" - - para "ざんねんながら おふくろは" - line "かいものに いってるから" - cont "おこづかいを もらおうなんて" - cont "きょうは むり だぜ！" - done - -PlayerHouse2FTextString2: - text "そうだ おまえの パソコンに" - line "メールが とどいていたな" - cont "でかけるんなら" - cont "メールぐらい よんでおけよ" - done - -PlayerHouse2FTextString3: - text "クりスマスに カントーの" - line "しんせきに プレゼント" - cont "してもらった にんぎょうだ" - done - -PlayerHouse2FTextString4: - text "ニンテンドウ６４を してる！" - cont "⋯⋯ ⋯⋯ さてと！" - cont "そろそろ そとに あそびに" - cont "でかけるか！" - done - -PlayerHouse2FTextString5: - text "<PLAYER>は" - line "パソコンの スイッチを いれた！" - - para "おや？ <PLAYER>あてに" - line "メールが とどいている ようだ" - cont "よんでみる？@" - - db $08 - - call PlayerHouse2FCheckEmail - call Function3036 - ret - -PlayerHouse2FTextString6: - text "とつぜん メールを さしあげる" - line "しつれいを おゆるしあれ" - - para "じつは きみに どうしても" - line "わたしたい ものが あるのじゃが" - cont "うけとって もらえんかのう" - cont "ポケモンけんきゅうしゃ オーキド" - done - -PlayerHouse2FTextString7: - text "あとで" - line "よもっと<⋯⋯>" - done - -PlayerHouse2FTextString8: ; (unused?) - text "しんはつばい トレーナーギア！" - line "ポケモントレーナーの ための" - cont "さいせんたんの とけい です" - - para "じかんが わかるのは あたりまえ" - line "カセットを ついかすれば" - cont "ばしょも わかる！ " - cont "でんわが かけられる！" - - para "とどめは" - line "ラジオを きくことができる！" - - para "もうしこみさきは⋯⋯" - line "⋯⋯⋯⋯⋯⋯⋯⋯⋯⋯⋯⋯" - cont "シルフの ホームぺージだ" - done - -PlayerHouse2FTextString9: - text "<PLAYER>は" - line "ラジオのスイッチを おした！" - - para "ジェイ オー ピー エム" - line "こちらは" - cont "# ほうそうきょく です" - - para "#ニュースを おおくりします" - line "<⋯⋯> #の せかいてきな" - cont "けんきゅうしゃ オーキドはかせが" - cont "カントー から" - cont "すがたを けしました" - cont "あらたな けんきゅうの ばしょを" - cont "もとめて いどうした との" - cont "みかたも ありますが" - cont "なんらかの じけんに まきこまれた" - cont "かのうせいも あり" - cont "かんけいしゃは とても" - cont "しんぱい しています" - - para "<⋯⋯><⋯⋯>いじょう" - line "#ニュースでした" - - para "<⋯⋯><⋯⋯><⋯⋯><⋯⋯><⋯⋯><⋯⋯>" - line "それでは ひきつづき" - cont "おんがくを おたのしみ ください" - done diff --git a/maps/blk/PlayerHouse2F.blk b/maps/PlayerHouse2F.blk index 2a93fa0..2a93fa0 100644 --- a/maps/blk/PlayerHouse2F.blk +++ b/maps/PlayerHouse2F.blk diff --git a/maps/placeholder/blk/PowerPlant1.blk b/maps/PowerPlant1.blk index c853622..c853622 100644 --- a/maps/placeholder/blk/PowerPlant1.blk +++ b/maps/PowerPlant1.blk diff --git a/maps/placeholder/blk/PowerPlant2.blk b/maps/PowerPlant2.blk index d8a5646..d8a5646 100644 --- a/maps/placeholder/blk/PowerPlant2.blk +++ b/maps/PowerPlant2.blk diff --git a/maps/placeholder/blk/PowerPlant3.blk b/maps/PowerPlant3.blk index 1f866a0..1f866a0 100644 --- a/maps/placeholder/blk/PowerPlant3.blk +++ b/maps/PowerPlant3.blk diff --git a/maps/placeholder/blk/PowerPlant4.blk b/maps/PowerPlant4.blk index 7074b1d..7074b1d 100644 --- a/maps/placeholder/blk/PowerPlant4.blk +++ b/maps/PowerPlant4.blk diff --git a/maps/placeholder/blk/Prince.blk b/maps/Prince.blk index 38a4316..38a4316 100644 --- a/maps/placeholder/blk/Prince.blk +++ b/maps/Prince.blk diff --git a/maps/placeholder/blk/PrinceRoute.blk b/maps/PrinceRoute.blk index f3a7340..f3a7340 100644 --- a/maps/placeholder/blk/PrinceRoute.blk +++ b/maps/PrinceRoute.blk diff --git a/maps/placeholder/blk/Route15.blk b/maps/Route15.blk index fc3199b..fc3199b 100644 --- a/maps/placeholder/blk/Route15.blk +++ b/maps/Route15.blk diff --git a/maps/placeholder/blk/Route15Pokecenter1F.blk b/maps/Route15Pokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/Route15Pokecenter1F.blk +++ b/maps/Route15Pokecenter1F.blk diff --git a/maps/placeholder/blk/Route15Pokecenter2F.blk b/maps/Route15Pokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/Route15Pokecenter2F.blk +++ b/maps/Route15Pokecenter2F.blk diff --git a/maps/placeholder/blk/Route18.blk b/maps/Route18.blk index 1333d63..1333d63 100644 --- a/maps/placeholder/blk/Route18.blk +++ b/maps/Route18.blk diff --git a/maps/placeholder/blk/Route18Pokecenter1F.blk b/maps/Route18Pokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/Route18Pokecenter1F.blk +++ b/maps/Route18Pokecenter1F.blk diff --git a/maps/placeholder/blk/Route18Pokecenter2F.blk b/maps/Route18Pokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/Route18Pokecenter2F.blk +++ b/maps/Route18Pokecenter2F.blk diff --git a/maps/Route1Gate1F.asm b/maps/Route1Gate1F.asm deleted file mode 100644 index 9aca3ce..0000000 --- a/maps/Route1Gate1F.asm +++ /dev/null @@ -1,55 +0,0 @@ -include "constants.asm" - -SECTION "maps/Route1Gate1F.asm", ROMX - -Route1Gate1FScriptLoader:: - ld hl, Route1Gate1FScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -Route1Gate1FScriptPointers: - dw Route1Gate1FScript ;>> routine - dw Route1Gate1FNPCIDs ;>> data - -Route1Gate1FNPCIDs: - db $00 - db $01 - db $FF - -Route1Gate1FSignPointers: - dw MapDefaultText ;no signs -Route1Gate1FTextPointers:: - dw Route1Gate1FText1 - dw Route1Gate1FText2 - -Route1Gate1FScript: - ld hl, Route1Gate1FNPCIDs - ld de, Route1Gate1FSignPointers - call CallMapTextSubroutine - ret - -Route1Gate1FText1: - ld hl, Route1Gate1FText1String - call OpenTextbox - ret - -Route1Gate1FText2: - ld hl, Route1Gate1FText2String - call OpenTextbox - ret - -Route1Gate1FText1String: - text "このゲートを ぬけると" - line "すぐに オールドシティ です" - done - -Route1Gate1FText2String: - text "オールドシティには" - line "あの ゆうめいな" - cont "ごじゅうのとう が あるの" - - para "いってみたこと ある？" - done - -;ends at 40D9 diff --git a/maps/blk/Route1Gate1F.blk b/maps/Route1Gate1F.blk index 0985b28..0985b28 100644 --- a/maps/blk/Route1Gate1F.blk +++ b/maps/Route1Gate1F.blk diff --git a/maps/Route1Gate2F.asm b/maps/Route1Gate2F.asm deleted file mode 100644 index 288925f..0000000 --- a/maps/Route1Gate2F.asm +++ /dev/null @@ -1,85 +0,0 @@ -include "constants.asm" - -SECTION "maps/Route1Gate2F.asm", ROMX - -Route1Gate2FScriptLoader:: - ld hl, Route1Gate2FScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -Route1Gate2FScriptPointers: - dw Route1Gate2FScript - dw Route1Gate2FNPCIDs - -Route1Gate2FNPCIDs: - db 0 - db 1 - db $FF - -Route1Gate2FSignPointers: - dw Route1Gate2FTextSign1 - dw Route1Gate2FTextSign2 -Route1Gate2FTextPointers:: - dw Route1Gate2FTextNPC1 - dw Route1Gate2FTextNPC2 - -Route1Gate2FScript:: - ld hl, Route1Gate2FNPCIDs - ld de, Route1Gate2FSignPointers - call CallMapTextSubroutine - ret - -Route1Gate2FTextNPC1: - ld hl, Route1Gate2FTextString1 - call OpenTextbox - ret - -Route1Gate2FTextNPC2: - ld hl, Route1Gate2FTextString2 - call OpenTextbox - ret - -Route1Gate2FTextSign1: - ld hl, Route1Gate2FTextString3 - call OpenTextbox - ret - -Route1Gate2FTextSign2: - ld hl, Route1Gate2FTextString4 - call OpenTextbox - ret - -Route1Gate2FTextString1: - text "ガンテツさんって しってる？" - - para "ガンテツさんに" - line "きに いられるように なれば" - cont "トレーナーとして たいしたもの よ" - done - -Route1Gate2FTextString2: - text "あなた かんこうで きたの？" - line "なら ざんねんね" - - para "オールドシティの" - line "ごじゅうのとう は" - cont "だれでも はいれる って" - cont "ものじゃないわ" - done - -Route1Gate2FTextString3: - text "<PLAYER>は" - line "ぼうえんきょうを のぞいた！" - - para "むむむ！" - line "たかーい とう が みえる！" - done - -Route1Gate2FTextString4: - text "<PLAYER>は" - line "ぼうえんきょうを のぞいた！" - - para "むむ？" - line "ながーい かわ が みえる" - done diff --git a/maps/blk/Route1Gate2F.blk b/maps/Route1Gate2F.blk index f7deeab..f7deeab 100644 --- a/maps/blk/Route1Gate2F.blk +++ b/maps/Route1Gate2F.blk diff --git a/maps/Route1P1.asm b/maps/Route1P1.asm deleted file mode 100644 index 6024505..0000000 --- a/maps/Route1P1.asm +++ /dev/null @@ -1,86 +0,0 @@ -include "constants.asm" - -SECTION "maps/Route1P1.asm", ROMX - - ret - - dw Textdbb82 -Textdbb82: - text "べんりな よのなかだね" - done - - rept 9 - ret - endr - -Route1P1ScriptLoader:: - ld hl, Route1P1ScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -Route1P1ScriptPointers: - dw Route1P1Script - dw Route1P1NPCIDs - -Route1P1NPCIDs: - db 0 - db 1 - db $FF - -Route1P1SignPointers: - dw Route1P1TextSign1 - dw Route1P1TextSign2 - -Route1P1TextPointers:: - dw Route1P1TextNPC1 - dw Route1P1TextNPC2 - -Route1P1Script:: - ld hl, Route1P1NPCIDs - ld de, Route1P1SignPointers - call CallMapTextSubroutine - ret - -Route1P1TextNPC1: - ld hl, Route1P1TextString1 - call OpenTextbox - ret - -Route1P1TextNPC2: - ld hl, Route1P1TextString2 - call OpenTextbox - ret - -Route1P1TextSign1: - ld hl, Route1P1TextString3 - call OpenTextbox - ret - -Route1P1TextSign2: - ld hl, Route1P1TextString4 - call OpenTextbox - ret - -Route1P1TextString1: - text "しょうねん！" - - para "モンスターボールは" - line "やせいの ポケモンを よわらせてから" - cont "つかうのが きほんだ！" - done - -Route1P1TextString2: - text "ぼく ゆうがた じゅくの かえりに" - line "かわった ポケモンを みたよ" - done - -Route1P1TextString3: - text "このさき しずかな おか" - line "やせいの ポケモンに ちゅうい" - done - -Route1P1TextString4: - text "ここは １ばん どうろ" - line "サイレントヒル ⋯⋯ オールドシティ" - done diff --git a/maps/blk/Route1P1.blk b/maps/Route1P1.blk index 75a0913..75a0913 100644 --- a/maps/blk/Route1P1.blk +++ b/maps/Route1P1.blk diff --git a/maps/Route1P2.asm b/maps/Route1P2.asm deleted file mode 100644 index 416094d..0000000 --- a/maps/Route1P2.asm +++ /dev/null @@ -1,117 +0,0 @@ -include "constants.asm" - -SECTION "maps/Route1P2.asm", ROMX - -Route1P2ScriptLoader:: - ld hl, Route1P2ScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -Route1P2ScriptPointers: - dw Route1P2Script - dw Route1P2NPCIDs - -Route1P2NPCIDs: - db $00 - db $01 - db $FF - -Route1P2SignPointers: - dw Route1P2TextSign1 - -Route1P2TextPointers:: - dw Route1P2Text1 - dw Route1P2Text2 - -Route1P2Script:: - ld a, [wYCoord] - cp $06 - jr nz, .skipCheck - ld a, [wXCoord] - cp $09 - jr nz, .skipCheck - ld a, 0 ; player - ld d, LEFT - call SetObjectFacing - ld a, 2 - ld d, RIGHT - call SetObjectFacing - jr .endDemo -.skipCheck - ld hl, Route1P2NPCIDs ;data - ld de, Route1P2SignPointers ;start of textld pointers? - call CallMapTextSubroutine - ret - -.endDemo -Route1P2Text1: - ld hl, Route1P2TextString4 - call OpenTextbox - call GBFadeOutToBlack - jp Init - -Route1P2Text2: - ld hl, $D3A2 ; trainer flags? - bit 1, [hl] - jr nz, .Text2Jump ; already fought - ld hl, Route1P2TextString1 - call OpenTextbox - ld hl, $D3A2 - set 1, [hl] - ld a, $3C - ld [wce02], a - ld a, $02 - ld [wce05], a - ld hl, wc5ed - set 7, [hl] - ld a, $08 - ld [wd637], a - ret - -.Text2Jump -Route1P2Text3: - ld hl, Route1P2TextString3 - call OpenTextbox - ret - -Route1P2TextSign1: - ld hl, Route1P2TextString5 - call OpenTextbox - ret - -Route1P2TextString1: - text "まあ かわいらしい トレーナーやこと" - line "うちと ポケモン しはります？" - done - -Route1P2TextString2: ; (unused?) - text "いやあ かんにんやわあ" - done - -Route1P2TextString3: - text "かわいい かおして つよおすなあ" - line "その ちょうしで おきばりやす" - done - -Route1P2TextString4: - text "シゲル『おっ サトシじゃないか！" - - para "なんとか ここまで これた" - line "って かんじだな" - - para "じつりょくが ないのに" - line "むり するなよな" - - para "もっと ポケモン あつめるとか" - line "いろんな ポケモン そだてるとか" - cont "やること あるだろ？" - - para "ここで ひきかえしたほうが いいぜ！" - line "じゃあな" - done - -Route1P2TextString5: - text "ここは １ばん どうろ" - line "サイレントヒル ⋯⋯ オールドシティ" - done diff --git a/maps/blk/Route1P2.blk b/maps/Route1P2.blk index e0284a4..e0284a4 100644 --- a/maps/blk/Route1P2.blk +++ b/maps/Route1P2.blk diff --git a/maps/placeholder/blk/Route2.blk b/maps/Route2.blk index fa42442..fa42442 100644 --- a/maps/placeholder/blk/Route2.blk +++ b/maps/Route2.blk diff --git a/maps/placeholder/blk/Route2Gate1F.blk b/maps/Route2Gate1F.blk index b06889e..b06889e 100644 --- a/maps/placeholder/blk/Route2Gate1F.blk +++ b/maps/Route2Gate1F.blk diff --git a/maps/placeholder/blk/Route2Gate2F.blk b/maps/Route2Gate2F.blk index f7deeab..f7deeab 100644 --- a/maps/placeholder/blk/Route2Gate2F.blk +++ b/maps/Route2Gate2F.blk diff --git a/maps/placeholder/blk/Route2House.blk b/maps/Route2House.blk index de07e9d..de07e9d 100644 --- a/maps/placeholder/blk/Route2House.blk +++ b/maps/Route2House.blk diff --git a/maps/placeholder/blk/RouteSilentEast.blk b/maps/RouteSilentEast.blk index db594cc..db594cc 100644 --- a/maps/placeholder/blk/RouteSilentEast.blk +++ b/maps/RouteSilentEast.blk diff --git a/maps/placeholder/blk/RouteSilentEastGate.blk b/maps/RouteSilentEastGate.blk index ac08a0a..ac08a0a 100644 --- a/maps/placeholder/blk/RouteSilentEastGate.blk +++ b/maps/RouteSilentEastGate.blk diff --git a/maps/placeholder/blk/RuinsOfAlphEntrance.blk b/maps/RuinsOfAlphEntrance.blk index d73427a..d73427a 100644 --- a/maps/placeholder/blk/RuinsOfAlphEntrance.blk +++ b/maps/RuinsOfAlphEntrance.blk diff --git a/maps/placeholder/blk/RuinsOfAlphMain.blk b/maps/RuinsOfAlphMain.blk index 6e0ec61..6e0ec61 100644 --- a/maps/placeholder/blk/RuinsOfAlphMain.blk +++ b/maps/RuinsOfAlphMain.blk diff --git a/maps/ShizukanaOka.asm b/maps/ShizukanaOka.asm deleted file mode 100644 index 2996c82..0000000 --- a/maps/ShizukanaOka.asm +++ /dev/null @@ -1,242 +0,0 @@ -include "constants.asm" - -SECTION "maps/ShizukanaOka.asm", ROMX - -ShizukanaOkaScriptLoader:: - ld hl, ShizukanaOkaScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -ShizukanaOkaScriptPointers: - dw ShizukanaOkaScript - dw ShizukanaOkaNPCIDs - -ShizukanaOkaNPCIDs: - db 0 - db 1 - db 2 - db 3 - db 4 - db 5 - db $FF - -ShizukanaOkaSignPointers: - dw ShizukanaOkaSignpost1 - dw ShizukanaOkaSignpost2 - -ShizukanaOkaTextPointers: - dw ShizukanaOkaText1 - dw ShizukanaOkaTrainer2 - dw ShizukanaOkaTrainer3 - dw ShizukanaOkaTrainer4 - dw ShizukanaOkaTrainer5 - dw ShizukanaOkaTrainer6 - -ShizukanaOkaScript: - ld hl, ShizukanaOkaNPCIDs - ld de, ShizukanaOkaSignPointers - call CallMapTextSubroutine - ret - -ShizukanaOkaText1: - ld hl, ShizukanaOkaText1String - call OpenTextbox - ret - -ShizukanaOkaTrainer2: - ld hl, $D3A5 - bit 1, [hl] - jr nz, .Trainer2Won - ld hl, ShizukanaOkaTrainer2EncounterString - call OpenTextbox - ld hl, wd3a5 - set 1, [hl] - ld a, TRAINER_SCHOOLBOY - ld [wce02], a - ld a, SCHOOLBOY_TETSUYA - ld [wce05], a - call Function38d8 - ret -.Trainer2Won ;Already won - ld hl, ShizukanaOkaTrainer2WonString - call OpenTextbox - ret - -ShizukanaOkaTrainer3: - ld hl, wd3a5 - bit 2, [hl] - jr nz, .Trainer3Won - ld hl, ShizukanaOkaTrainer3EncounterString - call OpenTextbox - ld hl, wd3a5 - set 2, [hl] - ld a, TRAINER_BUG_CATCHER_BOY - ld [wce02], a - ld a, BUG_CATCHER_BOY_JUNICHI - ld [wce05], a - call Function38d8 - ret -.Trainer3Won ;Already won - ld hl, ShizukanaOkaTrainer3WonString - call OpenTextbox - ret - -ShizukanaOkaTrainer4: - ld hl, wd3a5 - bit 3, [hl] - jr nz, .Trainer4Won - ld hl, ShizukanaOkaTrainer4EncounterString - call OpenTextbox - ld hl, wd3a5 - set 3, [hl] - ld a, TRAINER_FIREBREATHER - ld [wce02], a - ld a, FIREBREATHER_AKITO - ld [wce05], a - call Function38d8 - ret -.Trainer4Won ;Already won - ld hl, ShizukanaOkaTrainer4WonString - call OpenTextbox - ret - -ShizukanaOkaTrainer5: - ld hl, wd3a5 - bit 4, [hl] - jr nz, .Trainer5Won - ld hl, ShizukanaOkaTrainer5EncounterString - call OpenTextbox - ld hl, wd3a5 - set 4, [hl] - ld a, TRAINER_BEAUTY - ld [wce02], a - ld a, BEAUTY_MEGUMI - ld [wce05], a - call Function38d8 - ret -.Trainer5Won ;Already won - ld hl, ShizukanaOkaTrainer5WonString - call OpenTextbox - ret - -ShizukanaOkaTrainer6: - ld hl, wd3a5 - bit 5, [hl] - jr nz, .Trainer6Won - ld hl, ShizukanaOkaTrainer6EncounterString - call OpenTextbox - ld hl, wd3a5 - set 5, [hl] - ld a, TRAINER_BUG_CATCHER_BOY - ld [wce02], a - ld a, BUG_CATCHER_BOY_SOUSUKE - ld [wce05], a - call Function38d8 - ret -.Trainer6Won ;Already won - ld hl, ShizukanaOkaTrainer6WonString - call OpenTextbox - ret - -ShizukanaOkaSignpost2: - ld hl, ShizukanaOkaSignpost2String - call OpenTextbox - ret - -ShizukanaOkaSignpost1: - ld hl, ShizukanaOkaSignpost1String - call OpenTextbox - ret - -ShizukanaOkaTrainer6EncounterString: - text "ねえ ねえ みてよ" - para "これ ぜったい" - line "しんしゅの ポケモン だよ！" - done - - text "まだ ポケモンの とくちょう" - line "わかってないから しかたないよ" - done - -ShizukanaOkaTrainer6WonString: - text "あたらしい ポケモンだけでなく" - line "あたらしい タイプも" - cont "みつかったって うわさだよ" - done - -ShizukanaOkaTrainer5EncounterString: - text "いい てんきねー" - line "あなた ちょうしは いかが？" - done - - text "なにするニャー" - line "⋯⋯なにいってるのかしら あたし" - done - -ShizukanaOkaTrainer5WonString: - text "なんで こうなるの？" - line "さんぽしてた だけなのに@@" - -ShizukanaOkaTrainer4EncounterString: - text "こんなところで" - line "ひを ふく れんしゅう！" - done - - text "あちち しっぱいだー" - done - -ShizukanaOkaTrainer4WonString: - text "よるになると くらくなるから" - line "こどもは はやく かえりなさい！" - para "おれ？" - line "おれは ひをふくから だいじょうぶ" - done - -ShizukanaOkaTrainer3EncounterString: - text "むしポケモンの ことなら" - line "だれよりも くわしいよ" - done - - text "パラパラー" - done - -ShizukanaOkaTrainer3WonString: - text "ポケモンずかんを つくるんだって？" - line "ちょっと みせてよ" - para "へー" - line "タイプべつに ポケモン さがせるんだ" - done - -ShizukanaOkaTrainer2EncounterString: - text "いっとくけど" - line "きみよりも べんきょう してるから" - cont "きみよりも つよいよ ぜったい！" - done - - text "な なぜなんだ？" - done - -ShizukanaOkaTrainer2WonString: - text "おかしいよ⋯⋯" - line "まいにち ポケモンの べんきょうを" - cont "きちんと してるのに まけるなんて" - done - -ShizukanaOkaText1String: - text "この おかの ポケモンは よわい！" - line "だから ここで しゅぎょう している" - cont "トレーナーも おおいよ" - para "みんな バトルが すきだから" - line "うでだめしを するといい" - done - -ShizukanaOkaSignpost2String: - text "しずかな おか" - line "サイレントヒル は こちら" - done - -ShizukanaOkaSignpost1String: - text "しずかな おか" - line "オールドシティ は こちら" - done diff --git a/maps/blk/ShizukanaOka.blk b/maps/ShizukanaOka.blk index c66d560..c66d560 100644 --- a/maps/blk/ShizukanaOka.blk +++ b/maps/ShizukanaOka.blk diff --git a/maps/SilentHill.asm b/maps/SilentHill.asm deleted file mode 100644 index 0b6361b..0000000 --- a/maps/SilentHill.asm +++ /dev/null @@ -1,418 +0,0 @@ -include "constants.asm" - -SECTION "maps/SilentHill.asm", ROMX - -SilentHillScriptLoader:: - ld hl, SilentHillScriptPointers1 - call RunMapScript - call WriteBackMapScriptNumber - ret - -SilentHillNPCIDs1: - db 0 - db 2 - db 3 - db $FF - -SilentHillNPCIDs2: - db 2 - db 3 - db $FF - -SilentHillNPCIDs3: - db 1 - db 2 - db 3 - db $FF - -SilentHillScriptPointers1: - dw SilentHillScript1 - dw SilentHillNPCIDs1 - -SilentHillScriptPointers2: - dw SilentHillScript2 - dw SilentHillNPCIDs1 - -SilentHillScriptPointers3: - dw SilentHillScript3 - dw SilentHillNPCIDs1 - -SilentHillScriptPointers4: - dw SilentHillScript4 - dw SilentHillNPCIDs2 - -SilentHillScriptPointers5: - dw SilentHillScript5 - dw SilentHillNPCIDs3 - -SilentHillScriptPointers6: - dw SilentHillScript6 - dw SilentHillNPCIDs2 - -SilentHillScriptPointers7: - dw SilentHillScript7 - dw SilentHillNPCIDs2 - -SilentHillScript1: - ld a, [wYCoord] - cp 5 - ret nz - ld a, [wXCoord] - cp 5 - ret nz - ld hl, wJoypadFlags - set 4, [hl] - ld a, 02 - call Function17f9 - ld a, 02 - ld hl, SilentHillMovement1 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 1 - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillMovement1: - db $0D - db $0D - db $0D - db $09 - db $05 - db $02 - db $32 - -SilentHillScript2: - ld a, 0 - ld d, RIGHT - call SetObjectFacing - ld hl, SilentHillTextRival1 - call OpenTextbox - ld hl, SilentHillTextRival2 - call OpenTextbox - ld hl, wJoypadFlags - set 4, [hl] - ld a, 2 - ld hl, SilentHillMovement2 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 1 - call WriteIntod637 - ld a, 2 - ld [wMapScriptNumber], a - ret - -SilentHillMovement2: - db $00, $04, $08, $0C, $0C, $0C, $33 - -SilentHillScript3: - call Function1848 - ld a, 3 - ld [wMapScriptNumber], a - call InitUnknownBuffercc9e - ret - -SilentHillScript4: - ld a, [wXCoord] - cp 0 - jr nz, .bigjump - ld a, [wYCoord] - cp 8 - jr z, .jump - cp 09 - jr nz, .bigjump -.jump - call Function776a - ld hl, SilentHillTextNorthExit - call OpenTextbox - ld hl, wJoypadFlags - set 4, [hl] - ld a, 3 - call Function15ed - ld a, 3 - call Function17f9 - ld a, [wYCoord] - cp 9 - jr z, .jump2 - ld hl, SilentHillMovement3 - jr .skip -.jump2 - ld hl, SilentHillMovement4 -.skip - ld a, 03 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 1 - call WriteIntod637 - ld a, 4 - ld [wMapScriptNumber], a - ret - -.bigjump - ld hl, SilentHillNPCIDs2 - ld de, SilentHillSignPointers - call CallMapTextSubroutine - ret - -Function776a: - ld hl, wd41a - set 7, [hl] - ld a, 1 - ld hl, wd29d - ld [hl], a - ret - -SilentHillMovement3: - db $0A, $0A, $0A, $09, $0A, $06, $02, $32 - -SilentHillMovement4: - db $0A, $0A, $0A, $0A, $06, $02, $32 - -SilentHillScript5: - ld a, 0 - ld d, RIGHT - call SetObjectFacing - ld hl, SilentHillTextPokemonInGrassString - call OpenTextbox - ld hl, wJoypadFlags - set 4, [hl] - ld a, 3 - call Function17f9 - ld a, 0 - call Function186a - ld b, 3 - ld c, 0 - call StartFollow - ld a, [wYCoord] - cp 9 - jr z, .jump - ld hl, SilentHillMovement5 - jr .skip -.jump - ld hl, SilentHillMovement6 -.skip - ld a, 3 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 1 - call WriteIntod637 - ld a, 5 - ld [wMapScriptNumber], a - ret - -SilentHillMovement5: - db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33 - -SilentHillMovement6: - db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33 - -SilentHillScript6: - ld hl, SilentHillNPCIDs2 - ld de, SilentHillSignPointers - call CallMapTextSubroutine - ld hl, wd41b - bit 2, [hl] - ret z - ld a, $12 - ld [wd29d], a - ld a, 6 - ld [wMapScriptNumber], a - ret - -SilentHillScript7: - call CheckLabDoor - ret z - ld hl, SilentHillNPCIDs2 - ld de, SilentHillSignPointers - call CallMapTextSubroutine - ret - -CheckLabDoor: - ld a, [wYCoord] - cp $C - ret nz - ld a, [wXCoord] - cp $E - jr z, .jump - ld a, [wXCoord] - cp $F - ret nz -.jump - ldh a, [hJoyState] - bit 6, a - ret z - ld a, 0 - ld d, UP - call SetObjectFacing - ld hl, wJoypadFlags - set 6, [hl] - ld hl, SilentHillTextString1 - call OpenTextbox - call LabClosed - call ClearAccumulator - ret - -LabClosed: - ld a, 0 - ld hl, SilentHillMovement7 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 1 - call WriteIntod637 - ret - -SilentHillTextString1: - text "あれ？ カギが かかっている" - done - -SilentHillMovement7: - db $04, $32 - -SilentHillSignPointers:: - dw SilentHillPlayerHouseText - dw Function38c6 - dw SilentHillSignText1 - dw SilentHillLabText - dw SilentHillRivalHouseText - -SilentHillLabText: - ld hl, SilentHillTextString2 - call OpenTextbox - ret - -SilentHillTextString2: - text "にゅうきょしゃ ぼしゅうちゅう！" - done - -SilentHillSignText1: - ld hl, SilentHillTextString3 - call OpenTextbox - ret - -SilentHillTextString3: - text "ここは サイレント ヒル" - line "しずかな おか" - done - -SilentHillPlayerHouseText: - ld hl, SilentHillTextString4 - call OpenTextbox - ret - -SilentHillTextString4: - text "ここは <PLAYER> のいえ" - done - -SilentHillRivalHouseText: - ld hl, SilentHillTextString5 - call OpenTextbox - ret - -SilentHillTextString5: - text "ここは <RIVAL> のいえ" - done - -SilentHillTextPointers:: - dw SilentHillTextRival1 ; west - dw SilentHillTextNorthExit ; north - dw SilentHillTextBackpack ; npc1 - dw SilentHillTextPokemonHate ; npc2 - -SilentHillTextRival1: - text "<RIVAL>『よう ちょっと おまえに" - cont "じまん したいことが" - cont "あってきたんだよ" - - para "おれ あの ゆうめいなオーキドから" - line "メール もらっちゃった！" - cont "え？ おまえにも きたの？" - cont "ちぇっ！ つまんねーの！" - - para "⋯⋯ふん！" - line "じゃあさ じゃあさー おまえさー" - cont "じぶんの ははおや のこと" - cont "いつも なんて よんでる？@" - - db $08 - -LoadMomNamePromptUnused: - call LoadStandardMenuHeader - callab MomNamePrompt - call CloseWindow - call GetMemSGBLayout - call UpdateSprites - call UpdateTimePals - jp Function3036 - -MomNameMenuHeaderUnused: - db MENU_BACKUP_TILES ; flags - menu_coords 00, 00, 10, 11 - dw .MomNameMenuDataUnused - db 01 ; initial selection - -.MomNameMenuDataUnused: - db STATICMENU_CURSOR - db 04 ; items - db "じぶんで きめる@" - db "おかあさん @" - db "ママ@" - db "かあちゃん@" - -SilentHillTextRival2: ; BYTE OFF - text "<RIVAL>『えー かっこわりい！" - line "そんな こどもっぽい" - cont "よびかた してるなんて" - cont "おわらいだぜ！" - cont"あー ちょっとだけ すっきりした！" - - para "そんじゃあ" - line "おれは ひとあし おさきに" - cont "オーキドのところへ" - cont "いくことに するぜ！" - done - -SilentHillTextNorthExit: - text "ちょいまち！" - line "まってよ！ まてっ てば！" - done - -SilentHillTextPokemonInGrassString: - text "きみは まったく" - line "なんにも しらないんだね！" - cont "くさむらでは" - cont "やせいの ポケモンが とびだす！" - - para "じぶんも ポケモンを" - line "もって いれば" - cont "たたかえるんだ⋯⋯" - - para "あっ！ ひょっとして きみは" - line "⋯⋯ちょっと" - cont "ぼくに ついて きて！" - done - -SilentHillTextBackpack: - ld hl, SilentHillTextBackpackString - call OpenTextbox - ret - -SilentHillTextBackpackString: - text "あなたの りュック かっこいいわよ" - line "どこで てに いれたの？" - done - -SilentHillTextPokemonHate: - ld hl, SilentHillTextPokemonHateString - call OpenTextbox - ret - -SilentHillTextPokemonHateString: - text "よのなかに ポケモンが きらいな" - line "ひとは いるのかな？" - done diff --git a/maps/blk/SilentHill.blk b/maps/SilentHill.blk index ebd7759..ebd7759 100644 --- a/maps/blk/SilentHill.blk +++ b/maps/SilentHill.blk diff --git a/maps/SilentHillHouse.asm b/maps/SilentHillHouse.asm deleted file mode 100644 index ed99689..0000000 --- a/maps/SilentHillHouse.asm +++ /dev/null @@ -1,168 +0,0 @@ -include "constants.asm" - -SECTION "maps/SilentHillHouse.asm", ROMX - -SilentHillHouseScriptLoader:: - ld hl, SilentHillHouseScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -SilentHillHouseScriptPointers: - dw SilentHillHouseScript1 - dw SilentHillHouseNPCIDs1 - dw SilentHillHouseScript2 - dw SilentHillHouseNPCIDs2 - dw SilentHillHouseScript3 - dw SilentHillHouseNPCIDs1 - -SilentHillHouseScript1: - ld hl, SilentHillHouseNPCIDs1 - ld de, SilentHillHouseTextPointers2 - call CallMapTextSubroutine - ret - -SilentHillHouseScript2: - ld hl, SilentHillHouseNPCIDs2 - ld de, SilentHillHouseTextPointers2 - call CallMapTextSubroutine - ret - -SilentHillHouseScript3: - ld hl, SilentHillHouseNPCIDs1 - ld de, SilentHillHouseTextPointers2 - call CallMapTextSubroutine - ret - -SilentHillHouseNPCIDs1: - db 0 - db $FF - -SilentHillHouseNPCIDs2: - db 0 - db 1 - db $FF - -SilentHillHouseTextPointers2:: - dw SilentHillHouseNPCText1 - dw Function38bd - dw Function3899 - dw Function38b4 - dw Function38ab - dw Function38cf - -SilentHillHouseNPCText1: - ld hl, wd41a - bit 6, [hl] - jr nz, .jump - ld hl, SilentHillHouseTextString1 - call OpenTextbox - ret - -.jump - call RefreshScreen - callab Function1477D - call Function1fea - ret - -SilentHillHouseTextString1: - text "おや？ <RIVAL>あてに メールが" - line "とどいている ようだ" - cont "よんでみる？@" - db $08 - -SilentHillHouseNPCText2: ; (unused due to typo in the text pointers?) - call YesNoBox - jr c, .jump - ld hl, wd41a - set 6, [hl] - ld hl, SilentHillHouseTextString2 - call PrintText - call Function3036 - ret -.jump - ld hl, SilentHillHouseTextString3 - call PrintText - call Function3036 - ret - -SilentHillHouseTextString2: - text "とつぜん メールを さしあげる" - line "しつれいを おゆるしあれ" - - para "じつは きみに どうしても" - line "わたしたい ものが あるのじゃが" - cont "うけとって もらえんかのう" - cont "ポケモンけんきゅうしゃ オーキド" - done - -SilentHillHouseTextString3: - text "ひとのメールは" - line "みちゃ いけないよな<⋯⋯>" - done - -SilentHillHouseTextPointers:: - dw SilentHillHouseNPCText3 - dw SilentHillHouseNPCText4 - -SilentHillHouseNPCText3: - ld hl, SilentHillHouseTextString4 - call OpenTextbox - ret - -SilentHillHouseTextString4: - text "このまえ かわったいろの" - line "ポッポを みかけたわ" - done - -SilentHillHouseNPCText4: - ld hl, wd41e - bit 2, [hl] - jr nz, .jump - ld hl, wd41e - set 2, [hl] - ld hl, SilentHillHouseTextString5 - call OpenTextbox - call WaitBGMap - ld hl, SilentHillHouseTextString6 - jr .skip -.jump - ld hl, SilentHillHouseTextString7 -.skip - call OpenTextbox - ret - -SilentHillHouseTextString5: - text "ケン『ななな" - line "なんだ <PLAYER> じゃないか！" - - para "おれは ちょっと あのー" - line"がっこうの しゅくだいを" - cont "おしえに きてるんだ！" - - para "えっ マップ？" - line "そうか そんな やくそくも してたな" - cont "わかった" - cont "トレーナーギアを かしてみな" - - para "スロットに マップの カセットを " - line "さしこんでっと⋯⋯" - cont "よし これで マップが みれるぞ！" - done - -SilentHillHouseTextString6: - text "もし オールドにいくなら" - line "マサキって やつに あうといい" - - para "おれの ともだちで" - line "すごい ポケモン マニアだ！" - cont "きっと おまえの" - cont "てだすけを してくれるぜ" - done - -SilentHillHouseTextString7: - text "ケン『<PLAYER>" - line "オーキドはかせに みこまれて" - cont "ポケモンずかんを つくるんだって？" - cont "すごいじゃないか がんばれよ" - done diff --git a/maps/blk/SilentHillHouse.blk b/maps/SilentHillHouse.blk index 8e61d7b..8e61d7b 100644 --- a/maps/blk/SilentHillHouse.blk +++ b/maps/SilentHillHouse.blk diff --git a/maps/SilentHillLabBack.asm b/maps/SilentHillLabBack.asm deleted file mode 100644 index 1da281e..0000000 --- a/maps/SilentHillLabBack.asm +++ /dev/null @@ -1,358 +0,0 @@ -include "constants.asm" - -SECTION "maps/SilentHillLabBack.asm", ROMX - -SilentHillLabBackScriptLoader:: - ld hl, SilentHillLabBackScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -SilentHillLabBackScriptPointers: - dw SilentHillLabBackScript1 - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackScript2 - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackScript3 - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackRivalChoosePokemon - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackScript5 - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackScript6 - dw SilentHillLabBackNPCIDs1 - dw SilentHillLabBackScript7 - dw SilentHillLabBackNPCIDs1 - -SilentHillLabBackNPCIDs1: - db 00, 01, 02, 03, 04, $FF -SilentHillLabBackNPCIDs2: - db 00, 01, 04, $FF -SilentHillLabBackNPCIDs3: - db 00, 01, 02, $FF -SilentHillLabBackNPCIDs4: - db 00, 01, 03, $FF - -SilentHillLabBackTextPointers:: - dw SilentHillLabBackText1 - dw SilentHillLabBackFunc3 - dw SilentHillLabBackFunc4 - dw SilentHillLabBackFunc4 - dw SilentHillLabBackFunc4 - -SilentHillLabBackScript1: - ld hl, wJoypadFlags - set 4, [hl] - ld a, 0 - call Function17f9 - ld a, 0 - ld hl, SilentHillLabBackMovement1 - call LoadMovementDataPointer - ld hl, wd41b - set 1, [hl] - ld hl, wc5ed - set 7, [hl] - ld a, 1 - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillLabBackMovement1: - db 09, 09, 05, $32 - -SilentHillLabBackScript2: - ld hl, wc5ed - set 6, [hl] - call Function20f8 - ld a, 3 - ld d, UP - call SetObjectFacing - ld hl, SilentHillLabBackTextString1 - call OpenTextbox - ld hl, SilentHillLabBackTextString10 - call OpenTextbox - ld hl, SilentHillLabBackTextString2 - call OpenTextbox - ld a, 2 - ld [wMapScriptNumber], a - ret - -SilentHillLabBackScript3: - ld hl, SilentHillLabBackNPCIDs1 - ld de, SilentHillLabBackTextPointers2 - call CallMapTextSubroutine - ret - -SilentHillLabBackRivalChoosePokemon: - ld hl, wJoypadFlags - set 4, [hl] - ld a, 3 - call Function17f9 - ld hl, SilentHillLabBackMovementPointers - ld a, [wChosenStarter] - ld d, 0 - ld e, a - add hl, de - add hl, de - ld a, [hl+] - ld h, [hl] - ld l, a - ld a, 3 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 4 - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillLabBackMovementPointers: - dw SilentHillLabBackMovement2+1 - dw SilentHillLabBackMovement2 - dw SilentHillLabBackMovement2+2 - -SilentHillLabBackMovement2: - db $0B, $0B, $0B, $0B, $05, $32 - -SilentHillLabBackScript5: - ld hl, SilentHillLabBackTextString12 - call OpenTextbox - ld a, [wd266] - ld [wNamedObjectIndexBuffer], a - call GetPokemonName - ld hl, SilentHillLabBackTextString13 - call OpenTextbox - ld a, 5 - ld [wMapScriptNumber], a - ret - -SilentHillLabBackScript6: - call Function20f8 - ld hl, wc5ed - res 6, [hl] - ld a, 6 - ld[wMapScriptNumber], a - ret - -SilentHillLabBackScript7: - ld hl, SilentHillLabBackNPCIDs1 - ld de, SilentHillLabBackTextPointers2 - call CallMapTextSubroutine - ret - -SilentHillLabBackText1: - ld hl, wd41b - bit 2, [hl] - ld hl, SilentHillLabBackTextString3 - jr z, .skip - ld hl, SilentHillLabBackTextString9 -.skip - call OpenTextbox - ret - -SilentHillLabBackTextString1: - text "オーキド『ほれ そこに ３びき" - cont "ポケモンが いる じゃろう！" - cont "ほっほ！" - - para "こいつらを きみたちに" - cont "いっぴき づつ やろう！" - cont "⋯⋯ さあ えらべ！" - done - -SilentHillLabBackTextString2: - text "オーキド『まあ" - line "あわてるな <RIVAL>！" - cont "おまえも すきなものを とれ！" - done - -SilentHillLabBackTextString3: - text "オーキド『さあ <PLAYER>" - line "どの ポケモンに するかね？" - done - -SilentHillLabBackTextString4: - text "オーキド『ほう！ ほのおのポケモン" - line "@" - ld bc, wStringBuffer1 - text "に するんじゃな？@" - db 08 - call ConfirmPokemonSelection - call Function3036 - ret - -SilentHillLabBackTextString5: - text "オーキド『ふむ みずのポケモン" - line "@" - ld bc, wStringBuffer1 - text "に きめるのじゃな？@" - db 08 - call ConfirmPokemonSelection - call Function3036 - ret - -SilentHillLabBackTextString6: - text "オーキド『おお！ くさのポケモン" - line "@" - ld bc, wStringBuffer1 - text "が いいんじゃな？@" - db 08 - call ConfirmPokemonSelection - call Function3036 - ret - -ConfirmPokemonSelection: - call YesNoBox - jr c, .bigJump - ld hl, wd41b - set 2, [hl] - ld a, 1 - ld [wd29b], a - ld a, 1 - ld [wd29a], a - ld a, 1 - ld [wd2a0], a - ld hl, SilentHillLabBackTextString8 - call PrintText - ld hl, wJoypadFlags - set 5, [hl] - ld a, [wd265] - ld [wMonDexIndex], a - ld a, 5 - ld [wCurPartyLevel], a - callab Function60a0 - xor a - ld [wPartyMon1 + 1], a - ld a, 3 - ld [wMapScriptNumber], a - ret -.bigJump - ld hl, SilentHillLabBackTextString7 - call PrintText - ret - -SilentHillLabBackTextString7: - text "では" - line "どれに するのじゃ？" - done - -SilentHillLabBackTextString8: - text "オーキド『この ポケモンは" - line "ほんとに げんきが いいぞ！" - - para "<PLAYER>は オーキドはかせから" - line "@" - ld bc, wStringBuffer1 - text "を もらった！<PROMPT>" - -SilentHillLabBackTextString9: - text "オーキド『そうじゃ！" - line "やせいの ポケモンが でて きても" - cont "そいつを たたかわせて いけば" - cont "となりまちへ いける！" - done - -SilentHillLabBackFunc3: - ld hl, wd41b - bit 2, [hl] - ld hl, SilentHillLabBackTextString11 - jr z, .skip - ld hl, SilentHillLabBackTextString14 -.skip - call OpenTextbox - ret - -SilentHillLabBackTextString10: - text "<RIVAL>『あッ！ おれにも！" - line "じいさん おれにもくれよう！" - done - -SilentHillLabBackTextString11: - text "<RIVAL>『いいぜ <PLAYER>！" - line "さきに えらんで！" - cont "おれは こころが ひろいからな" - done - -SilentHillLabBackTextString12: - text "<RIVAL>『じゃ おれは これ！" - done - -SilentHillLabBackTextString13: - text "<RIVAL>は オーキドから" - line "@" - ld bc, wStringBuffer1 - text "を もらった！" - done - -SilentHillLabBackTextString14: - text "<RIVAL>『<PLAYER>の#" - line "いいなあ！" - cont "でも おれのポケモンも" - cont "ちょっと いいだろ？" - done - -SilentHillLabBackFunc4: - ld hl, wd41b - bit 2, [hl] - jr nz, .bigjump - ldh a, [hFFEA] - sub 2 - ld [wChosenStarter], a - ld d, 0 - ld e, a - ld hl, SilentHillLabBackStarterData - add hl, de - add hl, de - add hl, de - add hl, de - ld a, [hl+] - ld [wd265], a - push hl - ld [wNamedObjectIndexBuffer], a - callba Function6734 - ld a, [wd265] - ld [wNamedObjectIndexBuffer], a - call GetPokemonName - pop hl - push hl - ld a, [hl+] - ld h, [hl] - ld l, a - call OpenTextbox - pop hl - inc hl - inc hl - ld a, [hl] - ld [wd266], a - ret -.bigjump - ld hl, SilentHillLabBackTextString15 - call OpenTextbox - ret - -SilentHillLabBackStarterData: - db DEX_HONOGUMA - dw SilentHillLabBackTextString4 - db DEX_KURUSU - - db DEX_KURUSU - dw SilentHillLabBackTextString5 - db DEX_HAPPA - - db DEX_HAPPA - dw SilentHillLabBackTextString6 - db DEX_HONOGUMA - -SilentHillLabBackTextString15: - text "オーキド『これ！" - line "よくばっちゃ いかん！" - done - -SilentHillLabBackTextPointers2: - dw Function3899 - dw Function3899 - dw Function3899 - dw Function3899 - dw MapDefaultText diff --git a/maps/blk/SilentHillLabBack.blk b/maps/SilentHillLabBack.blk index 671e694..671e694 100644 --- a/maps/blk/SilentHillLabBack.blk +++ b/maps/SilentHillLabBack.blk diff --git a/maps/SilentHillLabFront.asm b/maps/SilentHillLabFront.asm deleted file mode 100644 index d4c0b80..0000000 --- a/maps/SilentHillLabFront.asm +++ /dev/null @@ -1,1106 +0,0 @@ -include "constants.asm" - -SECTION "maps/SilentHillLabFront.asm", ROMX - -SilentHillLabFrontScriptLoader:: - ld hl, SilentHillLabFrontScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -SilentHillLabFrontScriptPointers: - dw SilentHillLabFrontScript1 - dw SilentHillLabFrontNPCIDs1 - - dw SilentHillLabFrontScript2 - dw SilentHillLabFrontNPCIDs2 - - dw SilentHillLabFrontScript3 - dw SilentHillLabFrontNPCIDs2 - - dw SilentHillLabFrontScript4 - dw SilentHillLabFrontNPCIDs2 - - dw SilentHillLabFrontConversation1 - dw SilentHillLabFrontNPCIDs2 - - dw SilentHillLabFrontScript6 - dw SilentHillLabFrontNPCIDs3 - - dw SilentHillLabFrontScript7 - dw SilentHillLabFrontNPCIDs4 - - dw SilentHillLabFrontScript8 - dw SilentHillLabFrontNPCIDs5 - - dw SilentHillLabFrontScript9 - dw SilentHillLabFrontNPCIDs5 - - dw SilentHillLabFrontScript10 - dw SilentHillLabFrontNPCIDs5 - - dw SilentHillLabFrontScript11 - dw SilentHillLabFrontNPCIDs5 - - dw SilentHillLabFrontScript12 - dw SilentHillLabFrontNPCIDs6 - - dw SilentHillLabFrontScript13 - dw SilentHillLabFrontNPCIDs6 - - dw SilentHillLabFrontScript14 - dw SilentHillLabFrontNPCIDs6 - - dw SilentHillLabFrontScript15 - dw SilentHillLabFrontNPCIDs7 - - dw SilentHillLabFrontScript16 - dw SilentHillLabFrontNPCIDs7 - - dw SilentHillLabFrontScript17 - dw SilentHillLabFrontNPCIDs7 - - dw SilentHillLabFrontScript18 - dw SilentHillLabFrontNPCIDs7 - - dw SilentHillLabFrontScript19 - dw SilentHillLabFrontNPCIDs9 - -SilentHillLabFrontNPCIDs1: - db $02 - db $09 - db $0A - db $FF -SilentHillLabFrontNPCIDs2: - db $00 - db $02 - db $04 - db $09 - db $0A - db $FF -SilentHillLabFrontNPCIDs3: - db $02 - db $04 - db $09 - db $0A - db $FF -SilentHillLabFrontNPCIDs4: - db $04 - db $09 - db $0A - db $FF -SilentHillLabFrontNPCIDs5: - db $01 - db $03 - db $05 - db $06 - db $07 - db $08 - db $09 - db $0A - db $FF -SilentHillLabFrontNPCIDs6: - db $01 - db $03 - db $05 - db $06 - db $07 - db $08 - db $FF -SilentHillLabFrontNPCIDs7: - db $00 - db $05 - db $06 - db $07 - db $08 - db $FF -SilentHillLabFrontNPCIDs8: ; (unused?) - db $00 - db $03 - db $05 - db $06 - db $07 - db $08 - db $09 - db $0A - db $FF -SilentHillLabFrontNPCIDs9: - db $00 - db $07 - db $08 - db $FF - -SilentHillLabFrontTextPointers:: - dw SilentHillLabFrontText4 - dw SilentHillLabFrontText7 - dw SilentHillLabFrontText10 - dw SilentHillLabFrontText11 - dw SilentHillLabFrontTextString20 - dw SilentHillLabFrontText12 - dw SilentHillLabFrontText13 - dw SilentHillLabFrontText14 - dw SilentHillLabFrontText15 - dw SilentHillLabFrontText16 - dw SilentHillLabFrontText16 - -SilentHillLabFrontScript1: - call SilentHillLabFrontMoveDown - ret z - ld hl, SilentHillLabFrontNPCIDs1 - ld de, SilentHillLabFrontTextPointers2 - call CallMapTextSubroutine - ret - -SilentHillLabFrontMoveDown: - ld a, [wXCoord] - cp 4 - ret nz - ld a, [wYCoord] - cp 1 - ret nz - ldh a, [hJoyState] - bit 6, a - jp z, SetFFInAccumulator - call SilentHillLabFrontText3 - ld hl, wJoypadFlags - set 4, [hl] - ld a, 0 - call Function17f9 - ld a, 0 - ld hl, SilentHillLabFrontMovement1 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 1 - call WriteIntod637 - call ClearAccumulator - ret - -SilentHillLabFrontMovement1: - db $06, $32 - -SilentHillLabFrontScript2: - ld a, 2 - ld [wMapScriptNumber], a - ret - -SilentHillLabFrontScript3: - ld a, 6 - call Function17f9 - ld a, 0 - call Function186a - ld b, 6 - ld c, 0 - call StartFollow - ld hl, SilentHillLabFrontMovement2 - ld a, 6 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 3 - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillLabFrontMovement2: - db 09, 09, 09, 09, 09, 09, 09, 09, 09, 05, 07, 01, $32 - -SilentHillLabFrontScript4: - call Function1828 - ld a, 4 - ld [wMapScriptNumber], a - ret - -SilentHillLabFrontConversation1: - ld a, 4 - ld d, RIGHT - call SetObjectFacing - ld hl, SilentHillLabFrontTextString20 - call OpenTextbox - ld hl, SilentHillLabFrontTextString4 - call OpenTextbox - ld a, 4 - ld d, UP - call SetObjectFacing - ld hl, SilentHillLabFrontTextString28 - call OpenTextbox - ld hl, SilentHillLabFrontTextString5 - call OpenTextbox - ld a, 4 - ld d, RIGHT - call SetObjectFacing - ld hl, SilentHillLabFrontTextString29 - call OpenTextbox - ld hl, SilentHillLabFrontTextString7 - call OpenTextbox - call SilentHillLabFrontScript5 - ret - -SilentHillLabFrontScript5: - ld hl, wJoypadFlags - set 4, [hl] - ld a, 2 - call Function17f9 - ld a, 2 - ld hl, SilentHillLabFrontMovement3 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 5 - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillLabFrontMovement3: - db 9, 5, $33 - -SilentHillLabFrontScript6: - ld hl, wJoypadFlags - set 4, [hl] - ld a, 4 - call Function17f9 - ld a, 4 - ld hl, SilentHillLabFrontMovement4 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 6 - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillLabFrontMovement4: - db $0D, $0D, $0F, $0D, $0D, $33 - -SilentHillLabFrontScript7: - ld hl, wJoypadFlags - set 4, [hl] - ld a, 0 - call Function17f9 - ld a, 0 - ld hl, SilentHillLabFrontMovement5 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 7 - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillLabFrontMovement5: - db 09, 09, 09, 05, $32 - -SilentHillLabFrontScript8: - ld a, 3 - call Function1989 - ld a, 5 - call Function1989 - ld hl, wJoypadFlags - set 4, [hl] - ld a, 0 - call Function17f9 - ld a, 0 - ld hl, SilentHillLabFrontMovement6 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 8 - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillLabFrontMovement6: - db 8, 8, 8, $0A, 6, $32 - -SilentHillLabFrontScript9: - ld hl, wJoypadFlags - set 4, [hl] - ld a, 5 - call Function17f9 - ld a, 5 - call Function197e - ld a, 5 - ld hl, SilentHillLabFrontMovement7 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, 9 - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillLabFrontMovement7: - db $08, $08, $08, $08, $0A, $06, $32 - -SilentHillLabFrontScript10: - ld a, 5 - ld d, RIGHT - call SetObjectFacing - ld hl, SilentHillLabFrontTextString21 - call OpenTextbox - ld hl, wJoypadFlags - set 4, [hl] - ld a, 0 - ld d, RIGHT - call SetObjectFacing - ld a, 5 - ld d, RIGHT - call SetObjectFacing - ld a, 3 - call Function17f9 - ld a, 3 - call Function197e - ld a, 3 - ld hl, SilentHillLabFrontMovement8 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, $0A - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillLabFrontMovement8: - db $08, $04, $32 - -SilentHillLabFrontScript11: - ld hl, SilentHillLabFrontTextString8 - call OpenTextbox - ld hl, SilentHillLabFrontTextString9 - call OpenTextbox - ld a, $0B - call Function1617 - ld a, $0C - call Function1617 - ld hl, SilentHillLabFrontTextString10 - call OpenTextbox - ld hl, SilentHillLabFrontTextString15 - call OpenTextbox - ld hl, wd41c - set 4, [hl] - call Function20f8 - ld a, $0B - ld [wMapScriptNumber], a - call InitUnknownBuffercc9e - ret - -SilentHillLabFrontScript12: - call SilentHillLabFrontMoveDown - ret z - call SilentHillLabFrontRivalMovePokemon - ret z - ld hl, SilentHillLabFrontNPCIDs6 - ld de, SilentHillLabFrontTextPointers2 - call CallMapTextSubroutine - ret - -SilentHillLabFrontRivalMovePokemon: - ld a, [wYCoord] - cp 8 - ret nz - ld hl, SilentHillLabFrontMovement9 - ld a, [wXCoord] - cp 3 - jr z, .jump - cp 4 - ret nz - ld hl, SilentHillLabFrontMovement10 -.jump - push hl - ld hl, wJoypadFlags - set 4, [hl] - ld a, 5 - call Function17f9 - pop hl - ld a, 5 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, $0C - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - call ClearAccumulator - ret - -SilentHillLabFrontMovement9: - db $08, $0B, $0B, $08, $08, $04, $32 - -SilentHillLabFrontMovement10: - db $08, $0B, $08, $08, $04, $32 - -SilentHillLabFrontScript13: - ld hl, SilentHillLabFrontTextString17 - call OpenTextbox - call GetLabPokemon - ld hl, wc5ed - set 7, [hl] - ld a, 8 - ld [wd637], a - ld a, $0D - ld [wMapScriptNumber], a - call InitUnknownBuffercc9e - ret - -GetLabPokemon: - ld hl, LabPokemon - ld a, [wd266] - ld b, a -.loop - ld a, [hl+] - cp b - jr nz, .jump - ld a, [hl] - ld [wce05], a - ld a, 9 - ld [wce02], a - ret -.jump - inc hl - jr .loop - -LabPokemon: - db DEX_KURUSU - db 1 - db DEX_HAPPA - db 2 - db DEX_HONOGUMA - db 3 - -SilentHillLabFrontScript14: - ld hl, SilentHillLabFrontTextString19 - ld a, [wcd5d] - and a - jr nz, .skip - ld hl, SilentHillLabFrontTextString18 -.skip - call OpenTextbox - ld hl, wJoypadFlags - set 4, [hl] - ld a, 5 - call Function17f9 - ld a, 5 - ld hl, SilentHillLabFrontMovement11 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, $0E - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - ret - -SilentHillLabFrontMovement11: - db $04, $08, $08, $08, $33 - -SilentHillLabFrontScript15: - call Function20f8 - ld a, $0F - ld [wMapScriptNumber], a - call InitUnknownBuffercc9e - ret - -SilentHillLabFrontScript16: - call SilentHillLabFrontMoveDown - ret z - call SilentHillLabFrontMoveRivalLeave - ret z - ld hl, SilentHillLabFrontNPCIDs7 - ld de, SilentHillLabFrontTextPointers2 - call CallMapTextSubroutine - ret - -SilentHillLabFrontMoveRivalLeave: - ld a, [wYCoord] - cp $0B - ret nz - ld hl, Movememt12+1 - ld a, [wXCoord] - cp 3 - jr z, .jump - cp 4 - ret nz - ld hl, Movememt12 -.jump - push hl - ld hl, wJoypadFlags - set 4, [hl] - ld a, 8 - call Function17f9 - pop hl - ld a, 8 - call LoadMovementDataPointer - ld hl, wc5ed - set 7, [hl] - ld a, $10 - ld [wMapScriptNumber], a - ld a, 1 - call WriteIntod637 - call ClearAccumulator - ret - -Movememt12: - db $07, $07, $07, $05, $32 - -SilentHillLabFrontScript17: - ld hl, SilentHillLabFrontTextString23 - call OpenTextbox - ld hl, wd41d - set 2, [hl] - ld hl, wNumBagItems - ld a, 5 - ld [wCurItem], a - ld a, 6 - ld [wItemQuantity], a - call ReceiveItem - call Function20f8 - ld a, $11 - ld [wMapScriptNumber], a - ret - -SilentHillLabFrontScript18: - call SilentHillLabFrontMoveDown - ret z - ld hl, SilentHillLabFrontNPCIDs7 - ld de, SilentHillLabFrontTextPointers2 - call CallMapTextSubroutine - ret - -SilentHillLabFrontScript19: - call SilentHillLabFrontMoveDown - ret z - ld hl, SilentHillLabFrontNPCIDs9 - ld de, SilentHillLabFrontTextPointers2 - call CallMapTextSubroutine - ret - -SilentHillLabFrontTextPointers2: - dw SilentHillLabFrontText1 - dw SilentHillLabFrontText2 - dw Function3899 - dw Function3899 - dw Function3899 - dw Function3899 - dw Function3899 - dw Function3899 - dw Function3899 - dw Function3899 - dw Function3899 - dw Function3899 - dw Function3899 - dw Function3899 - dw SilentHillLabFrontText3 - -SilentHillLabFrontText1: - ld hl, SilentHillLabFrontTextString1 - call OpenTextbox - ret - -SilentHillLabFrontTextString1: - text "パソコンを みると" - line "なんと メールが きていた！" - - para "<⋯⋯> <⋯⋯> <⋯⋯>" - line "オーキドはかせ！" - cont "あなたが ゆくえふめいに" - cont "なっていると せけんは" - cont "おおさわぎ です！" - - para "それは そうと" - line "はかせ から みつけるように" - cont "たのまれた れいの#" - cont "みつけるどころか" - cont "まだ てがかりも" - cont "つかむことが できません" - - para "やはり あいつは" - line "かくうの #なのでは" - cont "ないでしょうか<⋯⋯>" - cont "<⋯⋯> <⋯⋯> <⋯⋯>じょしゅより" - done - -SilentHillLabFrontText2: - ld hl, wd39d - bit 0, [hl] - set 0, [hl] - jr z, .jump - res 0, [hl] - ld hl, SilentHillLabFrontTextString2A - jr .skip -.jump - ld hl, SilentHillLabFrontTextString2B -.skip - call OpenTextbox - ret - -SilentHillLabFrontTextString2A: - text "スタート ボタンを プシュ！" - line "おすと メニューが ひらくなり" - done - -SilentHillLabFrontTextString2B: - text "セーブするには # レポート" - line "こまめに かくと いいなり" - done - -SilentHillLabFrontText3: - ld hl, SilentHillLabFrontTextString3 - call OpenTextbox - ret - -SilentHillLabFrontTextString3: - text "カギが かかっている" - done - -SilentHillLabFrontText4: - ld a, [wMapScriptNumber] - cp $0E - jp nc, SilentHillLabFrontText7 - ld hl, SilentHillLabFrontTextString4 - call OpenTextbox - ret - -SilentHillLabFrontTextString4: - text "オーキド『ごくろうさん！" - done - -SilentHillLabFrontTextString5: - text "オーキド『そうとも！" - line "わしが オーキドじゃ！" - cont "じじいで わるかったな！" - - para "おまえたち ふたりは" - line "この オーキドが よんだのじゃ！" - - para "すこし わしの はなしを" - line "きいては くれんか？@" - db $08 - -SilentHillLabFrontText6: - call YesNoBox - jr c, .jump -.loop - ld hl, SilentHillLabFrontTextString6A - call PrintText - call Function3036 - ret - -.jump - ld hl, SilentHillLabFrontTextString6B - call PrintText - call YesNoBox - jr c, .jump - jr .loop - -SilentHillLabFrontTextString6A: - text "オーキド『いまから １ねんまえ" - line "わしは カントーで" - cont "きみたちの ような しょうねんに" - cont "#の けんきゅうの ため" - cont "#と ずかんを わたした" - - para "そして かれらは" - line "じつに よくやってくれた！" - - para "１５０しゅるいの" - line "#を みつけることに" - cont "せいこう したのじゃ！" - cont "が <⋯⋯> <⋯⋯> <⋯⋯>" - cont "しかし <⋯⋯> <⋯⋯>" - - para "せかいは ひろいものじゃ" - line "そのご ぜんこく かくちで" - cont "あたらしい #が ぞくぞくと" - cont "みつかっておる！" - - para "そこで わしは カントーから" - line "ここ サイレントヒルに" - cont "けんきゅうの ばしょを うつした" - - para "ばしょが かわれば" - line "あたらしい #にも" - cont "であうことが できるからな" - cont "<⋯⋯> <⋯⋯> <⋯⋯> <⋯⋯>" - - para "これからも どんどんと" - line "けんきゅうを すすめるが" - cont "わしも ごらんのとおりの おいぼれ" - cont "まごや じょしゅたちも おるが" - cont "それでも やはり かずが たらん！" - - para "<PLAYER>！ <RIVAL>！" - line "#けんきゅうの ために" - cont "ちからを かして くれんか！" - done - -SilentHillLabFrontTextString6B: - text "オーキド『そうか<⋯⋯>" - line "わしに ひとを みるめが" - cont "なかったと いうことじゃな<⋯⋯>" - - para "いや！" - line "わしの ひとを みるめは" - cont "まちがっては おらんはず！" - - para "な？" - cont "わしの はなしを きいてくれるな？" - done - -SilentHillLabFrontTextString7: - text "オーキド『ふたりとも！" - line "ちょっと わしに ついてこい！" - done - -SilentHillLabFrontText7: - ld a, [wMapScriptNumber] - cp $12 - jr z, .jump - ld hl, SilentHillLabFrontTextString11A - call OpenTextbox - ret - -.jump - ld hl, SilentHillLabFrontTextString11B - call OpenTextbox - ret - -SilentHillLabFrontTextString8: - text "オーキド『<PLAYER>！<RIVAL>！" - line "このずかんを" - cont "おまえたちに あずける！" - done - -SilentHillLabFrontTextString9: - text "<PLAYER>は オーキドから" - line "#ずかんを もらった！" - done - -SilentHillLabFrontTextString10: - text "オーキド『この せかいの すべての" - line "#を きろくした" - cont "かんぺきな ずかんを つくること！" - cont "それが わしの ゆめ だった！" - - para "しかし しんしゅの #は" - cont "ぞくぞくと みつかっている！" - - para "わしに のこされた" - line "じかんは すくない！" - - para "そこで おまえ たちには" - line "わしの かわりに" - cont "ゆめを はたして ほしいのじゃ！" - - para "さあ ふたりとも" - line "さっそく しゅっぱつ してくれい！" - cont "これは #の れきしに のこる" - cont "いだいな しごとじゃー！" - done - -SilentHillLabFrontTextString11A: - text "オーキド『せかい じゅうの" - line "#たちが" - cont "<PLAYER>を まって おるぞー" - done - -SilentHillLabFrontTextString11B: - text "オーキド『おう！ <PLAYER>" - line "どうだ？" - cont "わしの あげた #は<⋯⋯>？" - - para "ほう！" - cont "だいぶ なついた みたいだな" - - para "おまえには #トレーナーの" - line "さいのうが あるかもしれん" - cont "これからも ときどきは" - cont "わしのところへ かおを だせ！" - - para "#ずかんの ぺージが" - line "きに なるからな" - done - -SilentHillLabFrontText8: - ld hl, SilentHillLabFrontTextString12 - call OpenTextbox - ret - -SilentHillLabFrontTextString12: - text "オーキド『よく きたな！" - line "#ずかんの" - cont "ちょうしは どうかな？" - - para "どれ<⋯⋯> ちょっと" - cont "みて あげようか！" - done - -SilentHillLabFrontText9: - ld hl, SilentHillLabFrontTextString13 - call OpenTextbox - ret - -SilentHillLabFrontTextString13: - text "オーキド『<⋯⋯> おっほんッ！" - line "よくやったな <PLAYER>！" - - para "ちょっと" - line "わしに ついて きなさい！" - - para "<RIVAL>は すまんが" - line "そこで まっていなさい！" - - para "<RIVAL>『えー！" - line "なんだよ ケチー！" - - para "オーキド『<RIVAL>は" - line "でんせつの #が" - cont "ほしかった だけじゃないのか？" - cont "<RIVAL>『ギクッ！" - done - -SilentHillLabFrontText10: - ld hl, SilentHillLabFrontTextString14 - call OpenTextbox - ret - -SilentHillLabFrontTextString14: - text "<RIVAL>『なんだ" - line "<PLAYER>じゃないか！" - cont "おれも ここが" - cont "あやしいと おもって きたんだけど" - cont "だれも いないみたいだな<⋯⋯>" - done - -SilentHillLabFrontText11: - ld hl, SilentHillLabFrontTextString16 - call OpenTextbox - ret - -SilentHillLabFrontTextString15: - text "<RIVAL>『よっしゃあ！" - line "じいさん！ おれにまかせな！" - done - -SilentHillLabFrontTextString16: - text "<RIVAL>『おれが えらんだ" - line "#のほうが つよそうだぜ！" - cont "こっちに したかったんじゃないの？" - done - -SilentHillLabFrontTextString17: - text "<RIVAL>『<PLAYER>！" - line "せっかく じいさんに" - cont "# もらったんだから" - cont "<⋯⋯> ちょっと" - cont "たたかわせて みようぜ！" - done - -SilentHillLabFrontTextString18: - text "<RIVAL>『くっそー！" - line "こんどは ぜったい まけないぞ！" - done - -SilentHillLabFrontTextString19: - text "<RIVAL>『よーし！" - line "ほかの #と たたかわせて" - cont "もっと もっと つよくしよう！" - - para "そんじゃ ばいばい！" - done - -SilentHillLabFrontTextString20: - text "じいちゃん！" - line "つれてきたよー！" - done - -SilentHillLabFrontTextString21: - text "ぼくは かつて" - line "#トレーナーの ちょうてんを" - cont "めざしたことが あるんだ" - cont "そのとき いいきに なっていた" - cont "ぼくの てんぐのはなを" - cont "へしおった やつに" - cont "きみは どことなく にている" - - para "あいつの おかげで ぼくは" - line "こころを いれかえて" - cont "じいさんの けんきゅうを" - cont "てつだうように なったのさ" - cont "<⋯⋯> <⋯⋯> <⋯⋯> <⋯⋯> <⋯⋯>" - - para "さあ！" - line "これが #ずかんだ！" - - para "みつけた #の データが" - line "じどうてきに かきこまれて" - cont "ぺージが ふえて いく という" - cont "とても ハイテクな ずかん だよ！" - done - -SilentHillLabFrontText12: - ld hl, SilentHillLabFrontTextString22 - call OpenTextbox - ret - -SilentHillLabFrontTextString22: - text "ぼくも むかし やったけど" - line "なかなか たいへんだよ<⋯⋯>" - cont "がんばってね！" - done - -SilentHillLabFrontText13: - ld hl, SilentHillLabFrontTextString24 - call OpenTextbox - ret - -SilentHillLabFrontTextString23: - text "ナナミ『さっき あなたを " - line "つれてきた わかい おとこのこ<⋯⋯>" - cont "あれは わたしの おとうとなの" - cont "<⋯⋯>ということは つまり" - - para "そう！" - line "わたしも オーキドの まご なの！" - - para "おじいちゃんは りっぱな" - cont "#けんきゅうしゃよ" - cont "わたしは おてつだい できることが" - cont "とっても うれしいの！" - cont "あっ こんなこと しられたら" - cont "おじいちゃん ちょうしに のるから" - cont "ないしょに しておいてね！" - - para "<⋯⋯>おじいちゃん すっかり" - line "わすれている みたいだから" - - para "わたしが かわりに これを あげる！" - line "さいしんがた #りュックよ" - - para "<PLAYER>は" - line "#りュックを もらった！" - - para "ナナミ『この りュックには" - line "モンスターボールを" - cont "まとめて いれられる" - cont "ボールホルダと" - cont "わざマシンを まとめて いれられる" - cont "わざマシンホルダが ついているの" - - para "モンスターボール ６こと " - line "わざマシンひとつは オマケしておくわ" - cont "ホルダに なんにも はいってないと" - cont "さびしいもんね！" - - para "ねえ <PLAYER>くン" - line "あなたの おかあさんが" - cont "しんぱいすると いけないから" - cont "このまちを でるまえに" - cont "かおを みせに いってあげてね" - - para "<⋯⋯>あなたの かつやく" - line "いのっているわ" - done - -SilentHillLabFrontTextString24: - text "<⋯⋯>あなたの かつやく" - line "いのってるわ" - done - -SilentHillLabFrontText14: - ld hl, SilentHillLabFrontTextString25 - call OpenTextbox - ret - -SilentHillLabFrontTextString25: - text "わたしは" - line "はかせの じょしゅ です" - - para "わたしは もちろん" - line "はかせを ソンケー しております" - - para "あなた とは また どこかで" - line "おあい することに" - cont "なるような きがします" - done - -SilentHillLabFrontText15: - ld hl, SilentHillLabFrontTextString26 - call OpenTextbox - ret - -SilentHillLabFrontTextString26: - text "わたしは" - line "はかせの じょしゅ です" - - para "わたしは もちろん" - line "はかせを ソンケー しております" - - para "あなた とは また どこかで" - line "おあい することに" - cont "なるような きがします" - done - -SilentHillLabFrontText16: - ld hl, SilentHillLabFrontTextString27 - call OpenTextbox - ret - -SilentHillLabFrontTextString27: - text "なんだろう？" - line "でんし てちょう かな？" - done - -SilentHillLabFrontText17: - ld hl, SilentHillLabFrontTextString28 - call OpenTextbox - ret - -SilentHillLabFrontTextString28: - text "<RIVAL>『あのメールを くれた" - line "オーキドって こんな じじい<⋯⋯>" - - para "あっ ゴメン" - line "こんな じいさん なのか？" - cont "ほんもの はじめて みたよ！" - done - -SilentHillLabFrontTextString29: - text "<RIVAL>『<PLAYER>！" - line "なんだか" - cont "おもしろく なってきたな！" - done - -SilentHillLabFrontText18: - ld hl, SilentHillLabFrontTextString30 - call OpenTextbox - ret - -SilentHillLabFrontTextString30: - text "わたしは" - line "はかせの じょしゅ です" - - para "あなた とは また どこかで" - line "おあい することに" - cont "なるような きがします" - done - -SilentHillLabFrontText19: - ld hl, SilentHillLabFrontTextString31 - call OpenTextbox - ret - -SilentHillLabFrontTextString31: - text "わたしは" - line "はかせの じょしゅ です" - - para "あなた とは また どこかで" - line "おあい することに" - cont "なるような きがします" - done diff --git a/maps/blk/SilentHillLabFront.blk b/maps/SilentHillLabFront.blk index b9daa9d..b9daa9d 100644 --- a/maps/blk/SilentHillLabFront.blk +++ b/maps/SilentHillLabFront.blk diff --git a/maps/SilentHillPokecenter.asm b/maps/SilentHillPokecenter.asm deleted file mode 100644 index 89ade47..0000000 --- a/maps/SilentHillPokecenter.asm +++ /dev/null @@ -1,110 +0,0 @@ -include "constants.asm" - -SECTION "maps/SilentHillPokecenter.asm", ROMX - -SilentHillPokecenterScriptLoader:: - ld hl, SilentHillPokecenterScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -SilentHillPokecenterScriptPointers: - dw SilentHillPokecenterScript - dw SilentHillPokecenterNPCIDs - -SilentHillPokecenterScript: - ld hl, SilentHillPokecenterNPCIDs - ld de, SilentHillPokecenterPCPointer - call CallMapTextSubroutine - ret - - dw SilentHillPokecenterNPCIDs - -SilentHillPokecenterNPCIDs: - db 0 - db 1 - db 2 - db 3 - db 4 - db $FF - -SilentHillPokecenterPCPointer: - dw SilentHillPokecenterPCText - -SilentHillPokecenterPCText: - ld hl, SilentHillPokecenterTextString1 - call OpenTextbox - ret - -SilentHillPokecenterTextString1: - text "げんざい ちょうせいちゅうです" - done - -SilentHillPokecenterTextPointers:: - dw SilentHillPokecenterNPCText1 - dw SilentHillPokecenterNPCText2 - dw SilentHillPokecenterNPCText3 - dw SilentHillPokecenterNPCText4 - dw SilentHillPokecenterNPCText5 - -SilentHillPokecenterNPCText1: - ld hl, SilentHillPokecenterTextString2 - call OpenTextbox - ret - -SilentHillPokecenterTextString2: - text "もうしわけありませんが" - line "ただいま しゅうりちゅう でして" - - para "かいふくは できません" - - para "まちから でるときは" - line "じゅうぶんに おきをつけ ください" - done - -SilentHillPokecenterNPCText2: - ld hl, SilentHillPokecenterTextString3 - call OpenTextbox - ret - -SilentHillPokecenterTextString3: - text "あそこに ある パソコンは" - line "トレーナー だったら" - cont "いつでも むりょうで" - cont "つかうことが できるよ" - cont "きが きいてるよな！" - done - -SilentHillPokecenterNPCText3: - ld hl, SilentHillPokecenterTextString4 - call OpenTextbox - ret - -SilentHillPokecenterTextString4: - text "いま じゅんびちゅうの" - line "きかいは すごいらしいよ" - - para "なんでも ときを こえて" - line "ポケモンが こうかん できるって！" - - para "ほんとかな？" - done - -SilentHillPokecenterNPCText4: - ld hl, SilentHillPokecenterTextString5 - call OpenTextbox - ret - -SilentHillPokecenterTextString5: - text "こいつ へルガー" - line "いままでにない タイプの ポケモンさ" - done - -SilentHillPokecenterNPCText5: - ld hl, SilentHillPokecenterTextString6 - call OpenTextbox - ret - -SilentHillPokecenterTextString6: - text "へルガー『ぐるるうー" - done diff --git a/maps/blk/SilentHillPokecenter.blk b/maps/SilentHillPokecenter.blk index 5003589..5003589 100644 --- a/maps/blk/SilentHillPokecenter.blk +++ b/maps/SilentHillPokecenter.blk diff --git a/maps/placeholder/blk/SlowpokeWellEntrance.blk b/maps/SlowpokeWellEntrance.blk index 3de108d..3de108d 100644 --- a/maps/placeholder/blk/SlowpokeWellEntrance.blk +++ b/maps/SlowpokeWellEntrance.blk diff --git a/maps/placeholder/blk/SlowpokeWellMain.blk b/maps/SlowpokeWellMain.blk index 02bd937..02bd937 100644 --- a/maps/placeholder/blk/SlowpokeWellMain.blk +++ b/maps/SlowpokeWellMain.blk diff --git a/maps/placeholder/blk/South.blk b/maps/South.blk index ee089c7..ee089c7 100644 --- a/maps/placeholder/blk/South.blk +++ b/maps/South.blk diff --git a/maps/placeholder/blk/SouthHouse1.blk b/maps/SouthHouse1.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/SouthHouse1.blk +++ b/maps/SouthHouse1.blk diff --git a/maps/placeholder/blk/SouthHouse2.blk b/maps/SouthHouse2.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/SouthHouse2.blk +++ b/maps/SouthHouse2.blk diff --git a/maps/placeholder/blk/SouthMart.blk b/maps/SouthMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/SouthMart.blk +++ b/maps/SouthMart.blk diff --git a/maps/placeholder/blk/SouthPokecenter1F.blk b/maps/SouthPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/SouthPokecenter1F.blk +++ b/maps/SouthPokecenter1F.blk diff --git a/maps/placeholder/blk/SouthPokecenter2F.blk b/maps/SouthPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/SouthPokecenter2F.blk +++ b/maps/SouthPokecenter2F.blk diff --git a/maps/placeholder/blk/Stand.blk b/maps/Stand.blk index c13d41c..c13d41c 100644 --- a/maps/placeholder/blk/Stand.blk +++ b/maps/Stand.blk diff --git a/maps/placeholder/blk/StandHouse.blk b/maps/StandHouse.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/StandHouse.blk +++ b/maps/StandHouse.blk diff --git a/maps/placeholder/blk/StandLab.blk b/maps/StandLab.blk index 05be865..05be865 100644 --- a/maps/placeholder/blk/StandLab.blk +++ b/maps/StandLab.blk diff --git a/maps/placeholder/blk/StandLeague1F.blk b/maps/StandLeague1F.blk index b4060b3..b4060b3 100644 --- a/maps/placeholder/blk/StandLeague1F.blk +++ b/maps/StandLeague1F.blk diff --git a/maps/placeholder/blk/StandLeague2F.blk b/maps/StandLeague2F.blk index 0883f4a..0883f4a 100644 --- a/maps/placeholder/blk/StandLeague2F.blk +++ b/maps/StandLeague2F.blk diff --git a/maps/placeholder/blk/StandMart.blk b/maps/StandMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/StandMart.blk +++ b/maps/StandMart.blk diff --git a/maps/placeholder/blk/StandOffice.blk b/maps/StandOffice.blk index 02d3709..02d3709 100644 --- a/maps/placeholder/blk/StandOffice.blk +++ b/maps/StandOffice.blk diff --git a/maps/placeholder/blk/StandPokecenter1F.blk b/maps/StandPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/StandPokecenter1F.blk +++ b/maps/StandPokecenter1F.blk diff --git a/maps/placeholder/blk/StandPokecenter2F.blk b/maps/StandPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/StandPokecenter2F.blk +++ b/maps/StandPokecenter2F.blk diff --git a/maps/placeholder/blk/StandRocketHouse1F.blk b/maps/StandRocketHouse1F.blk index 26395df..26395df 100644 --- a/maps/placeholder/blk/StandRocketHouse1F.blk +++ b/maps/StandRocketHouse1F.blk diff --git a/maps/placeholder/blk/StandRocketHouse2F.blk b/maps/StandRocketHouse2F.blk index 2e80edb..2e80edb 100644 --- a/maps/placeholder/blk/StandRocketHouse2F.blk +++ b/maps/StandRocketHouse2F.blk diff --git a/maps/placeholder/blk/StandRoute.blk b/maps/StandRoute.blk index 76b0872..76b0872 100644 --- a/maps/placeholder/blk/StandRoute.blk +++ b/maps/StandRoute.blk diff --git a/maps/placeholder/blk/StandRouteGateKanto.blk b/maps/StandRouteGateKanto.blk index 0ba6b01..0ba6b01 100644 --- a/maps/placeholder/blk/StandRouteGateKanto.blk +++ b/maps/StandRouteGateKanto.blk diff --git a/maps/placeholder/blk/Sugar.blk b/maps/Sugar.blk index 1efeaa5..1efeaa5 100644 --- a/maps/placeholder/blk/Sugar.blk +++ b/maps/Sugar.blk diff --git a/maps/placeholder/blk/SugarHouse.blk b/maps/SugarHouse.blk index f717157..f717157 100644 --- a/maps/placeholder/blk/SugarHouse.blk +++ b/maps/SugarHouse.blk diff --git a/maps/placeholder/blk/SugarHouse2.blk b/maps/SugarHouse2.blk index 923d6f0..923d6f0 100644 --- a/maps/placeholder/blk/SugarHouse2.blk +++ b/maps/SugarHouse2.blk diff --git a/maps/placeholder/blk/SugarMart.blk b/maps/SugarMart.blk index dd7ef2a..dd7ef2a 100644 --- a/maps/placeholder/blk/SugarMart.blk +++ b/maps/SugarMart.blk diff --git a/maps/placeholder/blk/SugarPokecenter1F.blk b/maps/SugarPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/SugarPokecenter1F.blk +++ b/maps/SugarPokecenter1F.blk diff --git a/maps/placeholder/blk/SugarPokecenter2F.blk b/maps/SugarPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/SugarPokecenter2F.blk +++ b/maps/SugarPokecenter2F.blk diff --git a/maps/placeholder/blk/SugarRoute.blk b/maps/SugarRoute.blk index dadb2be..dadb2be 100644 --- a/maps/placeholder/blk/SugarRoute.blk +++ b/maps/SugarRoute.blk diff --git a/maps/placeholder/blk/SugarRouteGate.blk b/maps/SugarRouteGate.blk index 0ba6b01..0ba6b01 100644 --- a/maps/placeholder/blk/SugarRouteGate.blk +++ b/maps/SugarRouteGate.blk diff --git a/maps/UnusedMap13.asm b/maps/UnusedMap13.asm deleted file mode 100644 index 22f2b01..0000000 --- a/maps/UnusedMap13.asm +++ /dev/null @@ -1,28 +0,0 @@ -include "constants.asm" - -SECTION "maps/UnusedMap13.asm", ROMX - -UnusedMap13ScriptLoader:: - ld hl, UnusedMap13ScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -UnusedMap13ScriptPointers: - dw UnusedMap13Script - dw UnusedMap13NPCIDs - -UnusedMap13NPCIDs: - db $FF - -UnusedMap13SignPointers: - dw MapDefaultText - -UnusedMap13TextPointers:: - dw MapDefaultText - -UnusedMap13Script: - ld hl, UnusedMap13NPCIDs - ld de, UnusedMap13SignPointers - call CallMapTextSubroutine - ret diff --git a/maps/blk/UnusedMap13.blk b/maps/UnusedMap13.blk index 500b0c7..500b0c7 100644 --- a/maps/blk/UnusedMap13.blk +++ b/maps/UnusedMap13.blk diff --git a/maps/placeholder/blk/West.blk b/maps/West.blk index d66bcea..d66bcea 100644 --- a/maps/placeholder/blk/West.blk +++ b/maps/West.blk diff --git a/maps/placeholder/blk/WestGym.blk b/maps/WestGym.blk index b972334..b972334 100644 --- a/maps/placeholder/blk/WestGym.blk +++ b/maps/WestGym.blk diff --git a/maps/placeholder/blk/WestHouse1.blk b/maps/WestHouse1.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/WestHouse1.blk +++ b/maps/WestHouse1.blk diff --git a/maps/placeholder/blk/WestHouse2.blk b/maps/WestHouse2.blk index 3a80d96..3a80d96 100644 --- a/maps/placeholder/blk/WestHouse2.blk +++ b/maps/WestHouse2.blk diff --git a/maps/placeholder/blk/WestMart1F.blk b/maps/WestMart1F.blk index 06ddb4d..06ddb4d 100644 --- a/maps/placeholder/blk/WestMart1F.blk +++ b/maps/WestMart1F.blk diff --git a/maps/placeholder/blk/WestMart2F.blk b/maps/WestMart2F.blk index e5a6605..e5a6605 100644 --- a/maps/placeholder/blk/WestMart2F.blk +++ b/maps/WestMart2F.blk diff --git a/maps/placeholder/blk/WestMart3F.blk b/maps/WestMart3F.blk index f7c657e..f7c657e 100644 --- a/maps/placeholder/blk/WestMart3F.blk +++ b/maps/WestMart3F.blk diff --git a/maps/placeholder/blk/WestMart4F.blk b/maps/WestMart4F.blk index 540dc4c..540dc4c 100644 --- a/maps/placeholder/blk/WestMart4F.blk +++ b/maps/WestMart4F.blk diff --git a/maps/placeholder/blk/WestMart5F.blk b/maps/WestMart5F.blk index 447ad4d..447ad4d 100644 --- a/maps/placeholder/blk/WestMart5F.blk +++ b/maps/WestMart5F.blk diff --git a/maps/placeholder/blk/WestMart6F.blk b/maps/WestMart6F.blk index 55fa67e..55fa67e 100644 --- a/maps/placeholder/blk/WestMart6F.blk +++ b/maps/WestMart6F.blk diff --git a/maps/placeholder/blk/WestMartElevator.blk b/maps/WestMartElevator.blk index 2a0fe57..2a0fe57 100644 --- a/maps/placeholder/blk/WestMartElevator.blk +++ b/maps/WestMartElevator.blk diff --git a/maps/placeholder/blk/WestPokecenter1F.blk b/maps/WestPokecenter1F.blk index d861b25..d861b25 100644 --- a/maps/placeholder/blk/WestPokecenter1F.blk +++ b/maps/WestPokecenter1F.blk diff --git a/maps/placeholder/blk/WestPokecenter2F.blk b/maps/WestPokecenter2F.blk index cb1d07a..cb1d07a 100644 --- a/maps/placeholder/blk/WestPokecenter2F.blk +++ b/maps/WestPokecenter2F.blk diff --git a/maps/placeholder/blk/WestRadioTower1F.blk b/maps/WestRadioTower1F.blk index 49aa4c7..49aa4c7 100644 --- a/maps/placeholder/blk/WestRadioTower1F.blk +++ b/maps/WestRadioTower1F.blk diff --git a/maps/placeholder/blk/WestRadioTower2F.blk b/maps/WestRadioTower2F.blk index 1a37166..1a37166 100644 --- a/maps/placeholder/blk/WestRadioTower2F.blk +++ b/maps/WestRadioTower2F.blk diff --git a/maps/placeholder/blk/WestRadioTower3F.blk b/maps/WestRadioTower3F.blk index bbecb5f..bbecb5f 100644 --- a/maps/placeholder/blk/WestRadioTower3F.blk +++ b/maps/WestRadioTower3F.blk diff --git a/maps/placeholder/blk/WestRadioTower4F.blk b/maps/WestRadioTower4F.blk index b728241..b728241 100644 --- a/maps/placeholder/blk/WestRadioTower4F.blk +++ b/maps/WestRadioTower4F.blk diff --git a/maps/placeholder/blk/WestRadioTower5F.blk b/maps/WestRadioTower5F.blk index 13d970e..13d970e 100644 --- a/maps/placeholder/blk/WestRadioTower5F.blk +++ b/maps/WestRadioTower5F.blk diff --git a/maps/placeholder/blk/WestRocketRaidedHouse.blk b/maps/WestRocketRaidedHouse.blk index 9acf892..9acf892 100644 --- a/maps/placeholder/blk/WestRocketRaidedHouse.blk +++ b/maps/WestRocketRaidedHouse.blk diff --git a/maps/placeholder/Baadon.asm b/maps/placeholder/Baadon.asm deleted file mode 100644 index ec28632..0000000 --- a/maps/placeholder/Baadon.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Baadon.asm", ROMX - -BaadonScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/BaadonHouse1.asm b/maps/placeholder/BaadonHouse1.asm deleted file mode 100644 index d4cc840..0000000 --- a/maps/placeholder/BaadonHouse1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonHouse1.asm", ROMX - -BaadonHouse1ScriptLoader:: - ret - -BaadonHouse1TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BaadonHouse2.asm b/maps/placeholder/BaadonHouse2.asm deleted file mode 100644 index c2c0280..0000000 --- a/maps/placeholder/BaadonHouse2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonHouse2.asm", ROMX - -BaadonHouse2ScriptLoader:: - ret - -BaadonHouse2TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BaadonLeague1F.asm b/maps/placeholder/BaadonLeague1F.asm deleted file mode 100644 index 3f24f0a..0000000 --- a/maps/placeholder/BaadonLeague1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonLeague1F.asm", ROMX - -BaadonLeague1FScriptLoader:: - ret - -BaadonLeague1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BaadonLeague2F.asm b/maps/placeholder/BaadonLeague2F.asm deleted file mode 100644 index e18cf6e..0000000 --- a/maps/placeholder/BaadonLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonLeague2F.asm", ROMX - -BaadonLeague2FScriptLoader:: - ret - -BaadonLeague2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BaadonMart.asm b/maps/placeholder/BaadonMart.asm deleted file mode 100644 index 9bda0fc..0000000 --- a/maps/placeholder/BaadonMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonMart.asm", ROMX - -BaadonMartScriptLoader:: - ret - -BaadonMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BaadonPokecenter1F.asm b/maps/placeholder/BaadonPokecenter1F.asm deleted file mode 100644 index 8dbe247..0000000 --- a/maps/placeholder/BaadonPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonPokecenter1F.asm", ROMX - -BaadonPokecenter1FScriptLoader:: - ret - -BaadonPokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BaadonPokecenter2F.asm b/maps/placeholder/BaadonPokecenter2F.asm deleted file mode 100644 index 3827617..0000000 --- a/maps/placeholder/BaadonPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonPokecenter2F.asm", ROMX - -BaadonPokecenter2FScriptLoader:: - ret - -BaadonPokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BaadonRoute1.asm b/maps/placeholder/BaadonRoute1.asm deleted file mode 100644 index 8df30f7..0000000 --- a/maps/placeholder/BaadonRoute1.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonRoute1.asm", ROMX - -BaadonRoute1ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/BaadonRoute2.asm b/maps/placeholder/BaadonRoute2.asm deleted file mode 100644 index 6a133b4..0000000 --- a/maps/placeholder/BaadonRoute2.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonRoute2.asm", ROMX - -BaadonRoute2ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/BaadonRoute3.asm b/maps/placeholder/BaadonRoute3.asm deleted file mode 100644 index a20f29d..0000000 --- a/maps/placeholder/BaadonRoute3.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonRoute3.asm", ROMX - -BaadonRoute3ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/BaadonRouteGateNewtype.asm b/maps/placeholder/BaadonRouteGateNewtype.asm deleted file mode 100644 index 26e0dd7..0000000 --- a/maps/placeholder/BaadonRouteGateNewtype.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonRouteGateNewtype.asm", ROMX - -BaadonRouteGateNewtypeScriptLoader:: - ret - -BaadonRouteGateNewtypeTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BaadonRouteGateWest.asm b/maps/placeholder/BaadonRouteGateWest.asm deleted file mode 100644 index 4fd4b9f..0000000 --- a/maps/placeholder/BaadonRouteGateWest.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonRouteGateWest.asm", ROMX - -BaadonRouteGateWestScriptLoader:: - ret - -BaadonRouteGateWestTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BaadonWallpaperHouse.asm b/maps/placeholder/BaadonWallpaperHouse.asm deleted file mode 100644 index 67fa772..0000000 --- a/maps/placeholder/BaadonWallpaperHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BaadonWallpaperHouse.asm", ROMX - -BaadonWallpaperHouseScriptLoader:: - ret - -BaadonWallpaperHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullForest.asm b/maps/placeholder/BullForest.asm deleted file mode 100644 index 82e0475..0000000 --- a/maps/placeholder/BullForest.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullForest.asm", ROMX - -BullForestScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/BullForestRoute1.asm b/maps/placeholder/BullForestRoute1.asm deleted file mode 100644 index 459d42f..0000000 --- a/maps/placeholder/BullForestRoute1.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullForestRoute1.asm", ROMX - -BullForestRoute1ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/BullForestRoute1House.asm b/maps/placeholder/BullForestRoute1House.asm deleted file mode 100644 index 1d4e46e..0000000 --- a/maps/placeholder/BullForestRoute1House.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullForestRoute1House.asm", ROMX - -BullForestRoute1HouseScriptLoader:: - ret - -BullForestRoute1HouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullForestRoute2.asm b/maps/placeholder/BullForestRoute2.asm deleted file mode 100644 index 17305bd..0000000 --- a/maps/placeholder/BullForestRoute2.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullForestRoute2.asm", ROMX - -BullForestRoute2ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/BullForestRoute3.asm b/maps/placeholder/BullForestRoute3.asm deleted file mode 100644 index a465c21..0000000 --- a/maps/placeholder/BullForestRoute3.asm +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullForestRoute3.asm", ROMX - -BullForestRoute3ScriptLoader:: - ret - - db "@" - - ret diff --git a/maps/placeholder/BullForestRouteGateStand.asm b/maps/placeholder/BullForestRouteGateStand.asm deleted file mode 100644 index 94b630e..0000000 --- a/maps/placeholder/BullForestRouteGateStand.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullForestRouteGateStand.asm", ROMX - -BullForestRouteGateStandScriptLoader:: - ret - -BullForestRouteGateStandTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullHouse1.asm b/maps/placeholder/BullHouse1.asm deleted file mode 100644 index cbaf78a..0000000 --- a/maps/placeholder/BullHouse1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullHouse1.asm", ROMX - -BullHouse1ScriptLoader:: - ret - -BullHouse1TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullHouse2.asm b/maps/placeholder/BullHouse2.asm deleted file mode 100644 index 856071e..0000000 --- a/maps/placeholder/BullHouse2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullHouse2.asm", ROMX - -BullHouse2ScriptLoader:: - ret - -BullHouse2TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullHouse3.asm b/maps/placeholder/BullHouse3.asm deleted file mode 100644 index 56c6913..0000000 --- a/maps/placeholder/BullHouse3.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullHouse3.asm", ROMX - -BullHouse3ScriptLoader:: - ret - -BullHouse3TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullHouse4.asm b/maps/placeholder/BullHouse4.asm deleted file mode 100644 index ebc2ff5..0000000 --- a/maps/placeholder/BullHouse4.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullHouse4.asm", ROMX - -BullHouse4ScriptLoader:: - ret - -BullHouse4TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullLeague1F.asm b/maps/placeholder/BullLeague1F.asm deleted file mode 100644 index 972d912..0000000 --- a/maps/placeholder/BullLeague1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullLeague1F.asm", ROMX - -BullLeague1FScriptLoader:: - ret - -BullLeague1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullLeague2F.asm b/maps/placeholder/BullLeague2F.asm deleted file mode 100644 index b1fd12d..0000000 --- a/maps/placeholder/BullLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullLeague2F.asm", ROMX - -BullLeague2FScriptLoader:: - ret - -BullLeague2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullMart.asm b/maps/placeholder/BullMart.asm deleted file mode 100644 index 7f4578b..0000000 --- a/maps/placeholder/BullMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullMart.asm", ROMX - -BullMartScriptLoader:: - ret - -BullMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullPokecenter1F.asm b/maps/placeholder/BullPokecenter1F.asm deleted file mode 100644 index 8c802d4..0000000 --- a/maps/placeholder/BullPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullPokecenter1F.asm", ROMX - -BullPokecenter1FScriptLoader:: - ret - -BullPokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/BullPokecenter2F.asm b/maps/placeholder/BullPokecenter2F.asm deleted file mode 100644 index 805df5b..0000000 --- a/maps/placeholder/BullPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/BullPokecenter2F.asm", ROMX - -BullPokecenter2FScriptLoader:: - ret - -BullPokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/CaveMinecarts1.asm b/maps/placeholder/CaveMinecarts1.asm deleted file mode 100644 index bac37be..0000000 --- a/maps/placeholder/CaveMinecarts1.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/CaveMinecarts1.asm", ROMX - -CaveMinecarts1ScriptLoader:: - ret - -CaveMinecarts1TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/CaveMinecarts2.asm b/maps/placeholder/CaveMinecarts2.asm deleted file mode 100644 index cb37e7f..0000000 --- a/maps/placeholder/CaveMinecarts2.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/CaveMinecarts2.asm", ROMX - -CaveMinecarts2ScriptLoader:: - ret - -CaveMinecarts2TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/CaveMinecarts3.asm b/maps/placeholder/CaveMinecarts3.asm deleted file mode 100644 index ac7c5b1..0000000 --- a/maps/placeholder/CaveMinecarts3.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/CaveMinecarts3.asm", ROMX - -CaveMinecarts3ScriptLoader:: - ret - -CaveMinecarts3TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/CaveMinecarts4.asm b/maps/placeholder/CaveMinecarts4.asm deleted file mode 100644 index fa8873f..0000000 --- a/maps/placeholder/CaveMinecarts4.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/CaveMinecarts4.asm", ROMX - -CaveMinecarts4ScriptLoader:: - ret - -CaveMinecarts4TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/CaveMinecarts5.asm b/maps/placeholder/CaveMinecarts5.asm deleted file mode 100644 index 836f478..0000000 --- a/maps/placeholder/CaveMinecarts5.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/CaveMinecarts5.asm", ROMX - -CaveMinecarts5ScriptLoader:: - ret - -CaveMinecarts5TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/CaveMinecarts6.asm b/maps/placeholder/CaveMinecarts6.asm deleted file mode 100644 index 32dd57d..0000000 --- a/maps/placeholder/CaveMinecarts6.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/CaveMinecarts6.asm", ROMX - -CaveMinecarts6ScriptLoader:: - ret - -CaveMinecarts6TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/CaveMinecarts7.asm b/maps/placeholder/CaveMinecarts7.asm deleted file mode 100644 index c536912..0000000 --- a/maps/placeholder/CaveMinecarts7.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/CaveMinecarts7.asm", ROMX - -CaveMinecarts7ScriptLoader:: - ret - -CaveMinecarts7TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/Fonto.asm b/maps/placeholder/Fonto.asm deleted file mode 100644 index 29d0143..0000000 --- a/maps/placeholder/Fonto.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Fonto.asm", ROMX - -FontoScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/FontoHouse.asm b/maps/placeholder/FontoHouse.asm deleted file mode 100644 index d09827e..0000000 --- a/maps/placeholder/FontoHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoHouse.asm", ROMX - -FontoHouseScriptLoader:: - ret - -FontoHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/FontoLab.asm b/maps/placeholder/FontoLab.asm deleted file mode 100644 index 1ed547a..0000000 --- a/maps/placeholder/FontoLab.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoLab.asm", ROMX - -FontoLabScriptLoader:: - ret - -FontoLabTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/FontoMart.asm b/maps/placeholder/FontoMart.asm deleted file mode 100644 index 7438847..0000000 --- a/maps/placeholder/FontoMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoMart.asm", ROMX - -FontoMartScriptLoader:: - ret - -FontoMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/FontoPokecenter1F.asm b/maps/placeholder/FontoPokecenter1F.asm deleted file mode 100644 index d164e2c..0000000 --- a/maps/placeholder/FontoPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoPokecenter1F.asm", ROMX - -FontoPokecenter1FScriptLoader:: - ret - -FontoPokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/FontoPokecenter2F.asm b/maps/placeholder/FontoPokecenter2F.asm deleted file mode 100644 index 5ed4416..0000000 --- a/maps/placeholder/FontoPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoPokecenter2F.asm", ROMX - -FontoPokecenter2FScriptLoader:: - ret - -FontoPokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/FontoRocketHouse.asm b/maps/placeholder/FontoRocketHouse.asm deleted file mode 100644 index 3d66098..0000000 --- a/maps/placeholder/FontoRocketHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoRocketHouse.asm", ROMX - -FontoRocketHouseScriptLoader:: - ret - -FontoRocketHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/FontoRoute1.asm b/maps/placeholder/FontoRoute1.asm deleted file mode 100644 index aa12d5d..0000000 --- a/maps/placeholder/FontoRoute1.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoRoute1.asm", ROMX - -FontoRoute1ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/FontoRoute2.asm b/maps/placeholder/FontoRoute2.asm deleted file mode 100644 index 3acce58..0000000 --- a/maps/placeholder/FontoRoute2.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoRoute2.asm", ROMX - -FontoRoute2ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/FontoRoute3.asm b/maps/placeholder/FontoRoute3.asm deleted file mode 100644 index e609cbf..0000000 --- a/maps/placeholder/FontoRoute3.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoRoute3.asm", ROMX - -FontoRoute3ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/FontoRoute4.asm b/maps/placeholder/FontoRoute4.asm deleted file mode 100644 index a0f8eef..0000000 --- a/maps/placeholder/FontoRoute4.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoRoute4.asm", ROMX - -FontoRoute4ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/FontoRoute5.asm b/maps/placeholder/FontoRoute5.asm deleted file mode 100644 index 319bb5e..0000000 --- a/maps/placeholder/FontoRoute5.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoRoute5.asm", ROMX - -FontoRoute5ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/FontoRoute6.asm b/maps/placeholder/FontoRoute6.asm deleted file mode 100644 index ebe7575..0000000 --- a/maps/placeholder/FontoRoute6.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoRoute6.asm", ROMX - -FontoRoute6ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/FontoRouteGate1.asm b/maps/placeholder/FontoRouteGate1.asm deleted file mode 100644 index 0c812c9..0000000 --- a/maps/placeholder/FontoRouteGate1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoRouteGate1.asm", ROMX - -FontoRouteGate1ScriptLoader:: - ret - -FontoRouteGate1TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/FontoRouteGate2.asm b/maps/placeholder/FontoRouteGate2.asm deleted file mode 100644 index 42e4b33..0000000 --- a/maps/placeholder/FontoRouteGate2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoRouteGate2.asm", ROMX - -FontoRouteGate2ScriptLoader:: - ret - -FontoRouteGate2TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/FontoRouteGate3.asm b/maps/placeholder/FontoRouteGate3.asm deleted file mode 100644 index 06c58f9..0000000 --- a/maps/placeholder/FontoRouteGate3.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/FontoRouteGate3.asm", ROMX - -FontoRouteGate3ScriptLoader:: - ret - -FontoRouteGate3TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/Haiteku.asm b/maps/placeholder/Haiteku.asm deleted file mode 100644 index 7e050f2..0000000 --- a/maps/placeholder/Haiteku.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Haiteku.asm", ROMX - -HaitekuScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/HaitekuAquarium1F.asm b/maps/placeholder/HaitekuAquarium1F.asm deleted file mode 100644 index f97f03b..0000000 --- a/maps/placeholder/HaitekuAquarium1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuAquarium1F.asm", ROMX - -HaitekuAquarium1FScriptLoader:: - ret - -HaitekuAquarium1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuAquarium2F.asm b/maps/placeholder/HaitekuAquarium2F.asm deleted file mode 100644 index a3d01ae..0000000 --- a/maps/placeholder/HaitekuAquarium2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuAquarium2F.asm", ROMX - -HaitekuAquarium2FScriptLoader:: - ret - -HaitekuAquarium2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuHouse1.asm b/maps/placeholder/HaitekuHouse1.asm deleted file mode 100644 index 45a58fe..0000000 --- a/maps/placeholder/HaitekuHouse1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuHouse1.asm", ROMX - -HaitekuHouse1ScriptLoader:: - ret - -HaitekuHouse1TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuHouse2.asm b/maps/placeholder/HaitekuHouse2.asm deleted file mode 100644 index a51ceec..0000000 --- a/maps/placeholder/HaitekuHouse2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuHouse2.asm", ROMX - -HaitekuHouse2ScriptLoader:: - ret - -HaitekuHouse2TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuImposterOakHouse.asm b/maps/placeholder/HaitekuImposterOakHouse.asm deleted file mode 100644 index 856e827..0000000 --- a/maps/placeholder/HaitekuImposterOakHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuImposterOakHouse.asm", ROMX - -HaitekuImposterOakHouseScriptLoader:: - ret - -HaitekuImposterOakHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuLeague1F.asm b/maps/placeholder/HaitekuLeague1F.asm deleted file mode 100644 index a7f1787..0000000 --- a/maps/placeholder/HaitekuLeague1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuLeague1F.asm", ROMX - -HaitekuLeague1FScriptLoader:: - ret - -HaitekuLeague1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuLeague2F.asm b/maps/placeholder/HaitekuLeague2F.asm deleted file mode 100644 index 85acc1c..0000000 --- a/maps/placeholder/HaitekuLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuLeague2F.asm", ROMX - -HaitekuLeague2FScriptLoader:: - ret - -HaitekuLeague2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuMart.asm b/maps/placeholder/HaitekuMart.asm deleted file mode 100644 index 6591b58..0000000 --- a/maps/placeholder/HaitekuMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuMart.asm", ROMX - -HaitekuMartScriptLoader:: - ret - -HaitekuMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuPokecenter1F.asm b/maps/placeholder/HaitekuPokecenter1F.asm deleted file mode 100644 index 91408d3..0000000 --- a/maps/placeholder/HaitekuPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuPokecenter1F.asm", ROMX - -HaitekuPokecenter1FScriptLoader:: - ret - -HaitekuPokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuPokecenter2F.asm b/maps/placeholder/HaitekuPokecenter2F.asm deleted file mode 100644 index ea67d63..0000000 --- a/maps/placeholder/HaitekuPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuPokecenter2F.asm", ROMX - -HaitekuPokecenter2FScriptLoader:: - ret - -HaitekuPokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuWestRoute.asm b/maps/placeholder/HaitekuWestRoute.asm deleted file mode 100644 index 51ebdc5..0000000 --- a/maps/placeholder/HaitekuWestRoute.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuWestRoute.asm", ROMX - -HaitekuWestRouteScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/HaitekuWestRouteGate.asm b/maps/placeholder/HaitekuWestRouteGate.asm deleted file mode 100644 index 460f3a6..0000000 --- a/maps/placeholder/HaitekuWestRouteGate.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuWestRouteGate.asm", ROMX - -HaitekuWestRouteGateScriptLoader:: - ret - -HaitekuWestRouteGateTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/HaitekuWestRouteOcean.asm b/maps/placeholder/HaitekuWestRouteOcean.asm deleted file mode 100644 index ec4fff3..0000000 --- a/maps/placeholder/HaitekuWestRouteOcean.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/HaitekuWestRouteOcean.asm", ROMX - -HaitekuWestRouteOceanScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/Kanto.asm b/maps/placeholder/Kanto.asm deleted file mode 100644 index 90d57b6..0000000 --- a/maps/placeholder/Kanto.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Kanto.asm", ROMX - -KantoScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/KantoCeladonElevator.asm b/maps/placeholder/KantoCeladonElevator.asm deleted file mode 100644 index 3978310..0000000 --- a/maps/placeholder/KantoCeladonElevator.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoCeladonElevator.asm", ROMX - -KantoCeladonElevatorScriptLoader:: - ret - -KantoCeladonElevatorTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart1F.asm b/maps/placeholder/KantoCeladonMart1F.asm deleted file mode 100644 index fcba348..0000000 --- a/maps/placeholder/KantoCeladonMart1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoCeladonMart1F.asm", ROMX - -KantoCeladonMart1FScriptLoader:: - ret - -KantoCeladonMart1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart2F.asm b/maps/placeholder/KantoCeladonMart2F.asm deleted file mode 100644 index f540b05..0000000 --- a/maps/placeholder/KantoCeladonMart2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoCeladonMart2F.asm", ROMX - -KantoCeladonMart2FScriptLoader:: - ret - -KantoCeladonMart2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart3F.asm b/maps/placeholder/KantoCeladonMart3F.asm deleted file mode 100644 index 1576c0d..0000000 --- a/maps/placeholder/KantoCeladonMart3F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoCeladonMart3F.asm", ROMX - -KantoCeladonMart3FScriptLoader:: - ret - -KantoCeladonMart3FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart4F.asm b/maps/placeholder/KantoCeladonMart4F.asm deleted file mode 100644 index b26853e..0000000 --- a/maps/placeholder/KantoCeladonMart4F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoCeladonMart4F.asm", ROMX - -KantoCeladonMart4FScriptLoader:: - ret - -KantoCeladonMart4FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart5F.asm b/maps/placeholder/KantoCeladonMart5F.asm deleted file mode 100644 index fd3cf58..0000000 --- a/maps/placeholder/KantoCeladonMart5F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoCeladonMart5F.asm", ROMX - -KantoCeladonMart5FScriptLoader:: - ret - -KantoCeladonMart5FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoCeruleanHouse.asm b/maps/placeholder/KantoCeruleanHouse.asm deleted file mode 100644 index ac4db75..0000000 --- a/maps/placeholder/KantoCeruleanHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoCeruleanHouse.asm", ROMX - -KantoCeruleanHouseScriptLoader:: - ret - -KantoCeruleanHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoDiner.asm b/maps/placeholder/KantoDiner.asm deleted file mode 100644 index 573ef52..0000000 --- a/maps/placeholder/KantoDiner.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoDiner.asm", ROMX - -KantoDinerScriptLoader:: - ret - -KantoDinerTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoEastRoute.asm b/maps/placeholder/KantoEastRoute.asm deleted file mode 100644 index 370dbb3..0000000 --- a/maps/placeholder/KantoEastRoute.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoEastRoute.asm", ROMX - -KantoEastRouteScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/KantoEldersHouse.asm b/maps/placeholder/KantoEldersHouse.asm deleted file mode 100644 index 29fbbaf..0000000 --- a/maps/placeholder/KantoEldersHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoEldersHouse.asm", ROMX - -KantoEldersHouseScriptLoader:: - ret - -KantoEldersHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoFishingGuru.asm b/maps/placeholder/KantoFishingGuru.asm deleted file mode 100644 index a75885c..0000000 --- a/maps/placeholder/KantoFishingGuru.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoFishingGuru.asm", ROMX - -KantoFishingGuruScriptLoader:: - ret - -KantoFishingGuruTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoGameCorner.asm b/maps/placeholder/KantoGameCorner.asm deleted file mode 100644 index 23b2357..0000000 --- a/maps/placeholder/KantoGameCorner.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoGameCorner.asm", ROMX - -KantoGameCornerScriptLoader:: - ret - -KantoGameCornerTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoGameCornerPrizes.asm b/maps/placeholder/KantoGameCornerPrizes.asm deleted file mode 100644 index d4a580a..0000000 --- a/maps/placeholder/KantoGameCornerPrizes.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoGameCornerPrizes.asm", ROMX - -KantoGameCornerPrizesScriptLoader:: - ret - -KantoGameCornerPrizesTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ1.asm b/maps/placeholder/KantoGamefreakHQ1.asm deleted file mode 100644 index 329b6c0..0000000 --- a/maps/placeholder/KantoGamefreakHQ1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoGamefreakHQ1.asm", ROMX - -KantoGamefreakHQ1ScriptLoader:: - ret - -KantoGamefreakHQ1TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ2.asm b/maps/placeholder/KantoGamefreakHQ2.asm deleted file mode 100644 index 6f4617d..0000000 --- a/maps/placeholder/KantoGamefreakHQ2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoGamefreakHQ2.asm", ROMX - -KantoGamefreakHQ2ScriptLoader:: - ret - -KantoGamefreakHQ2TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ3.asm b/maps/placeholder/KantoGamefreakHQ3.asm deleted file mode 100644 index 2307240..0000000 --- a/maps/placeholder/KantoGamefreakHQ3.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoGamefreakHQ3.asm", ROMX - -KantoGamefreakHQ3ScriptLoader:: - ret - -KantoGamefreakHQ3TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ4.asm b/maps/placeholder/KantoGamefreakHQ4.asm deleted file mode 100644 index ff2b22e..0000000 --- a/maps/placeholder/KantoGamefreakHQ4.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoGamefreakHQ4.asm", ROMX - -KantoGamefreakHQ4ScriptLoader:: - ret - -KantoGamefreakHQ4TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ5.asm b/maps/placeholder/KantoGamefreakHQ5.asm deleted file mode 100644 index fc2e11e..0000000 --- a/maps/placeholder/KantoGamefreakHQ5.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoGamefreakHQ5.asm", ROMX - -KantoGamefreakHQ5ScriptLoader:: - ret - -KantoGamefreakHQ5TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoGreensHouse1F.asm b/maps/placeholder/KantoGreensHouse1F.asm deleted file mode 100644 index eaf5171..0000000 --- a/maps/placeholder/KantoGreensHouse1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoGreensHouse1F.asm", ROMX - -KantoGreensHouse1FScriptLoader:: - ret - -KantoGreensHouse1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoGreensHouse2F.asm b/maps/placeholder/KantoGreensHouse2F.asm deleted file mode 100644 index 67715fe..0000000 --- a/maps/placeholder/KantoGreensHouse2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoGreensHouse2F.asm", ROMX - -KantoGreensHouse2FScriptLoader:: - ret - -KantoGreensHouse2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoHospital.asm b/maps/placeholder/KantoHospital.asm deleted file mode 100644 index 9b8f8f4..0000000 --- a/maps/placeholder/KantoHospital.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoHospital.asm", ROMX - -KantoHospitalScriptLoader:: - ret - -KantoHospitalTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoLavenderHouse.asm b/maps/placeholder/KantoLavenderHouse.asm deleted file mode 100644 index c440b6e..0000000 --- a/maps/placeholder/KantoLavenderHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoLavenderHouse.asm", ROMX - -KantoLavenderHouseScriptLoader:: - ret - -KantoLavenderHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoLeague1F.asm b/maps/placeholder/KantoLeague1F.asm deleted file mode 100644 index 98208e4..0000000 --- a/maps/placeholder/KantoLeague1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoLeague1F.asm", ROMX - -KantoLeague1FScriptLoader:: - ret - -KantoLeague1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoLeague21F.asm b/maps/placeholder/KantoLeague21F.asm deleted file mode 100644 index 65d8379..0000000 --- a/maps/placeholder/KantoLeague21F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoLeague21F.asm", ROMX - -KantoLeague21FScriptLoader:: - ret - -KantoLeague21FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoLeague22F.asm b/maps/placeholder/KantoLeague22F.asm deleted file mode 100644 index 2b1ef47..0000000 --- a/maps/placeholder/KantoLeague22F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoLeague22F.asm", ROMX - -KantoLeague22FScriptLoader:: - ret - -KantoLeague22FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoLeague2F.asm b/maps/placeholder/KantoLeague2F.asm deleted file mode 100644 index ea2b121..0000000 --- a/maps/placeholder/KantoLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoLeague2F.asm", ROMX - -KantoLeague2FScriptLoader:: - ret - -KantoLeague2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoMart.asm b/maps/placeholder/KantoMart.asm deleted file mode 100644 index 8878e4a..0000000 --- a/maps/placeholder/KantoMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoMart.asm", ROMX - -KantoMartScriptLoader:: - ret - -KantoMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoOaksLab.asm b/maps/placeholder/KantoOaksLab.asm deleted file mode 100644 index a57ac46..0000000 --- a/maps/placeholder/KantoOaksLab.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoOaksLab.asm", ROMX - -KantoOaksLabScriptLoader:: - ret - -KantoOaksLabTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter1F.asm b/maps/placeholder/KantoPokecenter1F.asm deleted file mode 100644 index 58c73ef..0000000 --- a/maps/placeholder/KantoPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoPokecenter1F.asm", ROMX - -KantoPokecenter1FScriptLoader:: - ret - -KantoPokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter21F.asm b/maps/placeholder/KantoPokecenter21F.asm deleted file mode 100644 index 542cbe4..0000000 --- a/maps/placeholder/KantoPokecenter21F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoPokecenter21F.asm", ROMX - -KantoPokecenter21FScriptLoader:: - ret - -KantoPokecenter21FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter22F.asm b/maps/placeholder/KantoPokecenter22F.asm deleted file mode 100644 index d29357a..0000000 --- a/maps/placeholder/KantoPokecenter22F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoPokecenter22F.asm", ROMX - -KantoPokecenter22FScriptLoader:: - ret - -KantoPokecenter22FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter2F.asm b/maps/placeholder/KantoPokecenter2F.asm deleted file mode 100644 index 9800129..0000000 --- a/maps/placeholder/KantoPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoPokecenter2F.asm", ROMX - -KantoPokecenter2FScriptLoader:: - ret - -KantoPokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoRedsHouse.asm b/maps/placeholder/KantoRedsHouse.asm deleted file mode 100644 index 13c479c..0000000 --- a/maps/placeholder/KantoRedsHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoRedsHouse.asm", ROMX - -KantoRedsHouseScriptLoader:: - ret - -KantoRedsHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoSchool.asm b/maps/placeholder/KantoSchool.asm deleted file mode 100644 index 3477b1e..0000000 --- a/maps/placeholder/KantoSchool.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoSchool.asm", ROMX - -KantoSchoolScriptLoader:: - ret - -KantoSchoolTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoSilphCo.asm b/maps/placeholder/KantoSilphCo.asm deleted file mode 100644 index 3d19d1e..0000000 --- a/maps/placeholder/KantoSilphCo.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoSilphCo.asm", ROMX - -KantoSilphCoScriptLoader:: - ret - -KantoSilphCoTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoUnusedArea.asm b/maps/placeholder/KantoUnusedArea.asm deleted file mode 100644 index c69df11..0000000 --- a/maps/placeholder/KantoUnusedArea.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoUnusedArea.asm", ROMX - -KantoUnusedAreaScriptLoader:: - ret - -KantoUnusedAreaTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/KantoViridianHouse.asm b/maps/placeholder/KantoViridianHouse.asm deleted file mode 100644 index 381042d..0000000 --- a/maps/placeholder/KantoViridianHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/KantoViridianHouse.asm", ROMX - -KantoViridianHouseScriptLoader:: - ret - -KantoViridianHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/MtFuji.asm b/maps/placeholder/MtFuji.asm deleted file mode 100644 index adc354a..0000000 --- a/maps/placeholder/MtFuji.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/MtFuji.asm", ROMX - -MtFujiScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/MtFujiRoute.asm b/maps/placeholder/MtFujiRoute.asm deleted file mode 100644 index 2103337..0000000 --- a/maps/placeholder/MtFujiRoute.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/MtFujiRoute.asm", ROMX - -MtFujiRouteScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/Newtype.asm b/maps/placeholder/Newtype.asm deleted file mode 100644 index f13018d..0000000 --- a/maps/placeholder/Newtype.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Newtype.asm", ROMX - -NewtypeScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/NewtypeDiner.asm b/maps/placeholder/NewtypeDiner.asm deleted file mode 100644 index 783a718..0000000 --- a/maps/placeholder/NewtypeDiner.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeDiner.asm", ROMX - -NewtypeDinerScriptLoader:: - ret - -NewtypeDinerTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypeDojo.asm b/maps/placeholder/NewtypeDojo.asm deleted file mode 100644 index 6ce2743..0000000 --- a/maps/placeholder/NewtypeDojo.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeDojo.asm", ROMX - -NewtypeDojoScriptLoader:: - ret - -NewtypeDojoTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypeHouse1.asm b/maps/placeholder/NewtypeHouse1.asm deleted file mode 100644 index 4dc930f..0000000 --- a/maps/placeholder/NewtypeHouse1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeHouse1.asm", ROMX - -NewtypeHouse1ScriptLoader:: - ret - -NewtypeHouse1TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypeHouse2.asm b/maps/placeholder/NewtypeHouse2.asm deleted file mode 100644 index e348e28..0000000 --- a/maps/placeholder/NewtypeHouse2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeHouse2.asm", ROMX - -NewtypeHouse2ScriptLoader:: - ret - -NewtypeHouse2TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypeHouse3.asm b/maps/placeholder/NewtypeHouse3.asm deleted file mode 100644 index 1ac4b19..0000000 --- a/maps/placeholder/NewtypeHouse3.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeHouse3.asm", ROMX - -NewtypeHouse3ScriptLoader:: - ret - -NewtypeHouse3TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypeLeague1F.asm b/maps/placeholder/NewtypeLeague1F.asm deleted file mode 100644 index fc9bfa5..0000000 --- a/maps/placeholder/NewtypeLeague1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeLeague1F.asm", ROMX - -NewtypeLeague1FScriptLoader:: - ret - -NewtypeLeague1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypeLeague2F.asm b/maps/placeholder/NewtypeLeague2F.asm deleted file mode 100644 index 0fc1764..0000000 --- a/maps/placeholder/NewtypeLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeLeague2F.asm", ROMX - -NewtypeLeague2FScriptLoader:: - ret - -NewtypeLeague2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypeMart.asm b/maps/placeholder/NewtypeMart.asm deleted file mode 100644 index 00d7ab1..0000000 --- a/maps/placeholder/NewtypeMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeMart.asm", ROMX - -NewtypeMartScriptLoader:: - ret - -NewtypeMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypePokecenter1F.asm b/maps/placeholder/NewtypePokecenter1F.asm deleted file mode 100644 index 172a8dc..0000000 --- a/maps/placeholder/NewtypePokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypePokecenter1F.asm", ROMX - -NewtypePokecenter1FScriptLoader:: - ret - -NewtypePokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypePokecenter2F.asm b/maps/placeholder/NewtypePokecenter2F.asm deleted file mode 100644 index 50f8b74..0000000 --- a/maps/placeholder/NewtypePokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypePokecenter2F.asm", ROMX - -NewtypePokecenter2FScriptLoader:: - ret - -NewtypePokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypeRoute.asm b/maps/placeholder/NewtypeRoute.asm deleted file mode 100644 index 5e49dd4..0000000 --- a/maps/placeholder/NewtypeRoute.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeRoute.asm", ROMX - -NewtypeRouteScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/NewtypeRouteGate.asm b/maps/placeholder/NewtypeRouteGate.asm deleted file mode 100644 index 506003c..0000000 --- a/maps/placeholder/NewtypeRouteGate.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeRouteGate.asm", ROMX - -NewtypeRouteGateScriptLoader:: - ret - -NewtypeRouteGateTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NewtypeSailorHouse.asm b/maps/placeholder/NewtypeSailorHouse.asm deleted file mode 100644 index 25464fd..0000000 --- a/maps/placeholder/NewtypeSailorHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NewtypeSailorHouse.asm", ROMX - -NewtypeSailorHouseScriptLoader:: - ret - -NewtypeSailorHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/North.asm b/maps/placeholder/North.asm deleted file mode 100644 index 6ed8795..0000000 --- a/maps/placeholder/North.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/North.asm", ROMX - -NorthScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/NorthHouse1.asm b/maps/placeholder/NorthHouse1.asm deleted file mode 100644 index 5533904..0000000 --- a/maps/placeholder/NorthHouse1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NorthHouse1.asm", ROMX - -NorthHouse1ScriptLoader:: - ret - -NorthHouse1TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NorthHouse2.asm b/maps/placeholder/NorthHouse2.asm deleted file mode 100644 index de016ba..0000000 --- a/maps/placeholder/NorthHouse2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NorthHouse2.asm", ROMX - -NorthHouse2ScriptLoader:: - ret - -NorthHouse2TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NorthMart.asm b/maps/placeholder/NorthMart.asm deleted file mode 100644 index 383c905..0000000 --- a/maps/placeholder/NorthMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NorthMart.asm", ROMX - -NorthMartScriptLoader:: - ret - -NorthMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NorthPokecenter1F.asm b/maps/placeholder/NorthPokecenter1F.asm deleted file mode 100644 index d8352a5..0000000 --- a/maps/placeholder/NorthPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NorthPokecenter1F.asm", ROMX - -NorthPokecenter1FScriptLoader:: - ret - -NorthPokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/NorthPokecenter2F.asm b/maps/placeholder/NorthPokecenter2F.asm deleted file mode 100644 index 968a288..0000000 --- a/maps/placeholder/NorthPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/NorthPokecenter2F.asm", ROMX - -NorthPokecenter2FScriptLoader:: - ret - -NorthPokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/Office1.asm b/maps/placeholder/Office1.asm deleted file mode 100644 index 2ff6830..0000000 --- a/maps/placeholder/Office1.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Office1.asm", ROMX - -Office1ScriptLoader:: - ret - -Office1TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/Office2.asm b/maps/placeholder/Office2.asm deleted file mode 100644 index 59cc8e3..0000000 --- a/maps/placeholder/Office2.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Office2.asm", ROMX - -Office2ScriptLoader:: - ret - -Office2TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/Office3.asm b/maps/placeholder/Office3.asm deleted file mode 100644 index 62a014e..0000000 --- a/maps/placeholder/Office3.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Office3.asm", ROMX - -Office3ScriptLoader:: - ret - -Office3TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/OldCity.asm b/maps/placeholder/OldCity.asm deleted file mode 100644 index dfe8f1d..0000000 --- a/maps/placeholder/OldCity.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCity.asm", ROMX - -OldCityScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/OldCityBillsHouse.asm b/maps/placeholder/OldCityBillsHouse.asm deleted file mode 100644 index 61d4b41..0000000 --- a/maps/placeholder/OldCityBillsHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityBillsHouse.asm", ROMX - -OldCityBillsHouseScriptLoader:: - ret - -OldCityBillsHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityGym.asm b/maps/placeholder/OldCityGym.asm deleted file mode 100644 index d34f8a5..0000000 --- a/maps/placeholder/OldCityGym.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityGym.asm", ROMX - -OldCityGymScriptLoader:: - ret - -OldCityGymTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityHouse.asm b/maps/placeholder/OldCityHouse.asm deleted file mode 100644 index d723f61..0000000 --- a/maps/placeholder/OldCityHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityHouse.asm", ROMX - -OldCityHouseScriptLoader:: - ret - -OldCityHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityKurtsHouse.asm b/maps/placeholder/OldCityKurtsHouse.asm deleted file mode 100644 index 0609384..0000000 --- a/maps/placeholder/OldCityKurtsHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityKurtsHouse.asm", ROMX - -OldCityKurtsHouseScriptLoader:: - ret - -OldCityKurtsHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityMart.asm b/maps/placeholder/OldCityMart.asm deleted file mode 100644 index 3472f8b..0000000 --- a/maps/placeholder/OldCityMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityMart.asm", ROMX - -OldCityMartScriptLoader:: - ret - -OldCityMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityMuseum.asm b/maps/placeholder/OldCityMuseum.asm deleted file mode 100644 index e4222ff..0000000 --- a/maps/placeholder/OldCityMuseum.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityMuseum.asm", ROMX - -OldCityMuseumScriptLoader:: - ret - -OldCityMuseumTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityPokecenter1F.asm b/maps/placeholder/OldCityPokecenter1F.asm deleted file mode 100644 index 541b975..0000000 --- a/maps/placeholder/OldCityPokecenter1F.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityPokecenter1F.asm", ROMX - -OldCityPokecenter1FScriptLoader:: - ret - -OldCityPokecenter1FTextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/OldCitySchool.asm b/maps/placeholder/OldCitySchool.asm deleted file mode 100644 index dc6bae1..0000000 --- a/maps/placeholder/OldCitySchool.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCitySchool.asm", ROMX - -OldCitySchoolScriptLoader:: - ret - -OldCitySchoolTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityTower1F.asm b/maps/placeholder/OldCityTower1F.asm deleted file mode 100644 index 2c149ab..0000000 --- a/maps/placeholder/OldCityTower1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityTower1F.asm", ROMX - -OldCityTower1FScriptLoader:: - ret - -OldCityTower1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityTower2F.asm b/maps/placeholder/OldCityTower2F.asm deleted file mode 100644 index c18dc79..0000000 --- a/maps/placeholder/OldCityTower2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityTower2F.asm", ROMX - -OldCityTower2FScriptLoader:: - ret - -OldCityTower2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityTower3F.asm b/maps/placeholder/OldCityTower3F.asm deleted file mode 100644 index 4045ed1..0000000 --- a/maps/placeholder/OldCityTower3F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityTower3F.asm", ROMX - -OldCityTower3FScriptLoader:: - ret - -OldCityTower3FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityTower4F.asm b/maps/placeholder/OldCityTower4F.asm deleted file mode 100644 index 4419576..0000000 --- a/maps/placeholder/OldCityTower4F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityTower4F.asm", ROMX - -OldCityTower4FScriptLoader:: - ret - -OldCityTower4FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/OldCityTower5F.asm b/maps/placeholder/OldCityTower5F.asm deleted file mode 100644 index dc682dc..0000000 --- a/maps/placeholder/OldCityTower5F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/OldCityTower5F.asm", ROMX - -OldCityTower5FScriptLoader:: - ret - -OldCityTower5FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/PowerPlant1.asm b/maps/placeholder/PowerPlant1.asm deleted file mode 100644 index 5ce600c..0000000 --- a/maps/placeholder/PowerPlant1.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/PowerPlant1.asm", ROMX - -PowerPlant1ScriptLoader:: - ret - -PowerPlant1TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/PowerPlant2.asm b/maps/placeholder/PowerPlant2.asm deleted file mode 100644 index d3df908..0000000 --- a/maps/placeholder/PowerPlant2.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/PowerPlant2.asm", ROMX - -PowerPlant2ScriptLoader:: - ret - -PowerPlant2TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/PowerPlant3.asm b/maps/placeholder/PowerPlant3.asm deleted file mode 100644 index 9b0b2c9..0000000 --- a/maps/placeholder/PowerPlant3.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/PowerPlant3.asm", ROMX - -PowerPlant3ScriptLoader:: - ret - -PowerPlant3TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/PowerPlant4.asm b/maps/placeholder/PowerPlant4.asm deleted file mode 100644 index 694d930..0000000 --- a/maps/placeholder/PowerPlant4.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/PowerPlant4.asm", ROMX - -PowerPlant4ScriptLoader:: - ret - -PowerPlant4TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/Prince.asm b/maps/placeholder/Prince.asm deleted file mode 100644 index 6992faf..0000000 --- a/maps/placeholder/Prince.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Prince.asm", ROMX - -PrinceScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/PrinceRoute.asm b/maps/placeholder/PrinceRoute.asm deleted file mode 100644 index 6bc474a..0000000 --- a/maps/placeholder/PrinceRoute.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/PrinceRoute.asm", ROMX - -PrinceRouteScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/Route15.asm b/maps/placeholder/Route15.asm deleted file mode 100644 index dcd7f79..0000000 --- a/maps/placeholder/Route15.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Route15.asm", ROMX - -Route15ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/Route15Pokecenter1F.asm b/maps/placeholder/Route15Pokecenter1F.asm deleted file mode 100644 index 5937ecd..0000000 --- a/maps/placeholder/Route15Pokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Route15Pokecenter1F.asm", ROMX - -Route15Pokecenter1FScriptLoader:: - ret - -Route15Pokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/Route15Pokecenter2F.asm b/maps/placeholder/Route15Pokecenter2F.asm deleted file mode 100644 index 5fca638..0000000 --- a/maps/placeholder/Route15Pokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Route15Pokecenter2F.asm", ROMX - -Route15Pokecenter2FScriptLoader:: - ret - -Route15Pokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/Route18.asm b/maps/placeholder/Route18.asm deleted file mode 100644 index aed82e5..0000000 --- a/maps/placeholder/Route18.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Route18.asm", ROMX - -Route18ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/Route18Pokecenter1F.asm b/maps/placeholder/Route18Pokecenter1F.asm deleted file mode 100644 index 667ba35..0000000 --- a/maps/placeholder/Route18Pokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Route18Pokecenter1F.asm", ROMX - -Route18Pokecenter1FScriptLoader:: - ret - -Route18Pokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/Route18Pokecenter2F.asm b/maps/placeholder/Route18Pokecenter2F.asm deleted file mode 100644 index 8194fa3..0000000 --- a/maps/placeholder/Route18Pokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Route18Pokecenter2F.asm", ROMX - -Route18Pokecenter2FScriptLoader:: - ret - -Route18Pokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/Route2.asm b/maps/placeholder/Route2.asm deleted file mode 100644 index 50fecb6..0000000 --- a/maps/placeholder/Route2.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Route2.asm", ROMX - -Route2ScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/Route2Gate1F.asm b/maps/placeholder/Route2Gate1F.asm deleted file mode 100644 index cd878e3..0000000 --- a/maps/placeholder/Route2Gate1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Route2Gate1F.asm", ROMX - -Route2Gate1FScriptLoader:: - ret - -Route2Gate1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/Route2Gate2F.asm b/maps/placeholder/Route2Gate2F.asm deleted file mode 100644 index 08fe259..0000000 --- a/maps/placeholder/Route2Gate2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Route2Gate2F.asm", ROMX - -Route2Gate2FScriptLoader:: - ret - -Route2Gate2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/Route2House.asm b/maps/placeholder/Route2House.asm deleted file mode 100644 index 447aa1b..0000000 --- a/maps/placeholder/Route2House.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Route2House.asm", ROMX - -Route2HouseScriptLoader:: - ret - -Route2HouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/RouteSilentEast.asm b/maps/placeholder/RouteSilentEast.asm deleted file mode 100644 index 0619bb3..0000000 --- a/maps/placeholder/RouteSilentEast.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/RouteSilentEast.asm", ROMX - -RouteSilentEastScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/RouteSilentEastGate.asm b/maps/placeholder/RouteSilentEastGate.asm deleted file mode 100644 index 7b08936..0000000 --- a/maps/placeholder/RouteSilentEastGate.asm +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/RouteSilentEastGate.asm", ROMX - -RouteSilentEastGateScriptLoader:: - ret - -RouteSilentEastGateTextPointers:: - db "@" diff --git a/maps/placeholder/RuinsOfAlphEntrance.asm b/maps/placeholder/RuinsOfAlphEntrance.asm deleted file mode 100644 index c8f0262..0000000 --- a/maps/placeholder/RuinsOfAlphEntrance.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/RuinsOfAlphEntrance.asm", ROMX - -RuinsOfAlphEntranceScriptLoader:: - ret - -RuinsOfAlphEntranceTextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/RuinsOfAlphMain.asm b/maps/placeholder/RuinsOfAlphMain.asm deleted file mode 100644 index fc2ec97..0000000 --- a/maps/placeholder/RuinsOfAlphMain.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/RuinsOfAlphMain.asm", ROMX - -RuinsOfAlphMainScriptLoader:: - ret - -RuinsOfAlphMainTextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/SlowpokeWellEntrance.asm b/maps/placeholder/SlowpokeWellEntrance.asm deleted file mode 100644 index 2cec405..0000000 --- a/maps/placeholder/SlowpokeWellEntrance.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SlowpokeWellEntrance.asm", ROMX - -SlowpokeWellEntranceScriptLoader:: - ret - -SlowpokeWellEntranceTextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/SlowpokeWellMain.asm b/maps/placeholder/SlowpokeWellMain.asm deleted file mode 100644 index c660806..0000000 --- a/maps/placeholder/SlowpokeWellMain.asm +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SlowpokeWellMain.asm", ROMX - -SlowpokeWellMainScriptLoader:: - ret - -SlowpokeWellMainTextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/maps/placeholder/South.asm b/maps/placeholder/South.asm deleted file mode 100644 index b10b4d6..0000000 --- a/maps/placeholder/South.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/South.asm", ROMX - -SouthScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/SouthHouse1.asm b/maps/placeholder/SouthHouse1.asm deleted file mode 100644 index 28b1fc5..0000000 --- a/maps/placeholder/SouthHouse1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SouthHouse1.asm", ROMX - -SouthHouse1ScriptLoader:: - ret - -SouthHouse1TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/SouthHouse2.asm b/maps/placeholder/SouthHouse2.asm deleted file mode 100644 index d61d59f..0000000 --- a/maps/placeholder/SouthHouse2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SouthHouse2.asm", ROMX - -SouthHouse2ScriptLoader:: - ret - -SouthHouse2TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/SouthMart.asm b/maps/placeholder/SouthMart.asm deleted file mode 100644 index 0f291e3..0000000 --- a/maps/placeholder/SouthMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SouthMart.asm", ROMX - -SouthMartScriptLoader:: - ret - -SouthMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/SouthPokecenter1F.asm b/maps/placeholder/SouthPokecenter1F.asm deleted file mode 100644 index 1d00af3..0000000 --- a/maps/placeholder/SouthPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SouthPokecenter1F.asm", ROMX - -SouthPokecenter1FScriptLoader:: - ret - -SouthPokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/SouthPokecenter2F.asm b/maps/placeholder/SouthPokecenter2F.asm deleted file mode 100644 index 0f70709..0000000 --- a/maps/placeholder/SouthPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SouthPokecenter2F.asm", ROMX - -SouthPokecenter2FScriptLoader:: - ret - -SouthPokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/Stand.asm b/maps/placeholder/Stand.asm deleted file mode 100644 index 35e23fb..0000000 --- a/maps/placeholder/Stand.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Stand.asm", ROMX - -StandScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/StandHouse.asm b/maps/placeholder/StandHouse.asm deleted file mode 100644 index 0935bed..0000000 --- a/maps/placeholder/StandHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandHouse.asm", ROMX - -StandHouseScriptLoader:: - ret - -StandHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/StandLab.asm b/maps/placeholder/StandLab.asm deleted file mode 100644 index 757d33f..0000000 --- a/maps/placeholder/StandLab.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandLab.asm", ROMX - -StandLabScriptLoader:: - ret - -StandLabTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/StandLeague1F.asm b/maps/placeholder/StandLeague1F.asm deleted file mode 100644 index 1ca2713..0000000 --- a/maps/placeholder/StandLeague1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandLeague1F.asm", ROMX - -StandLeague1FScriptLoader:: - ret - -StandLeague1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/StandLeague2F.asm b/maps/placeholder/StandLeague2F.asm deleted file mode 100644 index a361c1a..0000000 --- a/maps/placeholder/StandLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandLeague2F.asm", ROMX - -StandLeague2FScriptLoader:: - ret - -StandLeague2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/StandMart.asm b/maps/placeholder/StandMart.asm deleted file mode 100644 index 3e56cf0..0000000 --- a/maps/placeholder/StandMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandMart.asm", ROMX - -StandMartScriptLoader:: - ret - -StandMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/StandOffice.asm b/maps/placeholder/StandOffice.asm deleted file mode 100644 index fa7f28f..0000000 --- a/maps/placeholder/StandOffice.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandOffice.asm", ROMX - -StandOfficeScriptLoader:: - ret - -StandOfficeTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/StandPokecenter1F.asm b/maps/placeholder/StandPokecenter1F.asm deleted file mode 100644 index ea0e71b..0000000 --- a/maps/placeholder/StandPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandPokecenter1F.asm", ROMX - -StandPokecenter1FScriptLoader:: - ret - -StandPokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/StandPokecenter2F.asm b/maps/placeholder/StandPokecenter2F.asm deleted file mode 100644 index 9914a00..0000000 --- a/maps/placeholder/StandPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandPokecenter2F.asm", ROMX - -StandPokecenter2FScriptLoader:: - ret - -StandPokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/StandRocketHouse1F.asm b/maps/placeholder/StandRocketHouse1F.asm deleted file mode 100644 index c8463ab..0000000 --- a/maps/placeholder/StandRocketHouse1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandRocketHouse1F.asm", ROMX - -StandRocketHouse1FScriptLoader:: - ret - -StandRocketHouse1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/StandRocketHouse2F.asm b/maps/placeholder/StandRocketHouse2F.asm deleted file mode 100644 index 65e7163..0000000 --- a/maps/placeholder/StandRocketHouse2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandRocketHouse2F.asm", ROMX - -StandRocketHouse2FScriptLoader:: - ret - -StandRocketHouse2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/StandRoute.asm b/maps/placeholder/StandRoute.asm deleted file mode 100644 index 1bee368..0000000 --- a/maps/placeholder/StandRoute.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandRoute.asm", ROMX - -StandRouteScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/StandRouteGateKanto.asm b/maps/placeholder/StandRouteGateKanto.asm deleted file mode 100644 index 2458e38..0000000 --- a/maps/placeholder/StandRouteGateKanto.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/StandRouteGateKanto.asm", ROMX - -StandRouteGateKantoScriptLoader:: - ret - -StandRouteGateKantoTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/Sugar.asm b/maps/placeholder/Sugar.asm deleted file mode 100644 index d191b39..0000000 --- a/maps/placeholder/Sugar.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/Sugar.asm", ROMX - -SugarScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/SugarHouse.asm b/maps/placeholder/SugarHouse.asm deleted file mode 100644 index d85a5ad..0000000 --- a/maps/placeholder/SugarHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SugarHouse.asm", ROMX - -SugarHouseScriptLoader:: - ret - -SugarHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/SugarHouse2.asm b/maps/placeholder/SugarHouse2.asm deleted file mode 100644 index b6cfde5..0000000 --- a/maps/placeholder/SugarHouse2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SugarHouse2.asm", ROMX - -SugarHouse2ScriptLoader:: - ret - -SugarHouse2TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/SugarMart.asm b/maps/placeholder/SugarMart.asm deleted file mode 100644 index 8e78179..0000000 --- a/maps/placeholder/SugarMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SugarMart.asm", ROMX - -SugarMartScriptLoader:: - ret - -SugarMartTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/SugarPokecenter1F.asm b/maps/placeholder/SugarPokecenter1F.asm deleted file mode 100644 index 0e84e9b..0000000 --- a/maps/placeholder/SugarPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SugarPokecenter1F.asm", ROMX - -SugarPokecenter1FScriptLoader:: - ret - -SugarPokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/SugarPokecenter2F.asm b/maps/placeholder/SugarPokecenter2F.asm deleted file mode 100644 index 56af19e..0000000 --- a/maps/placeholder/SugarPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SugarPokecenter2F.asm", ROMX - -SugarPokecenter2FScriptLoader:: - ret - -SugarPokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/SugarRoute.asm b/maps/placeholder/SugarRoute.asm deleted file mode 100644 index 4263c39..0000000 --- a/maps/placeholder/SugarRoute.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SugarRoute.asm", ROMX - -SugarRouteScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/SugarRouteGate.asm b/maps/placeholder/SugarRouteGate.asm deleted file mode 100644 index b2c5ac1..0000000 --- a/maps/placeholder/SugarRouteGate.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/SugarRouteGate.asm", ROMX - -SugarRouteGateScriptLoader:: - ret - -SugarRouteGateTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/West.asm b/maps/placeholder/West.asm deleted file mode 100644 index 3e68abb..0000000 --- a/maps/placeholder/West.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/West.asm", ROMX - -WestScriptLoader:: - ret - - db "@" diff --git a/maps/placeholder/WestGym.asm b/maps/placeholder/WestGym.asm deleted file mode 100644 index 9304b95..0000000 --- a/maps/placeholder/WestGym.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestGym.asm", ROMX - -WestGymScriptLoader:: - ret - -WestGymTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestHouse1.asm b/maps/placeholder/WestHouse1.asm deleted file mode 100644 index 51076bb..0000000 --- a/maps/placeholder/WestHouse1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestHouse1.asm", ROMX - -WestHouse1ScriptLoader:: - ret - -WestHouse1TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestHouse2.asm b/maps/placeholder/WestHouse2.asm deleted file mode 100644 index ec744e0..0000000 --- a/maps/placeholder/WestHouse2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestHouse2.asm", ROMX - -WestHouse2ScriptLoader:: - ret - -WestHouse2TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestMart1F.asm b/maps/placeholder/WestMart1F.asm deleted file mode 100644 index 67bdecc..0000000 --- a/maps/placeholder/WestMart1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestMart1F.asm", ROMX - -WestMart1FScriptLoader:: - ret - -WestMart1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestMart2F.asm b/maps/placeholder/WestMart2F.asm deleted file mode 100644 index 1b3f4f2..0000000 --- a/maps/placeholder/WestMart2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestMart2F.asm", ROMX - -WestMart2FScriptLoader:: - ret - -WestMart2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestMart3F.asm b/maps/placeholder/WestMart3F.asm deleted file mode 100644 index 59c9db0..0000000 --- a/maps/placeholder/WestMart3F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestMart3F.asm", ROMX - -WestMart3FScriptLoader:: - ret - -WestMart3FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestMart4F.asm b/maps/placeholder/WestMart4F.asm deleted file mode 100644 index 774c4bc..0000000 --- a/maps/placeholder/WestMart4F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestMart4F.asm", ROMX - -WestMart4FScriptLoader:: - ret - -WestMart4FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestMart5F.asm b/maps/placeholder/WestMart5F.asm deleted file mode 100644 index dd7ef9d..0000000 --- a/maps/placeholder/WestMart5F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestMart5F.asm", ROMX - -WestMart5FScriptLoader:: - ret - -WestMart5FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestMart6F.asm b/maps/placeholder/WestMart6F.asm deleted file mode 100644 index 639cdee..0000000 --- a/maps/placeholder/WestMart6F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestMart6F.asm", ROMX - -WestMart6FScriptLoader:: - ret - -WestMart6FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestMartElevator.asm b/maps/placeholder/WestMartElevator.asm deleted file mode 100644 index 934b0ab..0000000 --- a/maps/placeholder/WestMartElevator.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestMartElevator.asm", ROMX - -WestMartElevatorScriptLoader:: - ret - -WestMartElevatorTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestPokecenter1F.asm b/maps/placeholder/WestPokecenter1F.asm deleted file mode 100644 index 73d450c..0000000 --- a/maps/placeholder/WestPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestPokecenter1F.asm", ROMX - -WestPokecenter1FScriptLoader:: - ret - -WestPokecenter1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestPokecenter2F.asm b/maps/placeholder/WestPokecenter2F.asm deleted file mode 100644 index 4e75832..0000000 --- a/maps/placeholder/WestPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestPokecenter2F.asm", ROMX - -WestPokecenter2FScriptLoader:: - ret - -WestPokecenter2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower1F.asm b/maps/placeholder/WestRadioTower1F.asm deleted file mode 100644 index f5c8f44..0000000 --- a/maps/placeholder/WestRadioTower1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestRadioTower1F.asm", ROMX - -WestRadioTower1FScriptLoader:: - ret - -WestRadioTower1FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower2F.asm b/maps/placeholder/WestRadioTower2F.asm deleted file mode 100644 index 033e158..0000000 --- a/maps/placeholder/WestRadioTower2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestRadioTower2F.asm", ROMX - -WestRadioTower2FScriptLoader:: - ret - -WestRadioTower2FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower3F.asm b/maps/placeholder/WestRadioTower3F.asm deleted file mode 100644 index fb10e52..0000000 --- a/maps/placeholder/WestRadioTower3F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestRadioTower3F.asm", ROMX - -WestRadioTower3FScriptLoader:: - ret - -WestRadioTower3FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower4F.asm b/maps/placeholder/WestRadioTower4F.asm deleted file mode 100644 index 19bb085..0000000 --- a/maps/placeholder/WestRadioTower4F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestRadioTower4F.asm", ROMX - -WestRadioTower4FScriptLoader:: - ret - -WestRadioTower4FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower5F.asm b/maps/placeholder/WestRadioTower5F.asm deleted file mode 100644 index 09f8cc7..0000000 --- a/maps/placeholder/WestRadioTower5F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestRadioTower5F.asm", ROMX - -WestRadioTower5FScriptLoader:: - ret - -WestRadioTower5FTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/WestRocketRaidedHouse.asm b/maps/placeholder/WestRocketRaidedHouse.asm deleted file mode 100644 index 06f2ec2..0000000 --- a/maps/placeholder/WestRocketRaidedHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/WestRocketRaidedHouse.asm", ROMX - -WestRocketRaidedHouseScriptLoader:: - ret - -WestRocketRaidedHouseTextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/maps/placeholder/dummy_text_pointers.asm b/maps/placeholder/dummy_text_pointers.asm deleted file mode 100644 index 8bb7734..0000000 --- a/maps/placeholder/dummy_text_pointers.asm +++ /dev/null @@ -1,51 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "maps/placeholder/dummy_text_pointers.asm", ROMX -OldCityTextPointers:: -WestTextPointers:: -HaitekuTextPointers:: -FontoTextPointers:: -BaadonTextPointers:: -NewtypeTextPointers:: -SugarTextPointers:: -BullForestTextPointers:: -StandTextPointers:: -KantoTextPointers:: -PrinceTextPointers:: -MtFujiTextPointers:: -SouthTextPointers:: -NorthTextPointers:: -Route2TextPointers:: -HaitekuWestRouteTextPointers:: -HaitekuWestRouteOceanTextPointers:: -FontoRoute1TextPointers:: -FontoRoute6TextPointers:: -FontoRoute2TextPointers:: -FontoRoute4TextPointers:: -FontoRoute3TextPointers:: -BaadonRoute1TextPointers:: -BaadonRoute2TextPointers:: -BaadonRoute3TextPointers:: -Route15TextPointers:: -NewtypeRouteTextPointers:: -Route18TextPointers:: -BullForestRoute1TextPointers:: -SugarRouteTextPointers:: -BullForestRoute2TextPointers:: -StandRouteTextPointers:: -KantoEastRouteTextPointers:: -RouteSilentEastTextPointers:: -PrinceRouteTextPointers:: -MtFujiRouteTextPointers:: -FontoRoute5TextPointers:: -BullForestRoute3TextPointers:: - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText - dw GameplayText diff --git a/scripts/Baadon.asm b/scripts/Baadon.asm new file mode 100644 index 0000000..8736f03 --- /dev/null +++ b/scripts/Baadon.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Baadon.asm", ROMX + +BaadonScriptLoader:: + ret + + db "@" diff --git a/scripts/BaadonHouse1.asm b/scripts/BaadonHouse1.asm new file mode 100644 index 0000000..bf37347 --- /dev/null +++ b/scripts/BaadonHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonHouse1.asm", ROMX + +BaadonHouse1ScriptLoader:: + ret + +BaadonHouse1TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BaadonHouse2.asm b/scripts/BaadonHouse2.asm new file mode 100644 index 0000000..5107f8e --- /dev/null +++ b/scripts/BaadonHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonHouse2.asm", ROMX + +BaadonHouse2ScriptLoader:: + ret + +BaadonHouse2TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BaadonLeague1F.asm b/scripts/BaadonLeague1F.asm new file mode 100644 index 0000000..085ae7d --- /dev/null +++ b/scripts/BaadonLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonLeague1F.asm", ROMX + +BaadonLeague1FScriptLoader:: + ret + +BaadonLeague1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BaadonLeague2F.asm b/scripts/BaadonLeague2F.asm new file mode 100644 index 0000000..d706109 --- /dev/null +++ b/scripts/BaadonLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonLeague2F.asm", ROMX + +BaadonLeague2FScriptLoader:: + ret + +BaadonLeague2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BaadonMart.asm b/scripts/BaadonMart.asm new file mode 100644 index 0000000..521b91b --- /dev/null +++ b/scripts/BaadonMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonMart.asm", ROMX + +BaadonMartScriptLoader:: + ret + +BaadonMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BaadonPokecenter1F.asm b/scripts/BaadonPokecenter1F.asm new file mode 100644 index 0000000..c78966f --- /dev/null +++ b/scripts/BaadonPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonPokecenter1F.asm", ROMX + +BaadonPokecenter1FScriptLoader:: + ret + +BaadonPokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BaadonPokecenter2F.asm b/scripts/BaadonPokecenter2F.asm new file mode 100644 index 0000000..3b4d467 --- /dev/null +++ b/scripts/BaadonPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonPokecenter2F.asm", ROMX + +BaadonPokecenter2FScriptLoader:: + ret + +BaadonPokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BaadonRoute1.asm b/scripts/BaadonRoute1.asm new file mode 100644 index 0000000..3a94f6c --- /dev/null +++ b/scripts/BaadonRoute1.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonRoute1.asm", ROMX + +BaadonRoute1ScriptLoader:: + ret + + db "@" diff --git a/scripts/BaadonRoute2.asm b/scripts/BaadonRoute2.asm new file mode 100644 index 0000000..05f44a9 --- /dev/null +++ b/scripts/BaadonRoute2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonRoute2.asm", ROMX + +BaadonRoute2ScriptLoader:: + ret + + db "@" diff --git a/scripts/BaadonRoute3.asm b/scripts/BaadonRoute3.asm new file mode 100644 index 0000000..4f7bcbc --- /dev/null +++ b/scripts/BaadonRoute3.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonRoute3.asm", ROMX + +BaadonRoute3ScriptLoader:: + ret + + db "@" diff --git a/scripts/BaadonRouteGateNewtype.asm b/scripts/BaadonRouteGateNewtype.asm new file mode 100644 index 0000000..d3e95af --- /dev/null +++ b/scripts/BaadonRouteGateNewtype.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonRouteGateNewtype.asm", ROMX + +BaadonRouteGateNewtypeScriptLoader:: + ret + +BaadonRouteGateNewtypeTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BaadonRouteGateWest.asm b/scripts/BaadonRouteGateWest.asm new file mode 100644 index 0000000..3577294 --- /dev/null +++ b/scripts/BaadonRouteGateWest.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonRouteGateWest.asm", ROMX + +BaadonRouteGateWestScriptLoader:: + ret + +BaadonRouteGateWestTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BaadonWallpaperHouse.asm b/scripts/BaadonWallpaperHouse.asm new file mode 100644 index 0000000..1f035f6 --- /dev/null +++ b/scripts/BaadonWallpaperHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BaadonWallpaperHouse.asm", ROMX + +BaadonWallpaperHouseScriptLoader:: + ret + +BaadonWallpaperHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullForest.asm b/scripts/BullForest.asm new file mode 100644 index 0000000..a3f4852 --- /dev/null +++ b/scripts/BullForest.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullForest.asm", ROMX + +BullForestScriptLoader:: + ret + + db "@" diff --git a/scripts/BullForestRoute1.asm b/scripts/BullForestRoute1.asm new file mode 100644 index 0000000..b4ed18d --- /dev/null +++ b/scripts/BullForestRoute1.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullForestRoute1.asm", ROMX + +BullForestRoute1ScriptLoader:: + ret + + db "@" diff --git a/scripts/BullForestRoute1House.asm b/scripts/BullForestRoute1House.asm new file mode 100644 index 0000000..3e16c4a --- /dev/null +++ b/scripts/BullForestRoute1House.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullForestRoute1House.asm", ROMX + +BullForestRoute1HouseScriptLoader:: + ret + +BullForestRoute1HouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullForestRoute2.asm b/scripts/BullForestRoute2.asm new file mode 100644 index 0000000..815c061 --- /dev/null +++ b/scripts/BullForestRoute2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullForestRoute2.asm", ROMX + +BullForestRoute2ScriptLoader:: + ret + + db "@" diff --git a/scripts/BullForestRoute3.asm b/scripts/BullForestRoute3.asm new file mode 100644 index 0000000..1724253 --- /dev/null +++ b/scripts/BullForestRoute3.asm @@ -0,0 +1,10 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullForestRoute3.asm", ROMX + +BullForestRoute3ScriptLoader:: + ret + + db "@" + + ret diff --git a/scripts/BullForestRouteGateStand.asm b/scripts/BullForestRouteGateStand.asm new file mode 100644 index 0000000..84b580b --- /dev/null +++ b/scripts/BullForestRouteGateStand.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullForestRouteGateStand.asm", ROMX + +BullForestRouteGateStandScriptLoader:: + ret + +BullForestRouteGateStandTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullHouse1.asm b/scripts/BullHouse1.asm new file mode 100644 index 0000000..281c978 --- /dev/null +++ b/scripts/BullHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullHouse1.asm", ROMX + +BullHouse1ScriptLoader:: + ret + +BullHouse1TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullHouse2.asm b/scripts/BullHouse2.asm new file mode 100644 index 0000000..1e76ee4 --- /dev/null +++ b/scripts/BullHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullHouse2.asm", ROMX + +BullHouse2ScriptLoader:: + ret + +BullHouse2TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullHouse3.asm b/scripts/BullHouse3.asm new file mode 100644 index 0000000..1cb40fc --- /dev/null +++ b/scripts/BullHouse3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullHouse3.asm", ROMX + +BullHouse3ScriptLoader:: + ret + +BullHouse3TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullHouse4.asm b/scripts/BullHouse4.asm new file mode 100644 index 0000000..19d3824 --- /dev/null +++ b/scripts/BullHouse4.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullHouse4.asm", ROMX + +BullHouse4ScriptLoader:: + ret + +BullHouse4TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullLeague1F.asm b/scripts/BullLeague1F.asm new file mode 100644 index 0000000..5d44b79 --- /dev/null +++ b/scripts/BullLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullLeague1F.asm", ROMX + +BullLeague1FScriptLoader:: + ret + +BullLeague1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullLeague2F.asm b/scripts/BullLeague2F.asm new file mode 100644 index 0000000..24dc07e --- /dev/null +++ b/scripts/BullLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullLeague2F.asm", ROMX + +BullLeague2FScriptLoader:: + ret + +BullLeague2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullMart.asm b/scripts/BullMart.asm new file mode 100644 index 0000000..3c5179b --- /dev/null +++ b/scripts/BullMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullMart.asm", ROMX + +BullMartScriptLoader:: + ret + +BullMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullPokecenter1F.asm b/scripts/BullPokecenter1F.asm new file mode 100644 index 0000000..552d719 --- /dev/null +++ b/scripts/BullPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullPokecenter1F.asm", ROMX + +BullPokecenter1FScriptLoader:: + ret + +BullPokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullPokecenter2F.asm b/scripts/BullPokecenter2F.asm new file mode 100644 index 0000000..dd46157 --- /dev/null +++ b/scripts/BullPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BullPokecenter2F.asm", ROMX + +BullPokecenter2FScriptLoader:: + ret + +BullPokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/CaveMinecarts1.asm b/scripts/CaveMinecarts1.asm new file mode 100644 index 0000000..2c08c44 --- /dev/null +++ b/scripts/CaveMinecarts1.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/CaveMinecarts1.asm", ROMX + +CaveMinecarts1ScriptLoader:: + ret + +CaveMinecarts1TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/CaveMinecarts2.asm b/scripts/CaveMinecarts2.asm new file mode 100644 index 0000000..a05289c --- /dev/null +++ b/scripts/CaveMinecarts2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/CaveMinecarts2.asm", ROMX + +CaveMinecarts2ScriptLoader:: + ret + +CaveMinecarts2TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/CaveMinecarts3.asm b/scripts/CaveMinecarts3.asm new file mode 100644 index 0000000..b3524cb --- /dev/null +++ b/scripts/CaveMinecarts3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/CaveMinecarts3.asm", ROMX + +CaveMinecarts3ScriptLoader:: + ret + +CaveMinecarts3TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/CaveMinecarts4.asm b/scripts/CaveMinecarts4.asm new file mode 100644 index 0000000..9e40937 --- /dev/null +++ b/scripts/CaveMinecarts4.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/CaveMinecarts4.asm", ROMX + +CaveMinecarts4ScriptLoader:: + ret + +CaveMinecarts4TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/CaveMinecarts5.asm b/scripts/CaveMinecarts5.asm new file mode 100644 index 0000000..1d3e6ce --- /dev/null +++ b/scripts/CaveMinecarts5.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/CaveMinecarts5.asm", ROMX + +CaveMinecarts5ScriptLoader:: + ret + +CaveMinecarts5TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/CaveMinecarts6.asm b/scripts/CaveMinecarts6.asm new file mode 100644 index 0000000..5912778 --- /dev/null +++ b/scripts/CaveMinecarts6.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/CaveMinecarts6.asm", ROMX + +CaveMinecarts6ScriptLoader:: + ret + +CaveMinecarts6TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/CaveMinecarts7.asm b/scripts/CaveMinecarts7.asm new file mode 100644 index 0000000..53a7d20 --- /dev/null +++ b/scripts/CaveMinecarts7.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/CaveMinecarts7.asm", ROMX + +CaveMinecarts7ScriptLoader:: + ret + +CaveMinecarts7TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/Fonto.asm b/scripts/Fonto.asm new file mode 100644 index 0000000..6629aa3 --- /dev/null +++ b/scripts/Fonto.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Fonto.asm", ROMX + +FontoScriptLoader:: + ret + + db "@" diff --git a/scripts/FontoHouse.asm b/scripts/FontoHouse.asm new file mode 100644 index 0000000..6b134a3 --- /dev/null +++ b/scripts/FontoHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoHouse.asm", ROMX + +FontoHouseScriptLoader:: + ret + +FontoHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontoLab.asm b/scripts/FontoLab.asm new file mode 100644 index 0000000..34e2d82 --- /dev/null +++ b/scripts/FontoLab.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoLab.asm", ROMX + +FontoLabScriptLoader:: + ret + +FontoLabTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontoMart.asm b/scripts/FontoMart.asm new file mode 100644 index 0000000..9851561 --- /dev/null +++ b/scripts/FontoMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoMart.asm", ROMX + +FontoMartScriptLoader:: + ret + +FontoMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontoPokecenter1F.asm b/scripts/FontoPokecenter1F.asm new file mode 100644 index 0000000..74a646c --- /dev/null +++ b/scripts/FontoPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoPokecenter1F.asm", ROMX + +FontoPokecenter1FScriptLoader:: + ret + +FontoPokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontoPokecenter2F.asm b/scripts/FontoPokecenter2F.asm new file mode 100644 index 0000000..353eb39 --- /dev/null +++ b/scripts/FontoPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoPokecenter2F.asm", ROMX + +FontoPokecenter2FScriptLoader:: + ret + +FontoPokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontoRocketHouse.asm b/scripts/FontoRocketHouse.asm new file mode 100644 index 0000000..88f02b5 --- /dev/null +++ b/scripts/FontoRocketHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoRocketHouse.asm", ROMX + +FontoRocketHouseScriptLoader:: + ret + +FontoRocketHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontoRoute1.asm b/scripts/FontoRoute1.asm new file mode 100644 index 0000000..5ef94c9 --- /dev/null +++ b/scripts/FontoRoute1.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoRoute1.asm", ROMX + +FontoRoute1ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontoRoute2.asm b/scripts/FontoRoute2.asm new file mode 100644 index 0000000..7e5f4ac --- /dev/null +++ b/scripts/FontoRoute2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoRoute2.asm", ROMX + +FontoRoute2ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontoRoute3.asm b/scripts/FontoRoute3.asm new file mode 100644 index 0000000..7990a9e --- /dev/null +++ b/scripts/FontoRoute3.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoRoute3.asm", ROMX + +FontoRoute3ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontoRoute4.asm b/scripts/FontoRoute4.asm new file mode 100644 index 0000000..b6ba95d --- /dev/null +++ b/scripts/FontoRoute4.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoRoute4.asm", ROMX + +FontoRoute4ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontoRoute5.asm b/scripts/FontoRoute5.asm new file mode 100644 index 0000000..3396745 --- /dev/null +++ b/scripts/FontoRoute5.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoRoute5.asm", ROMX + +FontoRoute5ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontoRoute6.asm b/scripts/FontoRoute6.asm new file mode 100644 index 0000000..ac7a28c --- /dev/null +++ b/scripts/FontoRoute6.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoRoute6.asm", ROMX + +FontoRoute6ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontoRouteGate1.asm b/scripts/FontoRouteGate1.asm new file mode 100644 index 0000000..322e14f --- /dev/null +++ b/scripts/FontoRouteGate1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoRouteGate1.asm", ROMX + +FontoRouteGate1ScriptLoader:: + ret + +FontoRouteGate1TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontoRouteGate2.asm b/scripts/FontoRouteGate2.asm new file mode 100644 index 0000000..7b1841f --- /dev/null +++ b/scripts/FontoRouteGate2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoRouteGate2.asm", ROMX + +FontoRouteGate2ScriptLoader:: + ret + +FontoRouteGate2TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontoRouteGate3.asm b/scripts/FontoRouteGate3.asm new file mode 100644 index 0000000..7091839 --- /dev/null +++ b/scripts/FontoRouteGate3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontoRouteGate3.asm", ROMX + +FontoRouteGate3ScriptLoader:: + ret + +FontoRouteGate3TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Haiteku.asm b/scripts/Haiteku.asm new file mode 100644 index 0000000..fefe049 --- /dev/null +++ b/scripts/Haiteku.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Haiteku.asm", ROMX + +HaitekuScriptLoader:: + ret + + db "@" diff --git a/scripts/HaitekuAquarium1F.asm b/scripts/HaitekuAquarium1F.asm new file mode 100644 index 0000000..636aa61 --- /dev/null +++ b/scripts/HaitekuAquarium1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuAquarium1F.asm", ROMX + +HaitekuAquarium1FScriptLoader:: + ret + +HaitekuAquarium1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuAquarium2F.asm b/scripts/HaitekuAquarium2F.asm new file mode 100644 index 0000000..da6d18b --- /dev/null +++ b/scripts/HaitekuAquarium2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuAquarium2F.asm", ROMX + +HaitekuAquarium2FScriptLoader:: + ret + +HaitekuAquarium2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuHouse1.asm b/scripts/HaitekuHouse1.asm new file mode 100644 index 0000000..4dd851c --- /dev/null +++ b/scripts/HaitekuHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuHouse1.asm", ROMX + +HaitekuHouse1ScriptLoader:: + ret + +HaitekuHouse1TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuHouse2.asm b/scripts/HaitekuHouse2.asm new file mode 100644 index 0000000..24dc596 --- /dev/null +++ b/scripts/HaitekuHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuHouse2.asm", ROMX + +HaitekuHouse2ScriptLoader:: + ret + +HaitekuHouse2TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuImposterOakHouse.asm b/scripts/HaitekuImposterOakHouse.asm new file mode 100644 index 0000000..ac12ad1 --- /dev/null +++ b/scripts/HaitekuImposterOakHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuImposterOakHouse.asm", ROMX + +HaitekuImposterOakHouseScriptLoader:: + ret + +HaitekuImposterOakHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuLeague1F.asm b/scripts/HaitekuLeague1F.asm new file mode 100644 index 0000000..513260c --- /dev/null +++ b/scripts/HaitekuLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuLeague1F.asm", ROMX + +HaitekuLeague1FScriptLoader:: + ret + +HaitekuLeague1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuLeague2F.asm b/scripts/HaitekuLeague2F.asm new file mode 100644 index 0000000..812566d --- /dev/null +++ b/scripts/HaitekuLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuLeague2F.asm", ROMX + +HaitekuLeague2FScriptLoader:: + ret + +HaitekuLeague2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuMart.asm b/scripts/HaitekuMart.asm new file mode 100644 index 0000000..b325e32 --- /dev/null +++ b/scripts/HaitekuMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuMart.asm", ROMX + +HaitekuMartScriptLoader:: + ret + +HaitekuMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuPokecenter1F.asm b/scripts/HaitekuPokecenter1F.asm new file mode 100644 index 0000000..2f54747 --- /dev/null +++ b/scripts/HaitekuPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuPokecenter1F.asm", ROMX + +HaitekuPokecenter1FScriptLoader:: + ret + +HaitekuPokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuPokecenter2F.asm b/scripts/HaitekuPokecenter2F.asm new file mode 100644 index 0000000..23140cb --- /dev/null +++ b/scripts/HaitekuPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuPokecenter2F.asm", ROMX + +HaitekuPokecenter2FScriptLoader:: + ret + +HaitekuPokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuWestRoute.asm b/scripts/HaitekuWestRoute.asm new file mode 100644 index 0000000..feb3a4d --- /dev/null +++ b/scripts/HaitekuWestRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuWestRoute.asm", ROMX + +HaitekuWestRouteScriptLoader:: + ret + + db "@" diff --git a/scripts/HaitekuWestRouteGate.asm b/scripts/HaitekuWestRouteGate.asm new file mode 100644 index 0000000..2e27c03 --- /dev/null +++ b/scripts/HaitekuWestRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuWestRouteGate.asm", ROMX + +HaitekuWestRouteGateScriptLoader:: + ret + +HaitekuWestRouteGateTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HaitekuWestRouteOcean.asm b/scripts/HaitekuWestRouteOcean.asm new file mode 100644 index 0000000..694c865 --- /dev/null +++ b/scripts/HaitekuWestRouteOcean.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HaitekuWestRouteOcean.asm", ROMX + +HaitekuWestRouteOceanScriptLoader:: + ret + + db "@" diff --git a/scripts/Kanto.asm b/scripts/Kanto.asm new file mode 100644 index 0000000..1472564 --- /dev/null +++ b/scripts/Kanto.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Kanto.asm", ROMX + +KantoScriptLoader:: + ret + + db "@" diff --git a/scripts/KantoCeladonElevator.asm b/scripts/KantoCeladonElevator.asm new file mode 100644 index 0000000..2dde637 --- /dev/null +++ b/scripts/KantoCeladonElevator.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoCeladonElevator.asm", ROMX + +KantoCeladonElevatorScriptLoader:: + ret + +KantoCeladonElevatorTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoCeladonMart1F.asm b/scripts/KantoCeladonMart1F.asm new file mode 100644 index 0000000..b45220f --- /dev/null +++ b/scripts/KantoCeladonMart1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoCeladonMart1F.asm", ROMX + +KantoCeladonMart1FScriptLoader:: + ret + +KantoCeladonMart1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoCeladonMart2F.asm b/scripts/KantoCeladonMart2F.asm new file mode 100644 index 0000000..92d5b36 --- /dev/null +++ b/scripts/KantoCeladonMart2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoCeladonMart2F.asm", ROMX + +KantoCeladonMart2FScriptLoader:: + ret + +KantoCeladonMart2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoCeladonMart3F.asm b/scripts/KantoCeladonMart3F.asm new file mode 100644 index 0000000..c2fa6d3 --- /dev/null +++ b/scripts/KantoCeladonMart3F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoCeladonMart3F.asm", ROMX + +KantoCeladonMart3FScriptLoader:: + ret + +KantoCeladonMart3FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoCeladonMart4F.asm b/scripts/KantoCeladonMart4F.asm new file mode 100644 index 0000000..8c86b1e --- /dev/null +++ b/scripts/KantoCeladonMart4F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoCeladonMart4F.asm", ROMX + +KantoCeladonMart4FScriptLoader:: + ret + +KantoCeladonMart4FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoCeladonMart5F.asm b/scripts/KantoCeladonMart5F.asm new file mode 100644 index 0000000..ad7f09d --- /dev/null +++ b/scripts/KantoCeladonMart5F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoCeladonMart5F.asm", ROMX + +KantoCeladonMart5FScriptLoader:: + ret + +KantoCeladonMart5FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoCeruleanHouse.asm b/scripts/KantoCeruleanHouse.asm new file mode 100644 index 0000000..57dd75d --- /dev/null +++ b/scripts/KantoCeruleanHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoCeruleanHouse.asm", ROMX + +KantoCeruleanHouseScriptLoader:: + ret + +KantoCeruleanHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoDiner.asm b/scripts/KantoDiner.asm new file mode 100644 index 0000000..483c69c --- /dev/null +++ b/scripts/KantoDiner.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoDiner.asm", ROMX + +KantoDinerScriptLoader:: + ret + +KantoDinerTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoEastRoute.asm b/scripts/KantoEastRoute.asm new file mode 100644 index 0000000..3e62792 --- /dev/null +++ b/scripts/KantoEastRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoEastRoute.asm", ROMX + +KantoEastRouteScriptLoader:: + ret + + db "@" diff --git a/scripts/KantoEldersHouse.asm b/scripts/KantoEldersHouse.asm new file mode 100644 index 0000000..312d5b0 --- /dev/null +++ b/scripts/KantoEldersHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoEldersHouse.asm", ROMX + +KantoEldersHouseScriptLoader:: + ret + +KantoEldersHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoFishingGuru.asm b/scripts/KantoFishingGuru.asm new file mode 100644 index 0000000..29bab4d --- /dev/null +++ b/scripts/KantoFishingGuru.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoFishingGuru.asm", ROMX + +KantoFishingGuruScriptLoader:: + ret + +KantoFishingGuruTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoGameCorner.asm b/scripts/KantoGameCorner.asm new file mode 100644 index 0000000..272a24d --- /dev/null +++ b/scripts/KantoGameCorner.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoGameCorner.asm", ROMX + +KantoGameCornerScriptLoader:: + ret + +KantoGameCornerTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoGameCornerPrizes.asm b/scripts/KantoGameCornerPrizes.asm new file mode 100644 index 0000000..e823ba6 --- /dev/null +++ b/scripts/KantoGameCornerPrizes.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoGameCornerPrizes.asm", ROMX + +KantoGameCornerPrizesScriptLoader:: + ret + +KantoGameCornerPrizesTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoGamefreakHQ1.asm b/scripts/KantoGamefreakHQ1.asm new file mode 100644 index 0000000..e6af919 --- /dev/null +++ b/scripts/KantoGamefreakHQ1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoGamefreakHQ1.asm", ROMX + +KantoGamefreakHQ1ScriptLoader:: + ret + +KantoGamefreakHQ1TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoGamefreakHQ2.asm b/scripts/KantoGamefreakHQ2.asm new file mode 100644 index 0000000..b120c1e --- /dev/null +++ b/scripts/KantoGamefreakHQ2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoGamefreakHQ2.asm", ROMX + +KantoGamefreakHQ2ScriptLoader:: + ret + +KantoGamefreakHQ2TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoGamefreakHQ3.asm b/scripts/KantoGamefreakHQ3.asm new file mode 100644 index 0000000..bf6650f --- /dev/null +++ b/scripts/KantoGamefreakHQ3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoGamefreakHQ3.asm", ROMX + +KantoGamefreakHQ3ScriptLoader:: + ret + +KantoGamefreakHQ3TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoGamefreakHQ4.asm b/scripts/KantoGamefreakHQ4.asm new file mode 100644 index 0000000..3e24765 --- /dev/null +++ b/scripts/KantoGamefreakHQ4.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoGamefreakHQ4.asm", ROMX + +KantoGamefreakHQ4ScriptLoader:: + ret + +KantoGamefreakHQ4TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoGamefreakHQ5.asm b/scripts/KantoGamefreakHQ5.asm new file mode 100644 index 0000000..591f5dd --- /dev/null +++ b/scripts/KantoGamefreakHQ5.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoGamefreakHQ5.asm", ROMX + +KantoGamefreakHQ5ScriptLoader:: + ret + +KantoGamefreakHQ5TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoGreensHouse1F.asm b/scripts/KantoGreensHouse1F.asm new file mode 100644 index 0000000..ef2fc1c --- /dev/null +++ b/scripts/KantoGreensHouse1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoGreensHouse1F.asm", ROMX + +KantoGreensHouse1FScriptLoader:: + ret + +KantoGreensHouse1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoGreensHouse2F.asm b/scripts/KantoGreensHouse2F.asm new file mode 100644 index 0000000..2ed0dae --- /dev/null +++ b/scripts/KantoGreensHouse2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoGreensHouse2F.asm", ROMX + +KantoGreensHouse2FScriptLoader:: + ret + +KantoGreensHouse2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoHospital.asm b/scripts/KantoHospital.asm new file mode 100644 index 0000000..4844424 --- /dev/null +++ b/scripts/KantoHospital.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoHospital.asm", ROMX + +KantoHospitalScriptLoader:: + ret + +KantoHospitalTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoLavenderHouse.asm b/scripts/KantoLavenderHouse.asm new file mode 100644 index 0000000..19122bd --- /dev/null +++ b/scripts/KantoLavenderHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoLavenderHouse.asm", ROMX + +KantoLavenderHouseScriptLoader:: + ret + +KantoLavenderHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoLeague1F.asm b/scripts/KantoLeague1F.asm new file mode 100644 index 0000000..b0e1efa --- /dev/null +++ b/scripts/KantoLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoLeague1F.asm", ROMX + +KantoLeague1FScriptLoader:: + ret + +KantoLeague1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoLeague21F.asm b/scripts/KantoLeague21F.asm new file mode 100644 index 0000000..83a6fbd --- /dev/null +++ b/scripts/KantoLeague21F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoLeague21F.asm", ROMX + +KantoLeague21FScriptLoader:: + ret + +KantoLeague21FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoLeague22F.asm b/scripts/KantoLeague22F.asm new file mode 100644 index 0000000..eb456b4 --- /dev/null +++ b/scripts/KantoLeague22F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoLeague22F.asm", ROMX + +KantoLeague22FScriptLoader:: + ret + +KantoLeague22FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoLeague2F.asm b/scripts/KantoLeague2F.asm new file mode 100644 index 0000000..90a093f --- /dev/null +++ b/scripts/KantoLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoLeague2F.asm", ROMX + +KantoLeague2FScriptLoader:: + ret + +KantoLeague2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoMart.asm b/scripts/KantoMart.asm new file mode 100644 index 0000000..8d6acf7 --- /dev/null +++ b/scripts/KantoMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoMart.asm", ROMX + +KantoMartScriptLoader:: + ret + +KantoMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoOaksLab.asm b/scripts/KantoOaksLab.asm new file mode 100644 index 0000000..6d59f7e --- /dev/null +++ b/scripts/KantoOaksLab.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoOaksLab.asm", ROMX + +KantoOaksLabScriptLoader:: + ret + +KantoOaksLabTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoPokecenter1F.asm b/scripts/KantoPokecenter1F.asm new file mode 100644 index 0000000..5a807de --- /dev/null +++ b/scripts/KantoPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoPokecenter1F.asm", ROMX + +KantoPokecenter1FScriptLoader:: + ret + +KantoPokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoPokecenter21F.asm b/scripts/KantoPokecenter21F.asm new file mode 100644 index 0000000..599a607 --- /dev/null +++ b/scripts/KantoPokecenter21F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoPokecenter21F.asm", ROMX + +KantoPokecenter21FScriptLoader:: + ret + +KantoPokecenter21FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoPokecenter22F.asm b/scripts/KantoPokecenter22F.asm new file mode 100644 index 0000000..52a0cd1 --- /dev/null +++ b/scripts/KantoPokecenter22F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoPokecenter22F.asm", ROMX + +KantoPokecenter22FScriptLoader:: + ret + +KantoPokecenter22FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoPokecenter2F.asm b/scripts/KantoPokecenter2F.asm new file mode 100644 index 0000000..7d7c11e --- /dev/null +++ b/scripts/KantoPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoPokecenter2F.asm", ROMX + +KantoPokecenter2FScriptLoader:: + ret + +KantoPokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoRedsHouse.asm b/scripts/KantoRedsHouse.asm new file mode 100644 index 0000000..b4f27f5 --- /dev/null +++ b/scripts/KantoRedsHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoRedsHouse.asm", ROMX + +KantoRedsHouseScriptLoader:: + ret + +KantoRedsHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoSchool.asm b/scripts/KantoSchool.asm new file mode 100644 index 0000000..7cd4bbd --- /dev/null +++ b/scripts/KantoSchool.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoSchool.asm", ROMX + +KantoSchoolScriptLoader:: + ret + +KantoSchoolTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoSilphCo.asm b/scripts/KantoSilphCo.asm new file mode 100644 index 0000000..e340c10 --- /dev/null +++ b/scripts/KantoSilphCo.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoSilphCo.asm", ROMX + +KantoSilphCoScriptLoader:: + ret + +KantoSilphCoTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoUnusedArea.asm b/scripts/KantoUnusedArea.asm new file mode 100644 index 0000000..5185dd6 --- /dev/null +++ b/scripts/KantoUnusedArea.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoUnusedArea.asm", ROMX + +KantoUnusedAreaScriptLoader:: + ret + +KantoUnusedAreaTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/KantoViridianHouse.asm b/scripts/KantoViridianHouse.asm new file mode 100644 index 0000000..7e80fcb --- /dev/null +++ b/scripts/KantoViridianHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/KantoViridianHouse.asm", ROMX + +KantoViridianHouseScriptLoader:: + ret + +KantoViridianHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/MtFuji.asm b/scripts/MtFuji.asm new file mode 100644 index 0000000..7cc00ff --- /dev/null +++ b/scripts/MtFuji.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/MtFuji.asm", ROMX + +MtFujiScriptLoader:: + ret + + db "@" diff --git a/scripts/MtFujiRoute.asm b/scripts/MtFujiRoute.asm new file mode 100644 index 0000000..07afa2c --- /dev/null +++ b/scripts/MtFujiRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/MtFujiRoute.asm", ROMX + +MtFujiRouteScriptLoader:: + ret + + db "@" diff --git a/scripts/Newtype.asm b/scripts/Newtype.asm new file mode 100644 index 0000000..e15b6bf --- /dev/null +++ b/scripts/Newtype.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Newtype.asm", ROMX + +NewtypeScriptLoader:: + ret + + db "@" diff --git a/scripts/NewtypeDiner.asm b/scripts/NewtypeDiner.asm new file mode 100644 index 0000000..f466f5a --- /dev/null +++ b/scripts/NewtypeDiner.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeDiner.asm", ROMX + +NewtypeDinerScriptLoader:: + ret + +NewtypeDinerTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypeDojo.asm b/scripts/NewtypeDojo.asm new file mode 100644 index 0000000..458963f --- /dev/null +++ b/scripts/NewtypeDojo.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeDojo.asm", ROMX + +NewtypeDojoScriptLoader:: + ret + +NewtypeDojoTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypeHouse1.asm b/scripts/NewtypeHouse1.asm new file mode 100644 index 0000000..1540250 --- /dev/null +++ b/scripts/NewtypeHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeHouse1.asm", ROMX + +NewtypeHouse1ScriptLoader:: + ret + +NewtypeHouse1TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypeHouse2.asm b/scripts/NewtypeHouse2.asm new file mode 100644 index 0000000..7f15567 --- /dev/null +++ b/scripts/NewtypeHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeHouse2.asm", ROMX + +NewtypeHouse2ScriptLoader:: + ret + +NewtypeHouse2TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypeHouse3.asm b/scripts/NewtypeHouse3.asm new file mode 100644 index 0000000..87fe10c --- /dev/null +++ b/scripts/NewtypeHouse3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeHouse3.asm", ROMX + +NewtypeHouse3ScriptLoader:: + ret + +NewtypeHouse3TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypeLeague1F.asm b/scripts/NewtypeLeague1F.asm new file mode 100644 index 0000000..b10af5f --- /dev/null +++ b/scripts/NewtypeLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeLeague1F.asm", ROMX + +NewtypeLeague1FScriptLoader:: + ret + +NewtypeLeague1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypeLeague2F.asm b/scripts/NewtypeLeague2F.asm new file mode 100644 index 0000000..f7de676 --- /dev/null +++ b/scripts/NewtypeLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeLeague2F.asm", ROMX + +NewtypeLeague2FScriptLoader:: + ret + +NewtypeLeague2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypeMart.asm b/scripts/NewtypeMart.asm new file mode 100644 index 0000000..9d60dad --- /dev/null +++ b/scripts/NewtypeMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeMart.asm", ROMX + +NewtypeMartScriptLoader:: + ret + +NewtypeMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypePokecenter1F.asm b/scripts/NewtypePokecenter1F.asm new file mode 100644 index 0000000..84eae86 --- /dev/null +++ b/scripts/NewtypePokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypePokecenter1F.asm", ROMX + +NewtypePokecenter1FScriptLoader:: + ret + +NewtypePokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypePokecenter2F.asm b/scripts/NewtypePokecenter2F.asm new file mode 100644 index 0000000..31792a3 --- /dev/null +++ b/scripts/NewtypePokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypePokecenter2F.asm", ROMX + +NewtypePokecenter2FScriptLoader:: + ret + +NewtypePokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypeRoute.asm b/scripts/NewtypeRoute.asm new file mode 100644 index 0000000..ee3ca46 --- /dev/null +++ b/scripts/NewtypeRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeRoute.asm", ROMX + +NewtypeRouteScriptLoader:: + ret + + db "@" diff --git a/scripts/NewtypeRouteGate.asm b/scripts/NewtypeRouteGate.asm new file mode 100644 index 0000000..85cb8b3 --- /dev/null +++ b/scripts/NewtypeRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeRouteGate.asm", ROMX + +NewtypeRouteGateScriptLoader:: + ret + +NewtypeRouteGateTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NewtypeSailorHouse.asm b/scripts/NewtypeSailorHouse.asm new file mode 100644 index 0000000..ff6d568 --- /dev/null +++ b/scripts/NewtypeSailorHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NewtypeSailorHouse.asm", ROMX + +NewtypeSailorHouseScriptLoader:: + ret + +NewtypeSailorHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/North.asm b/scripts/North.asm new file mode 100644 index 0000000..ab88882 --- /dev/null +++ b/scripts/North.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/North.asm", ROMX + +NorthScriptLoader:: + ret + + db "@" diff --git a/scripts/NorthHouse1.asm b/scripts/NorthHouse1.asm new file mode 100644 index 0000000..7acf01d --- /dev/null +++ b/scripts/NorthHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NorthHouse1.asm", ROMX + +NorthHouse1ScriptLoader:: + ret + +NorthHouse1TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NorthHouse2.asm b/scripts/NorthHouse2.asm new file mode 100644 index 0000000..014382e --- /dev/null +++ b/scripts/NorthHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NorthHouse2.asm", ROMX + +NorthHouse2ScriptLoader:: + ret + +NorthHouse2TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NorthMart.asm b/scripts/NorthMart.asm new file mode 100644 index 0000000..6c02d36 --- /dev/null +++ b/scripts/NorthMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NorthMart.asm", ROMX + +NorthMartScriptLoader:: + ret + +NorthMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NorthPokecenter1F.asm b/scripts/NorthPokecenter1F.asm new file mode 100644 index 0000000..d2118af --- /dev/null +++ b/scripts/NorthPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NorthPokecenter1F.asm", ROMX + +NorthPokecenter1FScriptLoader:: + ret + +NorthPokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/NorthPokecenter2F.asm b/scripts/NorthPokecenter2F.asm new file mode 100644 index 0000000..167eada --- /dev/null +++ b/scripts/NorthPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/NorthPokecenter2F.asm", ROMX + +NorthPokecenter2FScriptLoader:: + ret + +NorthPokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Office1.asm b/scripts/Office1.asm new file mode 100644 index 0000000..4f1abec --- /dev/null +++ b/scripts/Office1.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Office1.asm", ROMX + +Office1ScriptLoader:: + ret + +Office1TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/Office2.asm b/scripts/Office2.asm new file mode 100644 index 0000000..3caa9b5 --- /dev/null +++ b/scripts/Office2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Office2.asm", ROMX + +Office2ScriptLoader:: + ret + +Office2TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/Office3.asm b/scripts/Office3.asm new file mode 100644 index 0000000..372df6f --- /dev/null +++ b/scripts/Office3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Office3.asm", ROMX + +Office3ScriptLoader:: + ret + +Office3TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/OldCity.asm b/scripts/OldCity.asm new file mode 100644 index 0000000..849d397 --- /dev/null +++ b/scripts/OldCity.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCity.asm", ROMX + +OldCityScriptLoader:: + ret + + db "@" diff --git a/scripts/OldCityBillsHouse.asm b/scripts/OldCityBillsHouse.asm new file mode 100644 index 0000000..3783a8a --- /dev/null +++ b/scripts/OldCityBillsHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityBillsHouse.asm", ROMX + +OldCityBillsHouseScriptLoader:: + ret + +OldCityBillsHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityGym.asm b/scripts/OldCityGym.asm new file mode 100644 index 0000000..df5b95a --- /dev/null +++ b/scripts/OldCityGym.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityGym.asm", ROMX + +OldCityGymScriptLoader:: + ret + +OldCityGymTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityHouse.asm b/scripts/OldCityHouse.asm new file mode 100644 index 0000000..d429b35 --- /dev/null +++ b/scripts/OldCityHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityHouse.asm", ROMX + +OldCityHouseScriptLoader:: + ret + +OldCityHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityKurtsHouse.asm b/scripts/OldCityKurtsHouse.asm new file mode 100644 index 0000000..94d4902 --- /dev/null +++ b/scripts/OldCityKurtsHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityKurtsHouse.asm", ROMX + +OldCityKurtsHouseScriptLoader:: + ret + +OldCityKurtsHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityMart.asm b/scripts/OldCityMart.asm new file mode 100644 index 0000000..83a6098 --- /dev/null +++ b/scripts/OldCityMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityMart.asm", ROMX + +OldCityMartScriptLoader:: + ret + +OldCityMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityMuseum.asm b/scripts/OldCityMuseum.asm new file mode 100644 index 0000000..93f69a4 --- /dev/null +++ b/scripts/OldCityMuseum.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityMuseum.asm", ROMX + +OldCityMuseumScriptLoader:: + ret + +OldCityMuseumTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityPokecenter1F.asm b/scripts/OldCityPokecenter1F.asm new file mode 100644 index 0000000..aaaf6de --- /dev/null +++ b/scripts/OldCityPokecenter1F.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityPokecenter1F.asm", ROMX + +OldCityPokecenter1FScriptLoader:: + ret + +OldCityPokecenter1FTextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/OldCityPokecenter2F.asm b/scripts/OldCityPokecenter2F.asm new file mode 100644 index 0000000..a23df87 --- /dev/null +++ b/scripts/OldCityPokecenter2F.asm @@ -0,0 +1,88 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityPokecenter2F.asm", ROMX + +OldCityPokecenter2FScriptLoader: + call Unreferenced_Function7e6 + ld hl, OldCityPokecenter2FScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +OldCityPokecenter2FScriptPointers: + dw OldCityPokecenter2FScript1 + dw OldCityPokecenter2FNPCIds + +OldCityPokecenter2FScript1: + ld hl, OldCityPokecenter2FNPCIds + ld de, OldCityPokecenter2FSignPointers + call CallMapTextSubroutine + ret + +OldCityPokecenter2FNPCIds: + db $00, $01, $02, $03, $ff + +OldCityPokecenter2FSignPointers: + dw MapDefaultText + +OldCityPokecenter2FTextPointers: + dw OldCityPokecenter2FText1 + dw OldCityPokecenter2FText2 + dw OldCityPokecenter2FText3 + dw OldCityPokecenter2FText4 + +OldCityPokecenter2FText1: + ld a, $01 + ld [wce37], a + ld hl, wJoypadFlags + set 5, [hl] + callab Function29abf + ld hl, wJoypadFlags + res 5, [hl] + ret + +OldCityPokecenter2FText2: + ld a, $02 + ld [wce37], a + ld hl, wJoypadFlags + set 5, [hl] + callab Function29abf + ld hl, wJoypadFlags + res 5, [hl] + ret + +OldCityPokecenter2FText3: + ld hl, Text947e3 + call OpenTextbox + ret + +Text947e3: + text "おりゃ！" + done + +OldCityPokecenter2FText4: + ld hl, OldCityPokecenter2FTextString4 + call OpenTextbox + callab Function29a1f + jr c, .asm_9480c + ld a, $05 + call Function169f ; something related to follow + jr .asm_9480c +; unreferenced? + ld hl, Data14824 + ld a, $5 + call Function16fb + ld hl, $0000 + nop +.asm_9480c + ret + +OldCityPokecenter2FTextString4: + text "うしろにあるのは" + line "タイムマシンです" + done + + db $05, $25, $24, $48 + +Data14824: ; movement data + db $07, $32 diff --git a/scripts/OldCityPokecenterBattle.asm b/scripts/OldCityPokecenterBattle.asm new file mode 100644 index 0000000..0b8bdc7 --- /dev/null +++ b/scripts/OldCityPokecenterBattle.asm @@ -0,0 +1,43 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityPokecenterBattle.asm", ROMX + +OldCityPokecenterBattleScriptLoader: + ld hl, OldCityPokecenterBattleScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +OldCityPokecenterBattleScriptPointers: + dw OldCityPokecenterBattleScript1 + dw OldCityPokecenterBattleNPCIds + +OldCityPokecenterBattleScript1: + ld hl, OldCityPokecenterBattleNPCIds + ld de, OldCityPokecenterBattleSignPointers + call CallMapTextSubroutine + ret + +OldCityPokecenterBattleNPCIds: + db $00, $ff + +OldCityPokecenterBattleSignPointers: + dw MapDefaultText + +OldCityPokecenterBattleTextPointers: + dw OldCityPokecenterBattleText1 + +OldCityPokecenterBattleText1: + ld hl, wJoypadFlags + set 5, [hl] + ld hl, OldCityPokecenterBattleTextString1 + call OpenTextbox + ld hl, wJoypadFlags + res 5, [hl] + callab Function28000 + ret + +OldCityPokecenterBattleTextString1: + text "ちょっとまってね！@" + text_exit + db "@" diff --git a/scripts/OldCityPokecenterTimeMachine.asm b/scripts/OldCityPokecenterTimeMachine.asm new file mode 100644 index 0000000..49f2637 --- /dev/null +++ b/scripts/OldCityPokecenterTimeMachine.asm @@ -0,0 +1,35 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityPokecenterTimeMachine.asm", ROMX + +OldCityPokecenterTimeMachineScriptLoader: + call Unreferenced_Function7e6 + ld hl, OldCityPokecenterTimeMachineScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +OldCityPokecenterTimeMachineScriptPointers: + dw OldCityPokecenterTimeMachineScript1 + dw OldCityPokecenterTimeMachineNPCIds + +OldCityPokecenterTimeMachineScript1: + ld hl, OldCityPokecenterTimeMachineNPCIds + ld de, OldCityPokecenterTimeMachineSignPointers + call CallMapTextSubroutine + ret + +OldCityPokecenterTimeMachineNPCIds: + db $00, $ff + +OldCityPokecenterTimeMachineSignPointers: + dw MapDefaultText + +OldCityPokecenterTimeMachineTextPointers: + dw OldCityPokecenterTimeMachineText1 + +OldCityPokecenterTimeMachineText1: + xor a + ld [wce37], a + callab Function29abf + ret diff --git a/scripts/OldCityPokecenterTrade.asm b/scripts/OldCityPokecenterTrade.asm new file mode 100644 index 0000000..0f66874 --- /dev/null +++ b/scripts/OldCityPokecenterTrade.asm @@ -0,0 +1,45 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityPokecenterTrade.asm", ROMX + +OldCityPokecenterTradeScriptLoader: + ld hl, OldCityPokecenterTradeScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +OldCityPokecenterTradeScriptPointers: + dw OldCityPokecenterTradeScript1 + dw OldCityPokecenterTradeNPCIds + +OldCityPokecenterTradeScript1: + ld hl, OldCityPokecenterTradeNPCIds + ld de, OldCityPokecenterTradeSignPointers + call CallMapTextSubroutine + ret + +OldCityPokecenterTradeNPCIds: + db $00, $ff + +OldCityPokecenterTradeSignPointers: + dw MapDefaultText + +OldCityPokecenterTradeTextPointers: + dw OldCityPokecenterTradeText1 + +OldCityPokecenterTradeText1: + ld hl, wJoypadFlags + set 5, [hl] + ld hl, OldCityPokecenterTradeTextString1 + call OpenTextbox + ld hl, wJoypadFlags + res 5, [hl] + callab Function28000 + ret + +OldCityPokecenterTradeTextString1: + text "ちょっとまってね！@" + text_exit + text_exit + text_exit + db "@" diff --git a/scripts/OldCitySchool.asm b/scripts/OldCitySchool.asm new file mode 100644 index 0000000..6cbb453 --- /dev/null +++ b/scripts/OldCitySchool.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCitySchool.asm", ROMX + +OldCitySchoolScriptLoader:: + ret + +OldCitySchoolTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityTower1F.asm b/scripts/OldCityTower1F.asm new file mode 100644 index 0000000..cbdece7 --- /dev/null +++ b/scripts/OldCityTower1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityTower1F.asm", ROMX + +OldCityTower1FScriptLoader:: + ret + +OldCityTower1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityTower2F.asm b/scripts/OldCityTower2F.asm new file mode 100644 index 0000000..b872e1f --- /dev/null +++ b/scripts/OldCityTower2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityTower2F.asm", ROMX + +OldCityTower2FScriptLoader:: + ret + +OldCityTower2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityTower3F.asm b/scripts/OldCityTower3F.asm new file mode 100644 index 0000000..2cc70cf --- /dev/null +++ b/scripts/OldCityTower3F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityTower3F.asm", ROMX + +OldCityTower3FScriptLoader:: + ret + +OldCityTower3FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityTower4F.asm b/scripts/OldCityTower4F.asm new file mode 100644 index 0000000..8ecb116 --- /dev/null +++ b/scripts/OldCityTower4F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityTower4F.asm", ROMX + +OldCityTower4FScriptLoader:: + ret + +OldCityTower4FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/OldCityTower5F.asm b/scripts/OldCityTower5F.asm new file mode 100644 index 0000000..d6effe8 --- /dev/null +++ b/scripts/OldCityTower5F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/OldCityTower5F.asm", ROMX + +OldCityTower5FScriptLoader:: + ret + +OldCityTower5FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/PlayerHouse1F.asm b/scripts/PlayerHouse1F.asm new file mode 100644 index 0000000..b7134b3 --- /dev/null +++ b/scripts/PlayerHouse1F.asm @@ -0,0 +1,59 @@ +include "constants.asm" + +SECTION "scripts/PlayerHouse1F.asm", ROMX + +PlayerHouse1FScriptLoader:: + ld hl, PlayerHouse1FScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +PlayerHouse1FScriptPointers: + dw PlayerHouse1FScript1 + dw PlayerHouse1FNPCIDs1 + dw PlayerHouse1FScript2 + dw PlayerHouse1FNPCIDs2 + +PlayerHouse1FNPCIDs1: + db $FF + +PlayerHouse1FNPCIDs2: + db 0 + db $FF + +PlayerHouse1FScript1: + ld hl, PlayerHouse1FNPCIDs1 + ld de, PlayerHouse1FSignPointers + call CallMapTextSubroutine + ret + +PlayerHouse1FScript2: + ld hl, PlayerHouse1FNPCIDs2 + ld de, PlayerHouse1FSignPointers + call CallMapTextSubroutine + ret + +PlayerHouse1FSignPointers: + dw Function38ab + dw Function38b4 + dw Function38a2 + dw Function38bd + dw Function3899 +PlayerHouse1FTextPointers:: + dw PlayerHouse1FNPCText1 + +PlayerHouse1FNPCText1: + ld hl, PlayerHouse1FTextString1 + call OpenTextbox + ret + +PlayerHouse1FTextString1: + text "おかあさん『えっ あなた" + line "オーキドはかせに" + cont "ポケモンずかんを つくってくれって" + cont "たのまれたの？" + + para "すごいじゃない！" + line "わたしも ポケモン きらいって" + cont "わけじゃないし がんばるのよ！" + done diff --git a/scripts/PlayerHouse2F.asm b/scripts/PlayerHouse2F.asm new file mode 100644 index 0000000..68eb0cb --- /dev/null +++ b/scripts/PlayerHouse2F.asm @@ -0,0 +1,260 @@ +include "constants.asm" + +SECTION "scripts/PlayerHouse2F.asm", ROMX + +PlayerHouse2FScriptLoader:: + ld hl, PlayerHouse2FScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +PlayerHouse2FScriptPointers: + dw PlayerHouse2FScript1 + dw PlayerHouse2FNPCIDs1 + dw PlayerHouse2FScript2 + dw PlayerHouse2FNPCIDs2 + +PlayerHouse2FTextPointers:: + dw PlayerHouse2FText1 + dw PlayerHouse2FDollText + +PlayerHouse2FNPCIDs1: + db 0 + db 1 + db $FF + +PlayerHouse2FNPCIDs2: + db 1 + db $FF + +PlayerHouse2FSignPointers: + dw Function3899 + dw PlayerHouse2FRadioText + dw PlayerHouse2FComputerText + dw Function3899 + dw PlayerHouse2FN64Text + +PlayerHouse2FScript1: + call PlayerHouse2PositionCheck + ret z + ld hl, PlayerHouse2FNPCIDs1 + ld de, PlayerHouse2FSignPointers + call CallMapTextSubroutine + ret nz + ret + +PlayerHouse2PositionCheck: + ld hl, wd41a + bit 0, [hl] + ret nz + ld a, [wYCoord] + cp 1 + ret nz + ld a, [wXCoord] + cp 9 + ret nz + ld hl, wJoypadFlags + set 6, [hl] + ld a, LEFT + ld d, 0 + call SetObjectFacing + ld hl, PlayerHouse2FTextString2 + call OpenTextbox + call PlayerHouse2FMovePlayer + call ClearAccumulator + ret + +PlayerHouse2FMovePlayer: + ld a, 0 + ld hl, Movement + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 1 + call WriteIntod637 + ret + +Movement: + db $08 + db $04 + db $32 + +PlayerHouse2FScript2: + ld hl, PlayerHouse2FNPCIDs2 + ld de, PlayerHouse2FSignPointers + call CallMapTextSubroutine + ret + +PlayerHouse2FText1: + ld hl, wd41a + bit 3, [hl] + jr nz, .jump + ld hl, PlayerHouse2FTextString1 + call OpenTextbox + ld hl, wd41a + set 3, [hl] + ld c, 3 + call DelayFrames +.jump + ld hl, PlayerHouse2FTextString2 + call OpenTextbox + ret + +PlayerHouse2FDollText: + ld hl, PlayerHouse2FTextString3 + call OpenTextbox + ret + +PlayerHouse2FRadioText: + ld hl, PlayerHouse2FTextString9 + call OpenTextbox + ret + +PlayerHouse2FComputerText: + ld hl, wd41a + bit 0, [hl] + jr nz, .jump + ld hl, PlayerHouse2FTextString5 + call OpenTextbox + ret + +.jump + call RefreshScreen + callab Function1477D + call Function1fea + ret + +PlayerHouse2FCheckEmail: + call YesNoBox + jr c, .jump2 + ld hl, wd41a + set 0, [hl] + ld hl, PlayerHouse2FTextString6 + call PrintText + ret + +.jump2 + ld hl, PlayerHouse2FTextString7 + call PrintText + ret + +PlayerHouse2FN64Text: + ld hl, PlayerHouse2FTextString4 + call OpenTextbox + ret + +PlayerHouse2FTextString1: + text "ケン『おっ おまえの うでで" + line "ひかりかがやく そのとけいは⋯⋯" + cont "<PLAYER>も ついに" + cont "トレーナーギアを かったのか！" + + para "すごいじゃないか！" + line "でも かったばかりじゃ じかんしか" + cont "わからないだろ？" + cont "あとで マップが" + cont "みられるように してやるよ！" + cont "おまえ どうせ" + cont "あそびに いくんだろう？" + + para "ざんねんながら おふくろは" + line "かいものに いってるから" + cont "おこづかいを もらおうなんて" + cont "きょうは むり だぜ！" + done + +PlayerHouse2FTextString2: + text "そうだ おまえの パソコンに" + line "メールが とどいていたな" + cont "でかけるんなら" + cont "メールぐらい よんでおけよ" + done + +PlayerHouse2FTextString3: + text "クりスマスに カントーの" + line "しんせきに プレゼント" + cont "してもらった にんぎょうだ" + done + +PlayerHouse2FTextString4: + text "ニンテンドウ６４を してる！" + cont "⋯⋯ ⋯⋯ さてと！" + cont "そろそろ そとに あそびに" + cont "でかけるか！" + done + +PlayerHouse2FTextString5: + text "<PLAYER>は" + line "パソコンの スイッチを いれた！" + + para "おや？ <PLAYER>あてに" + line "メールが とどいている ようだ" + cont "よんでみる？@" + + db $08 + + call PlayerHouse2FCheckEmail + call Function3036 + ret + +PlayerHouse2FTextString6: + text "とつぜん メールを さしあげる" + line "しつれいを おゆるしあれ" + + para "じつは きみに どうしても" + line "わたしたい ものが あるのじゃが" + cont "うけとって もらえんかのう" + cont "ポケモンけんきゅうしゃ オーキド" + done + +PlayerHouse2FTextString7: + text "あとで" + line "よもっと<⋯⋯>" + done + +PlayerHouse2FTextString8: ; (unused?) + text "しんはつばい トレーナーギア！" + line "ポケモントレーナーの ための" + cont "さいせんたんの とけい です" + + para "じかんが わかるのは あたりまえ" + line "カセットを ついかすれば" + cont "ばしょも わかる！ " + cont "でんわが かけられる！" + + para "とどめは" + line "ラジオを きくことができる！" + + para "もうしこみさきは⋯⋯" + line "⋯⋯⋯⋯⋯⋯⋯⋯⋯⋯⋯⋯" + cont "シルフの ホームぺージだ" + done + +PlayerHouse2FTextString9: + text "<PLAYER>は" + line "ラジオのスイッチを おした！" + + para "ジェイ オー ピー エム" + line "こちらは" + cont "# ほうそうきょく です" + + para "#ニュースを おおくりします" + line "<⋯⋯> #の せかいてきな" + cont "けんきゅうしゃ オーキドはかせが" + cont "カントー から" + cont "すがたを けしました" + cont "あらたな けんきゅうの ばしょを" + cont "もとめて いどうした との" + cont "みかたも ありますが" + cont "なんらかの じけんに まきこまれた" + cont "かのうせいも あり" + cont "かんけいしゃは とても" + cont "しんぱい しています" + + para "<⋯⋯><⋯⋯>いじょう" + line "#ニュースでした" + + para "<⋯⋯><⋯⋯><⋯⋯><⋯⋯><⋯⋯><⋯⋯>" + line "それでは ひきつづき" + cont "おんがくを おたのしみ ください" + done diff --git a/scripts/PowerPlant1.asm b/scripts/PowerPlant1.asm new file mode 100644 index 0000000..9486a00 --- /dev/null +++ b/scripts/PowerPlant1.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/PowerPlant1.asm", ROMX + +PowerPlant1ScriptLoader:: + ret + +PowerPlant1TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/PowerPlant2.asm b/scripts/PowerPlant2.asm new file mode 100644 index 0000000..66a08e6 --- /dev/null +++ b/scripts/PowerPlant2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/PowerPlant2.asm", ROMX + +PowerPlant2ScriptLoader:: + ret + +PowerPlant2TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/PowerPlant3.asm b/scripts/PowerPlant3.asm new file mode 100644 index 0000000..cb0819c --- /dev/null +++ b/scripts/PowerPlant3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/PowerPlant3.asm", ROMX + +PowerPlant3ScriptLoader:: + ret + +PowerPlant3TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/PowerPlant4.asm b/scripts/PowerPlant4.asm new file mode 100644 index 0000000..486a867 --- /dev/null +++ b/scripts/PowerPlant4.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/PowerPlant4.asm", ROMX + +PowerPlant4ScriptLoader:: + ret + +PowerPlant4TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/Prince.asm b/scripts/Prince.asm new file mode 100644 index 0000000..6a92620 --- /dev/null +++ b/scripts/Prince.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Prince.asm", ROMX + +PrinceScriptLoader:: + ret + + db "@" diff --git a/scripts/PrinceRoute.asm b/scripts/PrinceRoute.asm new file mode 100644 index 0000000..aacb28d --- /dev/null +++ b/scripts/PrinceRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/PrinceRoute.asm", ROMX + +PrinceRouteScriptLoader:: + ret + + db "@" diff --git a/scripts/Route15.asm b/scripts/Route15.asm new file mode 100644 index 0000000..1eb40b1 --- /dev/null +++ b/scripts/Route15.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Route15.asm", ROMX + +Route15ScriptLoader:: + ret + + db "@" diff --git a/scripts/Route15Pokecenter1F.asm b/scripts/Route15Pokecenter1F.asm new file mode 100644 index 0000000..34edf53 --- /dev/null +++ b/scripts/Route15Pokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Route15Pokecenter1F.asm", ROMX + +Route15Pokecenter1FScriptLoader:: + ret + +Route15Pokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Route15Pokecenter2F.asm b/scripts/Route15Pokecenter2F.asm new file mode 100644 index 0000000..71f71b9 --- /dev/null +++ b/scripts/Route15Pokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Route15Pokecenter2F.asm", ROMX + +Route15Pokecenter2FScriptLoader:: + ret + +Route15Pokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Route18.asm b/scripts/Route18.asm new file mode 100644 index 0000000..0c21fba --- /dev/null +++ b/scripts/Route18.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Route18.asm", ROMX + +Route18ScriptLoader:: + ret + + db "@" diff --git a/scripts/Route18Pokecenter1F.asm b/scripts/Route18Pokecenter1F.asm new file mode 100644 index 0000000..dc7d18f --- /dev/null +++ b/scripts/Route18Pokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Route18Pokecenter1F.asm", ROMX + +Route18Pokecenter1FScriptLoader:: + ret + +Route18Pokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Route18Pokecenter2F.asm b/scripts/Route18Pokecenter2F.asm new file mode 100644 index 0000000..e7b136c --- /dev/null +++ b/scripts/Route18Pokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Route18Pokecenter2F.asm", ROMX + +Route18Pokecenter2FScriptLoader:: + ret + +Route18Pokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Route1Gate1F.asm b/scripts/Route1Gate1F.asm new file mode 100644 index 0000000..767df68 --- /dev/null +++ b/scripts/Route1Gate1F.asm @@ -0,0 +1,55 @@ +include "constants.asm" + +SECTION "scripts/Route1Gate1F.asm", ROMX + +Route1Gate1FScriptLoader:: + ld hl, Route1Gate1FScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +Route1Gate1FScriptPointers: + dw Route1Gate1FScript ;>> routine + dw Route1Gate1FNPCIDs ;>> data + +Route1Gate1FNPCIDs: + db $00 + db $01 + db $FF + +Route1Gate1FSignPointers: + dw MapDefaultText ;no signs +Route1Gate1FTextPointers:: + dw Route1Gate1FText1 + dw Route1Gate1FText2 + +Route1Gate1FScript: + ld hl, Route1Gate1FNPCIDs + ld de, Route1Gate1FSignPointers + call CallMapTextSubroutine + ret + +Route1Gate1FText1: + ld hl, Route1Gate1FText1String + call OpenTextbox + ret + +Route1Gate1FText2: + ld hl, Route1Gate1FText2String + call OpenTextbox + ret + +Route1Gate1FText1String: + text "このゲートを ぬけると" + line "すぐに オールドシティ です" + done + +Route1Gate1FText2String: + text "オールドシティには" + line "あの ゆうめいな" + cont "ごじゅうのとう が あるの" + + para "いってみたこと ある？" + done + +;ends at 40D9 diff --git a/scripts/Route1Gate2F.asm b/scripts/Route1Gate2F.asm new file mode 100644 index 0000000..987dae2 --- /dev/null +++ b/scripts/Route1Gate2F.asm @@ -0,0 +1,85 @@ +include "constants.asm" + +SECTION "scripts/Route1Gate2F.asm", ROMX + +Route1Gate2FScriptLoader:: + ld hl, Route1Gate2FScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +Route1Gate2FScriptPointers: + dw Route1Gate2FScript + dw Route1Gate2FNPCIDs + +Route1Gate2FNPCIDs: + db 0 + db 1 + db $FF + +Route1Gate2FSignPointers: + dw Route1Gate2FTextSign1 + dw Route1Gate2FTextSign2 +Route1Gate2FTextPointers:: + dw Route1Gate2FTextNPC1 + dw Route1Gate2FTextNPC2 + +Route1Gate2FScript:: + ld hl, Route1Gate2FNPCIDs + ld de, Route1Gate2FSignPointers + call CallMapTextSubroutine + ret + +Route1Gate2FTextNPC1: + ld hl, Route1Gate2FTextString1 + call OpenTextbox + ret + +Route1Gate2FTextNPC2: + ld hl, Route1Gate2FTextString2 + call OpenTextbox + ret + +Route1Gate2FTextSign1: + ld hl, Route1Gate2FTextString3 + call OpenTextbox + ret + +Route1Gate2FTextSign2: + ld hl, Route1Gate2FTextString4 + call OpenTextbox + ret + +Route1Gate2FTextString1: + text "ガンテツさんって しってる？" + + para "ガンテツさんに" + line "きに いられるように なれば" + cont "トレーナーとして たいしたもの よ" + done + +Route1Gate2FTextString2: + text "あなた かんこうで きたの？" + line "なら ざんねんね" + + para "オールドシティの" + line "ごじゅうのとう は" + cont "だれでも はいれる って" + cont "ものじゃないわ" + done + +Route1Gate2FTextString3: + text "<PLAYER>は" + line "ぼうえんきょうを のぞいた！" + + para "むむむ！" + line "たかーい とう が みえる！" + done + +Route1Gate2FTextString4: + text "<PLAYER>は" + line "ぼうえんきょうを のぞいた！" + + para "むむ？" + line "ながーい かわ が みえる" + done diff --git a/scripts/Route1P1.asm b/scripts/Route1P1.asm new file mode 100644 index 0000000..411a076 --- /dev/null +++ b/scripts/Route1P1.asm @@ -0,0 +1,86 @@ +include "constants.asm" + +SECTION "scripts/Route1P1.asm", ROMX + + ret + + dw Textdbb82 +Textdbb82: + text "べんりな よのなかだね" + done + + rept 9 + ret + endr + +Route1P1ScriptLoader:: + ld hl, Route1P1ScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +Route1P1ScriptPointers: + dw Route1P1Script + dw Route1P1NPCIDs + +Route1P1NPCIDs: + db 0 + db 1 + db $FF + +Route1P1SignPointers: + dw Route1P1TextSign1 + dw Route1P1TextSign2 + +Route1P1TextPointers:: + dw Route1P1TextNPC1 + dw Route1P1TextNPC2 + +Route1P1Script:: + ld hl, Route1P1NPCIDs + ld de, Route1P1SignPointers + call CallMapTextSubroutine + ret + +Route1P1TextNPC1: + ld hl, Route1P1TextString1 + call OpenTextbox + ret + +Route1P1TextNPC2: + ld hl, Route1P1TextString2 + call OpenTextbox + ret + +Route1P1TextSign1: + ld hl, Route1P1TextString3 + call OpenTextbox + ret + +Route1P1TextSign2: + ld hl, Route1P1TextString4 + call OpenTextbox + ret + +Route1P1TextString1: + text "しょうねん！" + + para "モンスターボールは" + line "やせいの ポケモンを よわらせてから" + cont "つかうのが きほんだ！" + done + +Route1P1TextString2: + text "ぼく ゆうがた じゅくの かえりに" + line "かわった ポケモンを みたよ" + done + +Route1P1TextString3: + text "このさき しずかな おか" + line "やせいの ポケモンに ちゅうい" + done + +Route1P1TextString4: + text "ここは １ばん どうろ" + line "サイレントヒル ⋯⋯ オールドシティ" + done diff --git a/scripts/Route1P2.asm b/scripts/Route1P2.asm new file mode 100644 index 0000000..40c5d6f --- /dev/null +++ b/scripts/Route1P2.asm @@ -0,0 +1,117 @@ +include "constants.asm" + +SECTION "scripts/Route1P2.asm", ROMX + +Route1P2ScriptLoader:: + ld hl, Route1P2ScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +Route1P2ScriptPointers: + dw Route1P2Script + dw Route1P2NPCIDs + +Route1P2NPCIDs: + db $00 + db $01 + db $FF + +Route1P2SignPointers: + dw Route1P2TextSign1 + +Route1P2TextPointers:: + dw Route1P2Text1 + dw Route1P2Text2 + +Route1P2Script:: + ld a, [wYCoord] + cp $06 + jr nz, .skipCheck + ld a, [wXCoord] + cp $09 + jr nz, .skipCheck + ld a, 0 ; player + ld d, LEFT + call SetObjectFacing + ld a, 2 + ld d, RIGHT + call SetObjectFacing + jr .endDemo +.skipCheck + ld hl, Route1P2NPCIDs ;data + ld de, Route1P2SignPointers ;start of textld pointers? + call CallMapTextSubroutine + ret + +.endDemo +Route1P2Text1: + ld hl, Route1P2TextString4 + call OpenTextbox + call GBFadeOutToBlack + jp Init + +Route1P2Text2: + ld hl, $D3A2 ; trainer flags? + bit 1, [hl] + jr nz, .Text2Jump ; already fought + ld hl, Route1P2TextString1 + call OpenTextbox + ld hl, $D3A2 + set 1, [hl] + ld a, $3C + ld [wce02], a + ld a, $02 + ld [wce05], a + ld hl, wc5ed + set 7, [hl] + ld a, $08 + ld [wd637], a + ret + +.Text2Jump +Route1P2Text3: + ld hl, Route1P2TextString3 + call OpenTextbox + ret + +Route1P2TextSign1: + ld hl, Route1P2TextString5 + call OpenTextbox + ret + +Route1P2TextString1: + text "まあ かわいらしい トレーナーやこと" + line "うちと ポケモン しはります？" + done + +Route1P2TextString2: ; (unused?) + text "いやあ かんにんやわあ" + done + +Route1P2TextString3: + text "かわいい かおして つよおすなあ" + line "その ちょうしで おきばりやす" + done + +Route1P2TextString4: + text "シゲル『おっ サトシじゃないか！" + + para "なんとか ここまで これた" + line "って かんじだな" + + para "じつりょくが ないのに" + line "むり するなよな" + + para "もっと ポケモン あつめるとか" + line "いろんな ポケモン そだてるとか" + cont "やること あるだろ？" + + para "ここで ひきかえしたほうが いいぜ！" + line "じゃあな" + done + +Route1P2TextString5: + text "ここは １ばん どうろ" + line "サイレントヒル ⋯⋯ オールドシティ" + done diff --git a/scripts/Route2.asm b/scripts/Route2.asm new file mode 100644 index 0000000..f79a26a --- /dev/null +++ b/scripts/Route2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Route2.asm", ROMX + +Route2ScriptLoader:: + ret + + db "@" diff --git a/scripts/Route2Gate1F.asm b/scripts/Route2Gate1F.asm new file mode 100644 index 0000000..c0b3787 --- /dev/null +++ b/scripts/Route2Gate1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Route2Gate1F.asm", ROMX + +Route2Gate1FScriptLoader:: + ret + +Route2Gate1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Route2Gate2F.asm b/scripts/Route2Gate2F.asm new file mode 100644 index 0000000..cac8a5e --- /dev/null +++ b/scripts/Route2Gate2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Route2Gate2F.asm", ROMX + +Route2Gate2FScriptLoader:: + ret + +Route2Gate2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Route2House.asm b/scripts/Route2House.asm new file mode 100644 index 0000000..25f3897 --- /dev/null +++ b/scripts/Route2House.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Route2House.asm", ROMX + +Route2HouseScriptLoader:: + ret + +Route2HouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/RouteSilentEast.asm b/scripts/RouteSilentEast.asm new file mode 100644 index 0000000..4e41f0c --- /dev/null +++ b/scripts/RouteSilentEast.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/RouteSilentEast.asm", ROMX + +RouteSilentEastScriptLoader:: + ret + + db "@" diff --git a/scripts/RouteSilentEastGate.asm b/scripts/RouteSilentEastGate.asm new file mode 100644 index 0000000..827376c --- /dev/null +++ b/scripts/RouteSilentEastGate.asm @@ -0,0 +1,9 @@ +INCLUDE "constants.asm" + +SECTION "scripts/RouteSilentEastGate.asm", ROMX + +RouteSilentEastGateScriptLoader:: + ret + +RouteSilentEastGateTextPointers:: + db "@" diff --git a/scripts/RuinsOfAlphEntrance.asm b/scripts/RuinsOfAlphEntrance.asm new file mode 100644 index 0000000..6f92220 --- /dev/null +++ b/scripts/RuinsOfAlphEntrance.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/RuinsOfAlphEntrance.asm", ROMX + +RuinsOfAlphEntranceScriptLoader:: + ret + +RuinsOfAlphEntranceTextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/RuinsOfAlphMain.asm b/scripts/RuinsOfAlphMain.asm new file mode 100644 index 0000000..208fc09 --- /dev/null +++ b/scripts/RuinsOfAlphMain.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/RuinsOfAlphMain.asm", ROMX + +RuinsOfAlphMainScriptLoader:: + ret + +RuinsOfAlphMainTextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/ShizukanaOka.asm b/scripts/ShizukanaOka.asm new file mode 100644 index 0000000..3387fee --- /dev/null +++ b/scripts/ShizukanaOka.asm @@ -0,0 +1,242 @@ +include "constants.asm" + +SECTION "scripts/ShizukanaOka.asm", ROMX + +ShizukanaOkaScriptLoader:: + ld hl, ShizukanaOkaScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +ShizukanaOkaScriptPointers: + dw ShizukanaOkaScript + dw ShizukanaOkaNPCIDs + +ShizukanaOkaNPCIDs: + db 0 + db 1 + db 2 + db 3 + db 4 + db 5 + db $FF + +ShizukanaOkaSignPointers: + dw ShizukanaOkaSignpost1 + dw ShizukanaOkaSignpost2 + +ShizukanaOkaTextPointers: + dw ShizukanaOkaText1 + dw ShizukanaOkaTrainer2 + dw ShizukanaOkaTrainer3 + dw ShizukanaOkaTrainer4 + dw ShizukanaOkaTrainer5 + dw ShizukanaOkaTrainer6 + +ShizukanaOkaScript: + ld hl, ShizukanaOkaNPCIDs + ld de, ShizukanaOkaSignPointers + call CallMapTextSubroutine + ret + +ShizukanaOkaText1: + ld hl, ShizukanaOkaText1String + call OpenTextbox + ret + +ShizukanaOkaTrainer2: + ld hl, $D3A5 + bit 1, [hl] + jr nz, .Trainer2Won + ld hl, ShizukanaOkaTrainer2EncounterString + call OpenTextbox + ld hl, wd3a5 + set 1, [hl] + ld a, TRAINER_SCHOOLBOY + ld [wce02], a + ld a, SCHOOLBOY_TETSUYA + ld [wce05], a + call Function38d8 + ret +.Trainer2Won ;Already won + ld hl, ShizukanaOkaTrainer2WonString + call OpenTextbox + ret + +ShizukanaOkaTrainer3: + ld hl, wd3a5 + bit 2, [hl] + jr nz, .Trainer3Won + ld hl, ShizukanaOkaTrainer3EncounterString + call OpenTextbox + ld hl, wd3a5 + set 2, [hl] + ld a, TRAINER_BUG_CATCHER_BOY + ld [wce02], a + ld a, BUG_CATCHER_BOY_JUNICHI + ld [wce05], a + call Function38d8 + ret +.Trainer3Won ;Already won + ld hl, ShizukanaOkaTrainer3WonString + call OpenTextbox + ret + +ShizukanaOkaTrainer4: + ld hl, wd3a5 + bit 3, [hl] + jr nz, .Trainer4Won + ld hl, ShizukanaOkaTrainer4EncounterString + call OpenTextbox + ld hl, wd3a5 + set 3, [hl] + ld a, TRAINER_FIREBREATHER + ld [wce02], a + ld a, FIREBREATHER_AKITO + ld [wce05], a + call Function38d8 + ret +.Trainer4Won ;Already won + ld hl, ShizukanaOkaTrainer4WonString + call OpenTextbox + ret + +ShizukanaOkaTrainer5: + ld hl, wd3a5 + bit 4, [hl] + jr nz, .Trainer5Won + ld hl, ShizukanaOkaTrainer5EncounterString + call OpenTextbox + ld hl, wd3a5 + set 4, [hl] + ld a, TRAINER_BEAUTY + ld [wce02], a + ld a, BEAUTY_MEGUMI + ld [wce05], a + call Function38d8 + ret +.Trainer5Won ;Already won + ld hl, ShizukanaOkaTrainer5WonString + call OpenTextbox + ret + +ShizukanaOkaTrainer6: + ld hl, wd3a5 + bit 5, [hl] + jr nz, .Trainer6Won + ld hl, ShizukanaOkaTrainer6EncounterString + call OpenTextbox + ld hl, wd3a5 + set 5, [hl] + ld a, TRAINER_BUG_CATCHER_BOY + ld [wce02], a + ld a, BUG_CATCHER_BOY_SOUSUKE + ld [wce05], a + call Function38d8 + ret +.Trainer6Won ;Already won + ld hl, ShizukanaOkaTrainer6WonString + call OpenTextbox + ret + +ShizukanaOkaSignpost2: + ld hl, ShizukanaOkaSignpost2String + call OpenTextbox + ret + +ShizukanaOkaSignpost1: + ld hl, ShizukanaOkaSignpost1String + call OpenTextbox + ret + +ShizukanaOkaTrainer6EncounterString: + text "ねえ ねえ みてよ" + para "これ ぜったい" + line "しんしゅの ポケモン だよ！" + done + + text "まだ ポケモンの とくちょう" + line "わかってないから しかたないよ" + done + +ShizukanaOkaTrainer6WonString: + text "あたらしい ポケモンだけでなく" + line "あたらしい タイプも" + cont "みつかったって うわさだよ" + done + +ShizukanaOkaTrainer5EncounterString: + text "いい てんきねー" + line "あなた ちょうしは いかが？" + done + + text "なにするニャー" + line "⋯⋯なにいってるのかしら あたし" + done + +ShizukanaOkaTrainer5WonString: + text "なんで こうなるの？" + line "さんぽしてた だけなのに@@" + +ShizukanaOkaTrainer4EncounterString: + text "こんなところで" + line "ひを ふく れんしゅう！" + done + + text "あちち しっぱいだー" + done + +ShizukanaOkaTrainer4WonString: + text "よるになると くらくなるから" + line "こどもは はやく かえりなさい！" + para "おれ？" + line "おれは ひをふくから だいじょうぶ" + done + +ShizukanaOkaTrainer3EncounterString: + text "むしポケモンの ことなら" + line "だれよりも くわしいよ" + done + + text "パラパラー" + done + +ShizukanaOkaTrainer3WonString: + text "ポケモンずかんを つくるんだって？" + line "ちょっと みせてよ" + para "へー" + line "タイプべつに ポケモン さがせるんだ" + done + +ShizukanaOkaTrainer2EncounterString: + text "いっとくけど" + line "きみよりも べんきょう してるから" + cont "きみよりも つよいよ ぜったい！" + done + + text "な なぜなんだ？" + done + +ShizukanaOkaTrainer2WonString: + text "おかしいよ⋯⋯" + line "まいにち ポケモンの べんきょうを" + cont "きちんと してるのに まけるなんて" + done + +ShizukanaOkaText1String: + text "この おかの ポケモンは よわい！" + line "だから ここで しゅぎょう している" + cont "トレーナーも おおいよ" + para "みんな バトルが すきだから" + line "うでだめしを するといい" + done + +ShizukanaOkaSignpost2String: + text "しずかな おか" + line "サイレントヒル は こちら" + done + +ShizukanaOkaSignpost1String: + text "しずかな おか" + line "オールドシティ は こちら" + done diff --git a/scripts/SilentHill.asm b/scripts/SilentHill.asm new file mode 100644 index 0000000..aa53190 --- /dev/null +++ b/scripts/SilentHill.asm @@ -0,0 +1,418 @@ +include "constants.asm" + +SECTION "scripts/SilentHill.asm", ROMX + +SilentHillScriptLoader:: + ld hl, SilentHillScriptPointers1 + call RunMapScript + call WriteBackMapScriptNumber + ret + +SilentHillNPCIDs1: + db 0 + db 2 + db 3 + db $FF + +SilentHillNPCIDs2: + db 2 + db 3 + db $FF + +SilentHillNPCIDs3: + db 1 + db 2 + db 3 + db $FF + +SilentHillScriptPointers1: + dw SilentHillScript1 + dw SilentHillNPCIDs1 + +SilentHillScriptPointers2: + dw SilentHillScript2 + dw SilentHillNPCIDs1 + +SilentHillScriptPointers3: + dw SilentHillScript3 + dw SilentHillNPCIDs1 + +SilentHillScriptPointers4: + dw SilentHillScript4 + dw SilentHillNPCIDs2 + +SilentHillScriptPointers5: + dw SilentHillScript5 + dw SilentHillNPCIDs3 + +SilentHillScriptPointers6: + dw SilentHillScript6 + dw SilentHillNPCIDs2 + +SilentHillScriptPointers7: + dw SilentHillScript7 + dw SilentHillNPCIDs2 + +SilentHillScript1: + ld a, [wYCoord] + cp 5 + ret nz + ld a, [wXCoord] + cp 5 + ret nz + ld hl, wJoypadFlags + set 4, [hl] + ld a, 02 + call Function17f9 + ld a, 02 + ld hl, SilentHillMovement1 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 1 + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillMovement1: + db $0D + db $0D + db $0D + db $09 + db $05 + db $02 + db $32 + +SilentHillScript2: + ld a, 0 + ld d, RIGHT + call SetObjectFacing + ld hl, SilentHillTextRival1 + call OpenTextbox + ld hl, SilentHillTextRival2 + call OpenTextbox + ld hl, wJoypadFlags + set 4, [hl] + ld a, 2 + ld hl, SilentHillMovement2 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 1 + call WriteIntod637 + ld a, 2 + ld [wMapScriptNumber], a + ret + +SilentHillMovement2: + db $00, $04, $08, $0C, $0C, $0C, $33 + +SilentHillScript3: + call Function1848 + ld a, 3 + ld [wMapScriptNumber], a + call InitUnknownBuffercc9e + ret + +SilentHillScript4: + ld a, [wXCoord] + cp 0 + jr nz, .bigjump + ld a, [wYCoord] + cp 8 + jr z, .jump + cp 09 + jr nz, .bigjump +.jump + call Function776a + ld hl, SilentHillTextNorthExit + call OpenTextbox + ld hl, wJoypadFlags + set 4, [hl] + ld a, 3 + call Function15ed + ld a, 3 + call Function17f9 + ld a, [wYCoord] + cp 9 + jr z, .jump2 + ld hl, SilentHillMovement3 + jr .skip +.jump2 + ld hl, SilentHillMovement4 +.skip + ld a, 03 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 1 + call WriteIntod637 + ld a, 4 + ld [wMapScriptNumber], a + ret + +.bigjump + ld hl, SilentHillNPCIDs2 + ld de, SilentHillSignPointers + call CallMapTextSubroutine + ret + +Function776a: + ld hl, wd41a + set 7, [hl] + ld a, 1 + ld hl, wd29d + ld [hl], a + ret + +SilentHillMovement3: + db $0A, $0A, $0A, $09, $0A, $06, $02, $32 + +SilentHillMovement4: + db $0A, $0A, $0A, $0A, $06, $02, $32 + +SilentHillScript5: + ld a, 0 + ld d, RIGHT + call SetObjectFacing + ld hl, SilentHillTextPokemonInGrassString + call OpenTextbox + ld hl, wJoypadFlags + set 4, [hl] + ld a, 3 + call Function17f9 + ld a, 0 + call Function186a + ld b, 3 + ld c, 0 + call StartFollow + ld a, [wYCoord] + cp 9 + jr z, .jump + ld hl, SilentHillMovement5 + jr .skip +.jump + ld hl, SilentHillMovement6 +.skip + ld a, 3 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 1 + call WriteIntod637 + ld a, 5 + ld [wMapScriptNumber], a + ret + +SilentHillMovement5: + db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33 + +SilentHillMovement6: + db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33 + +SilentHillScript6: + ld hl, SilentHillNPCIDs2 + ld de, SilentHillSignPointers + call CallMapTextSubroutine + ld hl, wd41b + bit 2, [hl] + ret z + ld a, $12 + ld [wd29d], a + ld a, 6 + ld [wMapScriptNumber], a + ret + +SilentHillScript7: + call CheckLabDoor + ret z + ld hl, SilentHillNPCIDs2 + ld de, SilentHillSignPointers + call CallMapTextSubroutine + ret + +CheckLabDoor: + ld a, [wYCoord] + cp $C + ret nz + ld a, [wXCoord] + cp $E + jr z, .jump + ld a, [wXCoord] + cp $F + ret nz +.jump + ldh a, [hJoyState] + bit 6, a + ret z + ld a, 0 + ld d, UP + call SetObjectFacing + ld hl, wJoypadFlags + set 6, [hl] + ld hl, SilentHillTextString1 + call OpenTextbox + call LabClosed + call ClearAccumulator + ret + +LabClosed: + ld a, 0 + ld hl, SilentHillMovement7 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 1 + call WriteIntod637 + ret + +SilentHillTextString1: + text "あれ？ カギが かかっている" + done + +SilentHillMovement7: + db $04, $32 + +SilentHillSignPointers:: + dw SilentHillPlayerHouseText + dw Function38c6 + dw SilentHillSignText1 + dw SilentHillLabText + dw SilentHillRivalHouseText + +SilentHillLabText: + ld hl, SilentHillTextString2 + call OpenTextbox + ret + +SilentHillTextString2: + text "にゅうきょしゃ ぼしゅうちゅう！" + done + +SilentHillSignText1: + ld hl, SilentHillTextString3 + call OpenTextbox + ret + +SilentHillTextString3: + text "ここは サイレント ヒル" + line "しずかな おか" + done + +SilentHillPlayerHouseText: + ld hl, SilentHillTextString4 + call OpenTextbox + ret + +SilentHillTextString4: + text "ここは <PLAYER> のいえ" + done + +SilentHillRivalHouseText: + ld hl, SilentHillTextString5 + call OpenTextbox + ret + +SilentHillTextString5: + text "ここは <RIVAL> のいえ" + done + +SilentHillTextPointers:: + dw SilentHillTextRival1 ; west + dw SilentHillTextNorthExit ; north + dw SilentHillTextBackpack ; npc1 + dw SilentHillTextPokemonHate ; npc2 + +SilentHillTextRival1: + text "<RIVAL>『よう ちょっと おまえに" + cont "じまん したいことが" + cont "あってきたんだよ" + + para "おれ あの ゆうめいなオーキドから" + line "メール もらっちゃった！" + cont "え？ おまえにも きたの？" + cont "ちぇっ！ つまんねーの！" + + para "⋯⋯ふん！" + line "じゃあさ じゃあさー おまえさー" + cont "じぶんの ははおや のこと" + cont "いつも なんて よんでる？@" + + db $08 + +LoadMomNamePromptUnused: + call LoadStandardMenuHeader + callab MomNamePrompt + call CloseWindow + call GetMemSGBLayout + call UpdateSprites + call UpdateTimePals + jp Function3036 + +MomNameMenuHeaderUnused: + db MENU_BACKUP_TILES ; flags + menu_coords 00, 00, 10, 11 + dw .MomNameMenuDataUnused + db 01 ; initial selection + +.MomNameMenuDataUnused: + db STATICMENU_CURSOR + db 04 ; items + db "じぶんで きめる@" + db "おかあさん @" + db "ママ@" + db "かあちゃん@" + +SilentHillTextRival2: ; BYTE OFF + text "<RIVAL>『えー かっこわりい！" + line "そんな こどもっぽい" + cont "よびかた してるなんて" + cont "おわらいだぜ！" + cont"あー ちょっとだけ すっきりした！" + + para "そんじゃあ" + line "おれは ひとあし おさきに" + cont "オーキドのところへ" + cont "いくことに するぜ！" + done + +SilentHillTextNorthExit: + text "ちょいまち！" + line "まってよ！ まてっ てば！" + done + +SilentHillTextPokemonInGrassString: + text "きみは まったく" + line "なんにも しらないんだね！" + cont "くさむらでは" + cont "やせいの ポケモンが とびだす！" + + para "じぶんも ポケモンを" + line "もって いれば" + cont "たたかえるんだ⋯⋯" + + para "あっ！ ひょっとして きみは" + line "⋯⋯ちょっと" + cont "ぼくに ついて きて！" + done + +SilentHillTextBackpack: + ld hl, SilentHillTextBackpackString + call OpenTextbox + ret + +SilentHillTextBackpackString: + text "あなたの りュック かっこいいわよ" + line "どこで てに いれたの？" + done + +SilentHillTextPokemonHate: + ld hl, SilentHillTextPokemonHateString + call OpenTextbox + ret + +SilentHillTextPokemonHateString: + text "よのなかに ポケモンが きらいな" + line "ひとは いるのかな？" + done diff --git a/scripts/SilentHillHouse.asm b/scripts/SilentHillHouse.asm new file mode 100644 index 0000000..664283c --- /dev/null +++ b/scripts/SilentHillHouse.asm @@ -0,0 +1,168 @@ +include "constants.asm" + +SECTION "scripts/SilentHillHouse.asm", ROMX + +SilentHillHouseScriptLoader:: + ld hl, SilentHillHouseScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +SilentHillHouseScriptPointers: + dw SilentHillHouseScript1 + dw SilentHillHouseNPCIDs1 + dw SilentHillHouseScript2 + dw SilentHillHouseNPCIDs2 + dw SilentHillHouseScript3 + dw SilentHillHouseNPCIDs1 + +SilentHillHouseScript1: + ld hl, SilentHillHouseNPCIDs1 + ld de, SilentHillHouseTextPointers2 + call CallMapTextSubroutine + ret + +SilentHillHouseScript2: + ld hl, SilentHillHouseNPCIDs2 + ld de, SilentHillHouseTextPointers2 + call CallMapTextSubroutine + ret + +SilentHillHouseScript3: + ld hl, SilentHillHouseNPCIDs1 + ld de, SilentHillHouseTextPointers2 + call CallMapTextSubroutine + ret + +SilentHillHouseNPCIDs1: + db 0 + db $FF + +SilentHillHouseNPCIDs2: + db 0 + db 1 + db $FF + +SilentHillHouseTextPointers2:: + dw SilentHillHouseNPCText1 + dw Function38bd + dw Function3899 + dw Function38b4 + dw Function38ab + dw Function38cf + +SilentHillHouseNPCText1: + ld hl, wd41a + bit 6, [hl] + jr nz, .jump + ld hl, SilentHillHouseTextString1 + call OpenTextbox + ret + +.jump + call RefreshScreen + callab Function1477D + call Function1fea + ret + +SilentHillHouseTextString1: + text "おや？ <RIVAL>あてに メールが" + line "とどいている ようだ" + cont "よんでみる？@" + db $08 + +SilentHillHouseNPCText2: ; (unused due to typo in the text pointers?) + call YesNoBox + jr c, .jump + ld hl, wd41a + set 6, [hl] + ld hl, SilentHillHouseTextString2 + call PrintText + call Function3036 + ret +.jump + ld hl, SilentHillHouseTextString3 + call PrintText + call Function3036 + ret + +SilentHillHouseTextString2: + text "とつぜん メールを さしあげる" + line "しつれいを おゆるしあれ" + + para "じつは きみに どうしても" + line "わたしたい ものが あるのじゃが" + cont "うけとって もらえんかのう" + cont "ポケモンけんきゅうしゃ オーキド" + done + +SilentHillHouseTextString3: + text "ひとのメールは" + line "みちゃ いけないよな<⋯⋯>" + done + +SilentHillHouseTextPointers:: + dw SilentHillHouseNPCText3 + dw SilentHillHouseNPCText4 + +SilentHillHouseNPCText3: + ld hl, SilentHillHouseTextString4 + call OpenTextbox + ret + +SilentHillHouseTextString4: + text "このまえ かわったいろの" + line "ポッポを みかけたわ" + done + +SilentHillHouseNPCText4: + ld hl, wd41e + bit 2, [hl] + jr nz, .jump + ld hl, wd41e + set 2, [hl] + ld hl, SilentHillHouseTextString5 + call OpenTextbox + call WaitBGMap + ld hl, SilentHillHouseTextString6 + jr .skip +.jump + ld hl, SilentHillHouseTextString7 +.skip + call OpenTextbox + ret + +SilentHillHouseTextString5: + text "ケン『ななな" + line "なんだ <PLAYER> じゃないか！" + + para "おれは ちょっと あのー" + line"がっこうの しゅくだいを" + cont "おしえに きてるんだ！" + + para "えっ マップ？" + line "そうか そんな やくそくも してたな" + cont "わかった" + cont "トレーナーギアを かしてみな" + + para "スロットに マップの カセットを " + line "さしこんでっと⋯⋯" + cont "よし これで マップが みれるぞ！" + done + +SilentHillHouseTextString6: + text "もし オールドにいくなら" + line "マサキって やつに あうといい" + + para "おれの ともだちで" + line "すごい ポケモン マニアだ！" + cont "きっと おまえの" + cont "てだすけを してくれるぜ" + done + +SilentHillHouseTextString7: + text "ケン『<PLAYER>" + line "オーキドはかせに みこまれて" + cont "ポケモンずかんを つくるんだって？" + cont "すごいじゃないか がんばれよ" + done diff --git a/scripts/SilentHillLabBack.asm b/scripts/SilentHillLabBack.asm new file mode 100644 index 0000000..622af89 --- /dev/null +++ b/scripts/SilentHillLabBack.asm @@ -0,0 +1,358 @@ +include "constants.asm" + +SECTION "scripts/SilentHillLabBack.asm", ROMX + +SilentHillLabBackScriptLoader:: + ld hl, SilentHillLabBackScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +SilentHillLabBackScriptPointers: + dw SilentHillLabBackScript1 + dw SilentHillLabBackNPCIDs1 + dw SilentHillLabBackScript2 + dw SilentHillLabBackNPCIDs1 + dw SilentHillLabBackScript3 + dw SilentHillLabBackNPCIDs1 + dw SilentHillLabBackRivalChoosePokemon + dw SilentHillLabBackNPCIDs1 + dw SilentHillLabBackScript5 + dw SilentHillLabBackNPCIDs1 + dw SilentHillLabBackScript6 + dw SilentHillLabBackNPCIDs1 + dw SilentHillLabBackScript7 + dw SilentHillLabBackNPCIDs1 + +SilentHillLabBackNPCIDs1: + db 00, 01, 02, 03, 04, $FF +SilentHillLabBackNPCIDs2: + db 00, 01, 04, $FF +SilentHillLabBackNPCIDs3: + db 00, 01, 02, $FF +SilentHillLabBackNPCIDs4: + db 00, 01, 03, $FF + +SilentHillLabBackTextPointers:: + dw SilentHillLabBackText1 + dw SilentHillLabBackFunc3 + dw SilentHillLabBackFunc4 + dw SilentHillLabBackFunc4 + dw SilentHillLabBackFunc4 + +SilentHillLabBackScript1: + ld hl, wJoypadFlags + set 4, [hl] + ld a, 0 + call Function17f9 + ld a, 0 + ld hl, SilentHillLabBackMovement1 + call LoadMovementDataPointer + ld hl, wd41b + set 1, [hl] + ld hl, wc5ed + set 7, [hl] + ld a, 1 + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillLabBackMovement1: + db 09, 09, 05, $32 + +SilentHillLabBackScript2: + ld hl, wc5ed + set 6, [hl] + call Function20f8 + ld a, 3 + ld d, UP + call SetObjectFacing + ld hl, SilentHillLabBackTextString1 + call OpenTextbox + ld hl, SilentHillLabBackTextString10 + call OpenTextbox + ld hl, SilentHillLabBackTextString2 + call OpenTextbox + ld a, 2 + ld [wMapScriptNumber], a + ret + +SilentHillLabBackScript3: + ld hl, SilentHillLabBackNPCIDs1 + ld de, SilentHillLabBackTextPointers2 + call CallMapTextSubroutine + ret + +SilentHillLabBackRivalChoosePokemon: + ld hl, wJoypadFlags + set 4, [hl] + ld a, 3 + call Function17f9 + ld hl, SilentHillLabBackMovementPointers + ld a, [wChosenStarter] + ld d, 0 + ld e, a + add hl, de + add hl, de + ld a, [hl+] + ld h, [hl] + ld l, a + ld a, 3 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 4 + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillLabBackMovementPointers: + dw SilentHillLabBackMovement2+1 + dw SilentHillLabBackMovement2 + dw SilentHillLabBackMovement2+2 + +SilentHillLabBackMovement2: + db $0B, $0B, $0B, $0B, $05, $32 + +SilentHillLabBackScript5: + ld hl, SilentHillLabBackTextString12 + call OpenTextbox + ld a, [wd266] + ld [wNamedObjectIndexBuffer], a + call GetPokemonName + ld hl, SilentHillLabBackTextString13 + call OpenTextbox + ld a, 5 + ld [wMapScriptNumber], a + ret + +SilentHillLabBackScript6: + call Function20f8 + ld hl, wc5ed + res 6, [hl] + ld a, 6 + ld[wMapScriptNumber], a + ret + +SilentHillLabBackScript7: + ld hl, SilentHillLabBackNPCIDs1 + ld de, SilentHillLabBackTextPointers2 + call CallMapTextSubroutine + ret + +SilentHillLabBackText1: + ld hl, wd41b + bit 2, [hl] + ld hl, SilentHillLabBackTextString3 + jr z, .skip + ld hl, SilentHillLabBackTextString9 +.skip + call OpenTextbox + ret + +SilentHillLabBackTextString1: + text "オーキド『ほれ そこに ３びき" + cont "ポケモンが いる じゃろう！" + cont "ほっほ！" + + para "こいつらを きみたちに" + cont "いっぴき づつ やろう！" + cont "⋯⋯ さあ えらべ！" + done + +SilentHillLabBackTextString2: + text "オーキド『まあ" + line "あわてるな <RIVAL>！" + cont "おまえも すきなものを とれ！" + done + +SilentHillLabBackTextString3: + text "オーキド『さあ <PLAYER>" + line "どの ポケモンに するかね？" + done + +SilentHillLabBackTextString4: + text "オーキド『ほう！ ほのおのポケモン" + line "@" + ld bc, wStringBuffer1 + text "に するんじゃな？@" + db 08 + call ConfirmPokemonSelection + call Function3036 + ret + +SilentHillLabBackTextString5: + text "オーキド『ふむ みずのポケモン" + line "@" + ld bc, wStringBuffer1 + text "に きめるのじゃな？@" + db 08 + call ConfirmPokemonSelection + call Function3036 + ret + +SilentHillLabBackTextString6: + text "オーキド『おお！ くさのポケモン" + line "@" + ld bc, wStringBuffer1 + text "が いいんじゃな？@" + db 08 + call ConfirmPokemonSelection + call Function3036 + ret + +ConfirmPokemonSelection: + call YesNoBox + jr c, .bigJump + ld hl, wd41b + set 2, [hl] + ld a, 1 + ld [wd29b], a + ld a, 1 + ld [wd29a], a + ld a, 1 + ld [wd2a0], a + ld hl, SilentHillLabBackTextString8 + call PrintText + ld hl, wJoypadFlags + set 5, [hl] + ld a, [wd265] + ld [wMonDexIndex], a + ld a, 5 + ld [wCurPartyLevel], a + callab Function60a0 + xor a + ld [wPartyMon1 + 1], a + ld a, 3 + ld [wMapScriptNumber], a + ret +.bigJump + ld hl, SilentHillLabBackTextString7 + call PrintText + ret + +SilentHillLabBackTextString7: + text "では" + line "どれに するのじゃ？" + done + +SilentHillLabBackTextString8: + text "オーキド『この ポケモンは" + line "ほんとに げんきが いいぞ！" + + para "<PLAYER>は オーキドはかせから" + line "@" + ld bc, wStringBuffer1 + text "を もらった！<PROMPT>" + +SilentHillLabBackTextString9: + text "オーキド『そうじゃ！" + line "やせいの ポケモンが でて きても" + cont "そいつを たたかわせて いけば" + cont "となりまちへ いける！" + done + +SilentHillLabBackFunc3: + ld hl, wd41b + bit 2, [hl] + ld hl, SilentHillLabBackTextString11 + jr z, .skip + ld hl, SilentHillLabBackTextString14 +.skip + call OpenTextbox + ret + +SilentHillLabBackTextString10: + text "<RIVAL>『あッ！ おれにも！" + line "じいさん おれにもくれよう！" + done + +SilentHillLabBackTextString11: + text "<RIVAL>『いいぜ <PLAYER>！" + line "さきに えらんで！" + cont "おれは こころが ひろいからな" + done + +SilentHillLabBackTextString12: + text "<RIVAL>『じゃ おれは これ！" + done + +SilentHillLabBackTextString13: + text "<RIVAL>は オーキドから" + line "@" + ld bc, wStringBuffer1 + text "を もらった！" + done + +SilentHillLabBackTextString14: + text "<RIVAL>『<PLAYER>の#" + line "いいなあ！" + cont "でも おれのポケモンも" + cont "ちょっと いいだろ？" + done + +SilentHillLabBackFunc4: + ld hl, wd41b + bit 2, [hl] + jr nz, .bigjump + ldh a, [hFFEA] + sub 2 + ld [wChosenStarter], a + ld d, 0 + ld e, a + ld hl, SilentHillLabBackStarterData + add hl, de + add hl, de + add hl, de + add hl, de + ld a, [hl+] + ld [wd265], a + push hl + ld [wNamedObjectIndexBuffer], a + callba Function6734 + ld a, [wd265] + ld [wNamedObjectIndexBuffer], a + call GetPokemonName + pop hl + push hl + ld a, [hl+] + ld h, [hl] + ld l, a + call OpenTextbox + pop hl + inc hl + inc hl + ld a, [hl] + ld [wd266], a + ret +.bigjump + ld hl, SilentHillLabBackTextString15 + call OpenTextbox + ret + +SilentHillLabBackStarterData: + db DEX_HONOGUMA + dw SilentHillLabBackTextString4 + db DEX_KURUSU + + db DEX_KURUSU + dw SilentHillLabBackTextString5 + db DEX_HAPPA + + db DEX_HAPPA + dw SilentHillLabBackTextString6 + db DEX_HONOGUMA + +SilentHillLabBackTextString15: + text "オーキド『これ！" + line "よくばっちゃ いかん！" + done + +SilentHillLabBackTextPointers2: + dw Function3899 + dw Function3899 + dw Function3899 + dw Function3899 + dw MapDefaultText diff --git a/scripts/SilentHillLabFront.asm b/scripts/SilentHillLabFront.asm new file mode 100644 index 0000000..a380f4a --- /dev/null +++ b/scripts/SilentHillLabFront.asm @@ -0,0 +1,1106 @@ +include "constants.asm" + +SECTION "scripts/SilentHillLabFront.asm", ROMX + +SilentHillLabFrontScriptLoader:: + ld hl, SilentHillLabFrontScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +SilentHillLabFrontScriptPointers: + dw SilentHillLabFrontScript1 + dw SilentHillLabFrontNPCIDs1 + + dw SilentHillLabFrontScript2 + dw SilentHillLabFrontNPCIDs2 + + dw SilentHillLabFrontScript3 + dw SilentHillLabFrontNPCIDs2 + + dw SilentHillLabFrontScript4 + dw SilentHillLabFrontNPCIDs2 + + dw SilentHillLabFrontConversation1 + dw SilentHillLabFrontNPCIDs2 + + dw SilentHillLabFrontScript6 + dw SilentHillLabFrontNPCIDs3 + + dw SilentHillLabFrontScript7 + dw SilentHillLabFrontNPCIDs4 + + dw SilentHillLabFrontScript8 + dw SilentHillLabFrontNPCIDs5 + + dw SilentHillLabFrontScript9 + dw SilentHillLabFrontNPCIDs5 + + dw SilentHillLabFrontScript10 + dw SilentHillLabFrontNPCIDs5 + + dw SilentHillLabFrontScript11 + dw SilentHillLabFrontNPCIDs5 + + dw SilentHillLabFrontScript12 + dw SilentHillLabFrontNPCIDs6 + + dw SilentHillLabFrontScript13 + dw SilentHillLabFrontNPCIDs6 + + dw SilentHillLabFrontScript14 + dw SilentHillLabFrontNPCIDs6 + + dw SilentHillLabFrontScript15 + dw SilentHillLabFrontNPCIDs7 + + dw SilentHillLabFrontScript16 + dw SilentHillLabFrontNPCIDs7 + + dw SilentHillLabFrontScript17 + dw SilentHillLabFrontNPCIDs7 + + dw SilentHillLabFrontScript18 + dw SilentHillLabFrontNPCIDs7 + + dw SilentHillLabFrontScript19 + dw SilentHillLabFrontNPCIDs9 + +SilentHillLabFrontNPCIDs1: + db $02 + db $09 + db $0A + db $FF +SilentHillLabFrontNPCIDs2: + db $00 + db $02 + db $04 + db $09 + db $0A + db $FF +SilentHillLabFrontNPCIDs3: + db $02 + db $04 + db $09 + db $0A + db $FF +SilentHillLabFrontNPCIDs4: + db $04 + db $09 + db $0A + db $FF +SilentHillLabFrontNPCIDs5: + db $01 + db $03 + db $05 + db $06 + db $07 + db $08 + db $09 + db $0A + db $FF +SilentHillLabFrontNPCIDs6: + db $01 + db $03 + db $05 + db $06 + db $07 + db $08 + db $FF +SilentHillLabFrontNPCIDs7: + db $00 + db $05 + db $06 + db $07 + db $08 + db $FF +SilentHillLabFrontNPCIDs8: ; (unused?) + db $00 + db $03 + db $05 + db $06 + db $07 + db $08 + db $09 + db $0A + db $FF +SilentHillLabFrontNPCIDs9: + db $00 + db $07 + db $08 + db $FF + +SilentHillLabFrontTextPointers:: + dw SilentHillLabFrontText4 + dw SilentHillLabFrontText7 + dw SilentHillLabFrontText10 + dw SilentHillLabFrontText11 + dw SilentHillLabFrontTextString20 + dw SilentHillLabFrontText12 + dw SilentHillLabFrontText13 + dw SilentHillLabFrontText14 + dw SilentHillLabFrontText15 + dw SilentHillLabFrontText16 + dw SilentHillLabFrontText16 + +SilentHillLabFrontScript1: + call SilentHillLabFrontMoveDown + ret z + ld hl, SilentHillLabFrontNPCIDs1 + ld de, SilentHillLabFrontTextPointers2 + call CallMapTextSubroutine + ret + +SilentHillLabFrontMoveDown: + ld a, [wXCoord] + cp 4 + ret nz + ld a, [wYCoord] + cp 1 + ret nz + ldh a, [hJoyState] + bit 6, a + jp z, SetFFInAccumulator + call SilentHillLabFrontText3 + ld hl, wJoypadFlags + set 4, [hl] + ld a, 0 + call Function17f9 + ld a, 0 + ld hl, SilentHillLabFrontMovement1 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 1 + call WriteIntod637 + call ClearAccumulator + ret + +SilentHillLabFrontMovement1: + db $06, $32 + +SilentHillLabFrontScript2: + ld a, 2 + ld [wMapScriptNumber], a + ret + +SilentHillLabFrontScript3: + ld a, 6 + call Function17f9 + ld a, 0 + call Function186a + ld b, 6 + ld c, 0 + call StartFollow + ld hl, SilentHillLabFrontMovement2 + ld a, 6 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 3 + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillLabFrontMovement2: + db 09, 09, 09, 09, 09, 09, 09, 09, 09, 05, 07, 01, $32 + +SilentHillLabFrontScript4: + call Function1828 + ld a, 4 + ld [wMapScriptNumber], a + ret + +SilentHillLabFrontConversation1: + ld a, 4 + ld d, RIGHT + call SetObjectFacing + ld hl, SilentHillLabFrontTextString20 + call OpenTextbox + ld hl, SilentHillLabFrontTextString4 + call OpenTextbox + ld a, 4 + ld d, UP + call SetObjectFacing + ld hl, SilentHillLabFrontTextString28 + call OpenTextbox + ld hl, SilentHillLabFrontTextString5 + call OpenTextbox + ld a, 4 + ld d, RIGHT + call SetObjectFacing + ld hl, SilentHillLabFrontTextString29 + call OpenTextbox + ld hl, SilentHillLabFrontTextString7 + call OpenTextbox + call SilentHillLabFrontScript5 + ret + +SilentHillLabFrontScript5: + ld hl, wJoypadFlags + set 4, [hl] + ld a, 2 + call Function17f9 + ld a, 2 + ld hl, SilentHillLabFrontMovement3 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 5 + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillLabFrontMovement3: + db 9, 5, $33 + +SilentHillLabFrontScript6: + ld hl, wJoypadFlags + set 4, [hl] + ld a, 4 + call Function17f9 + ld a, 4 + ld hl, SilentHillLabFrontMovement4 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 6 + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillLabFrontMovement4: + db $0D, $0D, $0F, $0D, $0D, $33 + +SilentHillLabFrontScript7: + ld hl, wJoypadFlags + set 4, [hl] + ld a, 0 + call Function17f9 + ld a, 0 + ld hl, SilentHillLabFrontMovement5 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 7 + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillLabFrontMovement5: + db 09, 09, 09, 05, $32 + +SilentHillLabFrontScript8: + ld a, 3 + call Function1989 + ld a, 5 + call Function1989 + ld hl, wJoypadFlags + set 4, [hl] + ld a, 0 + call Function17f9 + ld a, 0 + ld hl, SilentHillLabFrontMovement6 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 8 + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillLabFrontMovement6: + db 8, 8, 8, $0A, 6, $32 + +SilentHillLabFrontScript9: + ld hl, wJoypadFlags + set 4, [hl] + ld a, 5 + call Function17f9 + ld a, 5 + call Function197e + ld a, 5 + ld hl, SilentHillLabFrontMovement7 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, 9 + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillLabFrontMovement7: + db $08, $08, $08, $08, $0A, $06, $32 + +SilentHillLabFrontScript10: + ld a, 5 + ld d, RIGHT + call SetObjectFacing + ld hl, SilentHillLabFrontTextString21 + call OpenTextbox + ld hl, wJoypadFlags + set 4, [hl] + ld a, 0 + ld d, RIGHT + call SetObjectFacing + ld a, 5 + ld d, RIGHT + call SetObjectFacing + ld a, 3 + call Function17f9 + ld a, 3 + call Function197e + ld a, 3 + ld hl, SilentHillLabFrontMovement8 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, $0A + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillLabFrontMovement8: + db $08, $04, $32 + +SilentHillLabFrontScript11: + ld hl, SilentHillLabFrontTextString8 + call OpenTextbox + ld hl, SilentHillLabFrontTextString9 + call OpenTextbox + ld a, $0B + call Function1617 + ld a, $0C + call Function1617 + ld hl, SilentHillLabFrontTextString10 + call OpenTextbox + ld hl, SilentHillLabFrontTextString15 + call OpenTextbox + ld hl, wd41c + set 4, [hl] + call Function20f8 + ld a, $0B + ld [wMapScriptNumber], a + call InitUnknownBuffercc9e + ret + +SilentHillLabFrontScript12: + call SilentHillLabFrontMoveDown + ret z + call SilentHillLabFrontRivalMovePokemon + ret z + ld hl, SilentHillLabFrontNPCIDs6 + ld de, SilentHillLabFrontTextPointers2 + call CallMapTextSubroutine + ret + +SilentHillLabFrontRivalMovePokemon: + ld a, [wYCoord] + cp 8 + ret nz + ld hl, SilentHillLabFrontMovement9 + ld a, [wXCoord] + cp 3 + jr z, .jump + cp 4 + ret nz + ld hl, SilentHillLabFrontMovement10 +.jump + push hl + ld hl, wJoypadFlags + set 4, [hl] + ld a, 5 + call Function17f9 + pop hl + ld a, 5 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, $0C + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + call ClearAccumulator + ret + +SilentHillLabFrontMovement9: + db $08, $0B, $0B, $08, $08, $04, $32 + +SilentHillLabFrontMovement10: + db $08, $0B, $08, $08, $04, $32 + +SilentHillLabFrontScript13: + ld hl, SilentHillLabFrontTextString17 + call OpenTextbox + call GetLabPokemon + ld hl, wc5ed + set 7, [hl] + ld a, 8 + ld [wd637], a + ld a, $0D + ld [wMapScriptNumber], a + call InitUnknownBuffercc9e + ret + +GetLabPokemon: + ld hl, LabPokemon + ld a, [wd266] + ld b, a +.loop + ld a, [hl+] + cp b + jr nz, .jump + ld a, [hl] + ld [wce05], a + ld a, 9 + ld [wce02], a + ret +.jump + inc hl + jr .loop + +LabPokemon: + db DEX_KURUSU + db 1 + db DEX_HAPPA + db 2 + db DEX_HONOGUMA + db 3 + +SilentHillLabFrontScript14: + ld hl, SilentHillLabFrontTextString19 + ld a, [wcd5d] + and a + jr nz, .skip + ld hl, SilentHillLabFrontTextString18 +.skip + call OpenTextbox + ld hl, wJoypadFlags + set 4, [hl] + ld a, 5 + call Function17f9 + ld a, 5 + ld hl, SilentHillLabFrontMovement11 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, $0E + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + ret + +SilentHillLabFrontMovement11: + db $04, $08, $08, $08, $33 + +SilentHillLabFrontScript15: + call Function20f8 + ld a, $0F + ld [wMapScriptNumber], a + call InitUnknownBuffercc9e + ret + +SilentHillLabFrontScript16: + call SilentHillLabFrontMoveDown + ret z + call SilentHillLabFrontMoveRivalLeave + ret z + ld hl, SilentHillLabFrontNPCIDs7 + ld de, SilentHillLabFrontTextPointers2 + call CallMapTextSubroutine + ret + +SilentHillLabFrontMoveRivalLeave: + ld a, [wYCoord] + cp $0B + ret nz + ld hl, Movememt12+1 + ld a, [wXCoord] + cp 3 + jr z, .jump + cp 4 + ret nz + ld hl, Movememt12 +.jump + push hl + ld hl, wJoypadFlags + set 4, [hl] + ld a, 8 + call Function17f9 + pop hl + ld a, 8 + call LoadMovementDataPointer + ld hl, wc5ed + set 7, [hl] + ld a, $10 + ld [wMapScriptNumber], a + ld a, 1 + call WriteIntod637 + call ClearAccumulator + ret + +Movememt12: + db $07, $07, $07, $05, $32 + +SilentHillLabFrontScript17: + ld hl, SilentHillLabFrontTextString23 + call OpenTextbox + ld hl, wd41d + set 2, [hl] + ld hl, wNumBagItems + ld a, 5 + ld [wCurItem], a + ld a, 6 + ld [wItemQuantity], a + call ReceiveItem + call Function20f8 + ld a, $11 + ld [wMapScriptNumber], a + ret + +SilentHillLabFrontScript18: + call SilentHillLabFrontMoveDown + ret z + ld hl, SilentHillLabFrontNPCIDs7 + ld de, SilentHillLabFrontTextPointers2 + call CallMapTextSubroutine + ret + +SilentHillLabFrontScript19: + call SilentHillLabFrontMoveDown + ret z + ld hl, SilentHillLabFrontNPCIDs9 + ld de, SilentHillLabFrontTextPointers2 + call CallMapTextSubroutine + ret + +SilentHillLabFrontTextPointers2: + dw SilentHillLabFrontText1 + dw SilentHillLabFrontText2 + dw Function3899 + dw Function3899 + dw Function3899 + dw Function3899 + dw Function3899 + dw Function3899 + dw Function3899 + dw Function3899 + dw Function3899 + dw Function3899 + dw Function3899 + dw Function3899 + dw SilentHillLabFrontText3 + +SilentHillLabFrontText1: + ld hl, SilentHillLabFrontTextString1 + call OpenTextbox + ret + +SilentHillLabFrontTextString1: + text "パソコンを みると" + line "なんと メールが きていた！" + + para "<⋯⋯> <⋯⋯> <⋯⋯>" + line "オーキドはかせ！" + cont "あなたが ゆくえふめいに" + cont "なっていると せけんは" + cont "おおさわぎ です！" + + para "それは そうと" + line "はかせ から みつけるように" + cont "たのまれた れいの#" + cont "みつけるどころか" + cont "まだ てがかりも" + cont "つかむことが できません" + + para "やはり あいつは" + line "かくうの #なのでは" + cont "ないでしょうか<⋯⋯>" + cont "<⋯⋯> <⋯⋯> <⋯⋯>じょしゅより" + done + +SilentHillLabFrontText2: + ld hl, wd39d + bit 0, [hl] + set 0, [hl] + jr z, .jump + res 0, [hl] + ld hl, SilentHillLabFrontTextString2A + jr .skip +.jump + ld hl, SilentHillLabFrontTextString2B +.skip + call OpenTextbox + ret + +SilentHillLabFrontTextString2A: + text "スタート ボタンを プシュ！" + line "おすと メニューが ひらくなり" + done + +SilentHillLabFrontTextString2B: + text "セーブするには # レポート" + line "こまめに かくと いいなり" + done + +SilentHillLabFrontText3: + ld hl, SilentHillLabFrontTextString3 + call OpenTextbox + ret + +SilentHillLabFrontTextString3: + text "カギが かかっている" + done + +SilentHillLabFrontText4: + ld a, [wMapScriptNumber] + cp $0E + jp nc, SilentHillLabFrontText7 + ld hl, SilentHillLabFrontTextString4 + call OpenTextbox + ret + +SilentHillLabFrontTextString4: + text "オーキド『ごくろうさん！" + done + +SilentHillLabFrontTextString5: + text "オーキド『そうとも！" + line "わしが オーキドじゃ！" + cont "じじいで わるかったな！" + + para "おまえたち ふたりは" + line "この オーキドが よんだのじゃ！" + + para "すこし わしの はなしを" + line "きいては くれんか？@" + db $08 + +SilentHillLabFrontText6: + call YesNoBox + jr c, .jump +.loop + ld hl, SilentHillLabFrontTextString6A + call PrintText + call Function3036 + ret + +.jump + ld hl, SilentHillLabFrontTextString6B + call PrintText + call YesNoBox + jr c, .jump + jr .loop + +SilentHillLabFrontTextString6A: + text "オーキド『いまから １ねんまえ" + line "わしは カントーで" + cont "きみたちの ような しょうねんに" + cont "#の けんきゅうの ため" + cont "#と ずかんを わたした" + + para "そして かれらは" + line "じつに よくやってくれた！" + + para "１５０しゅるいの" + line "#を みつけることに" + cont "せいこう したのじゃ！" + cont "が <⋯⋯> <⋯⋯> <⋯⋯>" + cont "しかし <⋯⋯> <⋯⋯>" + + para "せかいは ひろいものじゃ" + line "そのご ぜんこく かくちで" + cont "あたらしい #が ぞくぞくと" + cont "みつかっておる！" + + para "そこで わしは カントーから" + line "ここ サイレントヒルに" + cont "けんきゅうの ばしょを うつした" + + para "ばしょが かわれば" + line "あたらしい #にも" + cont "であうことが できるからな" + cont "<⋯⋯> <⋯⋯> <⋯⋯> <⋯⋯>" + + para "これからも どんどんと" + line "けんきゅうを すすめるが" + cont "わしも ごらんのとおりの おいぼれ" + cont "まごや じょしゅたちも おるが" + cont "それでも やはり かずが たらん！" + + para "<PLAYER>！ <RIVAL>！" + line "#けんきゅうの ために" + cont "ちからを かして くれんか！" + done + +SilentHillLabFrontTextString6B: + text "オーキド『そうか<⋯⋯>" + line "わしに ひとを みるめが" + cont "なかったと いうことじゃな<⋯⋯>" + + para "いや！" + line "わしの ひとを みるめは" + cont "まちがっては おらんはず！" + + para "な？" + cont "わしの はなしを きいてくれるな？" + done + +SilentHillLabFrontTextString7: + text "オーキド『ふたりとも！" + line "ちょっと わしに ついてこい！" + done + +SilentHillLabFrontText7: + ld a, [wMapScriptNumber] + cp $12 + jr z, .jump + ld hl, SilentHillLabFrontTextString11A + call OpenTextbox + ret + +.jump + ld hl, SilentHillLabFrontTextString11B + call OpenTextbox + ret + +SilentHillLabFrontTextString8: + text "オーキド『<PLAYER>！<RIVAL>！" + line "このずかんを" + cont "おまえたちに あずける！" + done + +SilentHillLabFrontTextString9: + text "<PLAYER>は オーキドから" + line "#ずかんを もらった！" + done + +SilentHillLabFrontTextString10: + text "オーキド『この せかいの すべての" + line "#を きろくした" + cont "かんぺきな ずかんを つくること！" + cont "それが わしの ゆめ だった！" + + para "しかし しんしゅの #は" + cont "ぞくぞくと みつかっている！" + + para "わしに のこされた" + line "じかんは すくない！" + + para "そこで おまえ たちには" + line "わしの かわりに" + cont "ゆめを はたして ほしいのじゃ！" + + para "さあ ふたりとも" + line "さっそく しゅっぱつ してくれい！" + cont "これは #の れきしに のこる" + cont "いだいな しごとじゃー！" + done + +SilentHillLabFrontTextString11A: + text "オーキド『せかい じゅうの" + line "#たちが" + cont "<PLAYER>を まって おるぞー" + done + +SilentHillLabFrontTextString11B: + text "オーキド『おう！ <PLAYER>" + line "どうだ？" + cont "わしの あげた #は<⋯⋯>？" + + para "ほう！" + cont "だいぶ なついた みたいだな" + + para "おまえには #トレーナーの" + line "さいのうが あるかもしれん" + cont "これからも ときどきは" + cont "わしのところへ かおを だせ！" + + para "#ずかんの ぺージが" + line "きに なるからな" + done + +SilentHillLabFrontText8: + ld hl, SilentHillLabFrontTextString12 + call OpenTextbox + ret + +SilentHillLabFrontTextString12: + text "オーキド『よく きたな！" + line "#ずかんの" + cont "ちょうしは どうかな？" + + para "どれ<⋯⋯> ちょっと" + cont "みて あげようか！" + done + +SilentHillLabFrontText9: + ld hl, SilentHillLabFrontTextString13 + call OpenTextbox + ret + +SilentHillLabFrontTextString13: + text "オーキド『<⋯⋯> おっほんッ！" + line "よくやったな <PLAYER>！" + + para "ちょっと" + line "わしに ついて きなさい！" + + para "<RIVAL>は すまんが" + line "そこで まっていなさい！" + + para "<RIVAL>『えー！" + line "なんだよ ケチー！" + + para "オーキド『<RIVAL>は" + line "でんせつの #が" + cont "ほしかった だけじゃないのか？" + cont "<RIVAL>『ギクッ！" + done + +SilentHillLabFrontText10: + ld hl, SilentHillLabFrontTextString14 + call OpenTextbox + ret + +SilentHillLabFrontTextString14: + text "<RIVAL>『なんだ" + line "<PLAYER>じゃないか！" + cont "おれも ここが" + cont "あやしいと おもって きたんだけど" + cont "だれも いないみたいだな<⋯⋯>" + done + +SilentHillLabFrontText11: + ld hl, SilentHillLabFrontTextString16 + call OpenTextbox + ret + +SilentHillLabFrontTextString15: + text "<RIVAL>『よっしゃあ！" + line "じいさん！ おれにまかせな！" + done + +SilentHillLabFrontTextString16: + text "<RIVAL>『おれが えらんだ" + line "#のほうが つよそうだぜ！" + cont "こっちに したかったんじゃないの？" + done + +SilentHillLabFrontTextString17: + text "<RIVAL>『<PLAYER>！" + line "せっかく じいさんに" + cont "# もらったんだから" + cont "<⋯⋯> ちょっと" + cont "たたかわせて みようぜ！" + done + +SilentHillLabFrontTextString18: + text "<RIVAL>『くっそー！" + line "こんどは ぜったい まけないぞ！" + done + +SilentHillLabFrontTextString19: + text "<RIVAL>『よーし！" + line "ほかの #と たたかわせて" + cont "もっと もっと つよくしよう！" + + para "そんじゃ ばいばい！" + done + +SilentHillLabFrontTextString20: + text "じいちゃん！" + line "つれてきたよー！" + done + +SilentHillLabFrontTextString21: + text "ぼくは かつて" + line "#トレーナーの ちょうてんを" + cont "めざしたことが あるんだ" + cont "そのとき いいきに なっていた" + cont "ぼくの てんぐのはなを" + cont "へしおった やつに" + cont "きみは どことなく にている" + + para "あいつの おかげで ぼくは" + line "こころを いれかえて" + cont "じいさんの けんきゅうを" + cont "てつだうように なったのさ" + cont "<⋯⋯> <⋯⋯> <⋯⋯> <⋯⋯> <⋯⋯>" + + para "さあ！" + line "これが #ずかんだ！" + + para "みつけた #の データが" + line "じどうてきに かきこまれて" + cont "ぺージが ふえて いく という" + cont "とても ハイテクな ずかん だよ！" + done + +SilentHillLabFrontText12: + ld hl, SilentHillLabFrontTextString22 + call OpenTextbox + ret + +SilentHillLabFrontTextString22: + text "ぼくも むかし やったけど" + line "なかなか たいへんだよ<⋯⋯>" + cont "がんばってね！" + done + +SilentHillLabFrontText13: + ld hl, SilentHillLabFrontTextString24 + call OpenTextbox + ret + +SilentHillLabFrontTextString23: + text "ナナミ『さっき あなたを " + line "つれてきた わかい おとこのこ<⋯⋯>" + cont "あれは わたしの おとうとなの" + cont "<⋯⋯>ということは つまり" + + para "そう！" + line "わたしも オーキドの まご なの！" + + para "おじいちゃんは りっぱな" + cont "#けんきゅうしゃよ" + cont "わたしは おてつだい できることが" + cont "とっても うれしいの！" + cont "あっ こんなこと しられたら" + cont "おじいちゃん ちょうしに のるから" + cont "ないしょに しておいてね！" + + para "<⋯⋯>おじいちゃん すっかり" + line "わすれている みたいだから" + + para "わたしが かわりに これを あげる！" + line "さいしんがた #りュックよ" + + para "<PLAYER>は" + line "#りュックを もらった！" + + para "ナナミ『この りュックには" + line "モンスターボールを" + cont "まとめて いれられる" + cont "ボールホルダと" + cont "わざマシンを まとめて いれられる" + cont "わざマシンホルダが ついているの" + + para "モンスターボール ６こと " + line "わざマシンひとつは オマケしておくわ" + cont "ホルダに なんにも はいってないと" + cont "さびしいもんね！" + + para "ねえ <PLAYER>くン" + line "あなたの おかあさんが" + cont "しんぱいすると いけないから" + cont "このまちを でるまえに" + cont "かおを みせに いってあげてね" + + para "<⋯⋯>あなたの かつやく" + line "いのっているわ" + done + +SilentHillLabFrontTextString24: + text "<⋯⋯>あなたの かつやく" + line "いのってるわ" + done + +SilentHillLabFrontText14: + ld hl, SilentHillLabFrontTextString25 + call OpenTextbox + ret + +SilentHillLabFrontTextString25: + text "わたしは" + line "はかせの じょしゅ です" + + para "わたしは もちろん" + line "はかせを ソンケー しております" + + para "あなた とは また どこかで" + line "おあい することに" + cont "なるような きがします" + done + +SilentHillLabFrontText15: + ld hl, SilentHillLabFrontTextString26 + call OpenTextbox + ret + +SilentHillLabFrontTextString26: + text "わたしは" + line "はかせの じょしゅ です" + + para "わたしは もちろん" + line "はかせを ソンケー しております" + + para "あなた とは また どこかで" + line "おあい することに" + cont "なるような きがします" + done + +SilentHillLabFrontText16: + ld hl, SilentHillLabFrontTextString27 + call OpenTextbox + ret + +SilentHillLabFrontTextString27: + text "なんだろう？" + line "でんし てちょう かな？" + done + +SilentHillLabFrontText17: + ld hl, SilentHillLabFrontTextString28 + call OpenTextbox + ret + +SilentHillLabFrontTextString28: + text "<RIVAL>『あのメールを くれた" + line "オーキドって こんな じじい<⋯⋯>" + + para "あっ ゴメン" + line "こんな じいさん なのか？" + cont "ほんもの はじめて みたよ！" + done + +SilentHillLabFrontTextString29: + text "<RIVAL>『<PLAYER>！" + line "なんだか" + cont "おもしろく なってきたな！" + done + +SilentHillLabFrontText18: + ld hl, SilentHillLabFrontTextString30 + call OpenTextbox + ret + +SilentHillLabFrontTextString30: + text "わたしは" + line "はかせの じょしゅ です" + + para "あなた とは また どこかで" + line "おあい することに" + cont "なるような きがします" + done + +SilentHillLabFrontText19: + ld hl, SilentHillLabFrontTextString31 + call OpenTextbox + ret + +SilentHillLabFrontTextString31: + text "わたしは" + line "はかせの じょしゅ です" + + para "あなた とは また どこかで" + line "おあい することに" + cont "なるような きがします" + done diff --git a/scripts/SilentHillPokecenter.asm b/scripts/SilentHillPokecenter.asm new file mode 100644 index 0000000..c8e7697 --- /dev/null +++ b/scripts/SilentHillPokecenter.asm @@ -0,0 +1,110 @@ +include "constants.asm" + +SECTION "scripts/SilentHillPokecenter.asm", ROMX + +SilentHillPokecenterScriptLoader:: + ld hl, SilentHillPokecenterScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +SilentHillPokecenterScriptPointers: + dw SilentHillPokecenterScript + dw SilentHillPokecenterNPCIDs + +SilentHillPokecenterScript: + ld hl, SilentHillPokecenterNPCIDs + ld de, SilentHillPokecenterPCPointer + call CallMapTextSubroutine + ret + + dw SilentHillPokecenterNPCIDs + +SilentHillPokecenterNPCIDs: + db 0 + db 1 + db 2 + db 3 + db 4 + db $FF + +SilentHillPokecenterPCPointer: + dw SilentHillPokecenterPCText + +SilentHillPokecenterPCText: + ld hl, SilentHillPokecenterTextString1 + call OpenTextbox + ret + +SilentHillPokecenterTextString1: + text "げんざい ちょうせいちゅうです" + done + +SilentHillPokecenterTextPointers:: + dw SilentHillPokecenterNPCText1 + dw SilentHillPokecenterNPCText2 + dw SilentHillPokecenterNPCText3 + dw SilentHillPokecenterNPCText4 + dw SilentHillPokecenterNPCText5 + +SilentHillPokecenterNPCText1: + ld hl, SilentHillPokecenterTextString2 + call OpenTextbox + ret + +SilentHillPokecenterTextString2: + text "もうしわけありませんが" + line "ただいま しゅうりちゅう でして" + + para "かいふくは できません" + + para "まちから でるときは" + line "じゅうぶんに おきをつけ ください" + done + +SilentHillPokecenterNPCText2: + ld hl, SilentHillPokecenterTextString3 + call OpenTextbox + ret + +SilentHillPokecenterTextString3: + text "あそこに ある パソコンは" + line "トレーナー だったら" + cont "いつでも むりょうで" + cont "つかうことが できるよ" + cont "きが きいてるよな！" + done + +SilentHillPokecenterNPCText3: + ld hl, SilentHillPokecenterTextString4 + call OpenTextbox + ret + +SilentHillPokecenterTextString4: + text "いま じゅんびちゅうの" + line "きかいは すごいらしいよ" + + para "なんでも ときを こえて" + line "ポケモンが こうかん できるって！" + + para "ほんとかな？" + done + +SilentHillPokecenterNPCText4: + ld hl, SilentHillPokecenterTextString5 + call OpenTextbox + ret + +SilentHillPokecenterTextString5: + text "こいつ へルガー" + line "いままでにない タイプの ポケモンさ" + done + +SilentHillPokecenterNPCText5: + ld hl, SilentHillPokecenterTextString6 + call OpenTextbox + ret + +SilentHillPokecenterTextString6: + text "へルガー『ぐるるうー" + done diff --git a/scripts/SlowpokeWellEntrance.asm b/scripts/SlowpokeWellEntrance.asm new file mode 100644 index 0000000..5a46aee --- /dev/null +++ b/scripts/SlowpokeWellEntrance.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SlowpokeWellEntrance.asm", ROMX + +SlowpokeWellEntranceScriptLoader:: + ret + +SlowpokeWellEntranceTextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/SlowpokeWellMain.asm b/scripts/SlowpokeWellMain.asm new file mode 100644 index 0000000..52a3150 --- /dev/null +++ b/scripts/SlowpokeWellMain.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SlowpokeWellMain.asm", ROMX + +SlowpokeWellMainScriptLoader:: + ret + +SlowpokeWellMainTextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText diff --git a/scripts/South.asm b/scripts/South.asm new file mode 100644 index 0000000..335b22f --- /dev/null +++ b/scripts/South.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/South.asm", ROMX + +SouthScriptLoader:: + ret + + db "@" diff --git a/scripts/SouthHouse1.asm b/scripts/SouthHouse1.asm new file mode 100644 index 0000000..62d5eb5 --- /dev/null +++ b/scripts/SouthHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SouthHouse1.asm", ROMX + +SouthHouse1ScriptLoader:: + ret + +SouthHouse1TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/SouthHouse2.asm b/scripts/SouthHouse2.asm new file mode 100644 index 0000000..892d53b --- /dev/null +++ b/scripts/SouthHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SouthHouse2.asm", ROMX + +SouthHouse2ScriptLoader:: + ret + +SouthHouse2TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/SouthMart.asm b/scripts/SouthMart.asm new file mode 100644 index 0000000..7fd6d6e --- /dev/null +++ b/scripts/SouthMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SouthMart.asm", ROMX + +SouthMartScriptLoader:: + ret + +SouthMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/SouthPokecenter1F.asm b/scripts/SouthPokecenter1F.asm new file mode 100644 index 0000000..7eda8f4 --- /dev/null +++ b/scripts/SouthPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SouthPokecenter1F.asm", ROMX + +SouthPokecenter1FScriptLoader:: + ret + +SouthPokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/SouthPokecenter2F.asm b/scripts/SouthPokecenter2F.asm new file mode 100644 index 0000000..662aad9 --- /dev/null +++ b/scripts/SouthPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SouthPokecenter2F.asm", ROMX + +SouthPokecenter2FScriptLoader:: + ret + +SouthPokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Stand.asm b/scripts/Stand.asm new file mode 100644 index 0000000..fa18d9a --- /dev/null +++ b/scripts/Stand.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Stand.asm", ROMX + +StandScriptLoader:: + ret + + db "@" diff --git a/scripts/StandHouse.asm b/scripts/StandHouse.asm new file mode 100644 index 0000000..d8b22a6 --- /dev/null +++ b/scripts/StandHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandHouse.asm", ROMX + +StandHouseScriptLoader:: + ret + +StandHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/StandLab.asm b/scripts/StandLab.asm new file mode 100644 index 0000000..7d6c1fd --- /dev/null +++ b/scripts/StandLab.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandLab.asm", ROMX + +StandLabScriptLoader:: + ret + +StandLabTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/StandLeague1F.asm b/scripts/StandLeague1F.asm new file mode 100644 index 0000000..2ab5b10 --- /dev/null +++ b/scripts/StandLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandLeague1F.asm", ROMX + +StandLeague1FScriptLoader:: + ret + +StandLeague1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/StandLeague2F.asm b/scripts/StandLeague2F.asm new file mode 100644 index 0000000..330cb88 --- /dev/null +++ b/scripts/StandLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandLeague2F.asm", ROMX + +StandLeague2FScriptLoader:: + ret + +StandLeague2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/StandMart.asm b/scripts/StandMart.asm new file mode 100644 index 0000000..2e38c8e --- /dev/null +++ b/scripts/StandMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandMart.asm", ROMX + +StandMartScriptLoader:: + ret + +StandMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/StandOffice.asm b/scripts/StandOffice.asm new file mode 100644 index 0000000..49992d5 --- /dev/null +++ b/scripts/StandOffice.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandOffice.asm", ROMX + +StandOfficeScriptLoader:: + ret + +StandOfficeTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/StandPokecenter1F.asm b/scripts/StandPokecenter1F.asm new file mode 100644 index 0000000..9286342 --- /dev/null +++ b/scripts/StandPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandPokecenter1F.asm", ROMX + +StandPokecenter1FScriptLoader:: + ret + +StandPokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/StandPokecenter2F.asm b/scripts/StandPokecenter2F.asm new file mode 100644 index 0000000..a465526 --- /dev/null +++ b/scripts/StandPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandPokecenter2F.asm", ROMX + +StandPokecenter2FScriptLoader:: + ret + +StandPokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/StandRocketHouse1F.asm b/scripts/StandRocketHouse1F.asm new file mode 100644 index 0000000..1082531 --- /dev/null +++ b/scripts/StandRocketHouse1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandRocketHouse1F.asm", ROMX + +StandRocketHouse1FScriptLoader:: + ret + +StandRocketHouse1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/StandRocketHouse2F.asm b/scripts/StandRocketHouse2F.asm new file mode 100644 index 0000000..5ef5b09 --- /dev/null +++ b/scripts/StandRocketHouse2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandRocketHouse2F.asm", ROMX + +StandRocketHouse2FScriptLoader:: + ret + +StandRocketHouse2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/StandRoute.asm b/scripts/StandRoute.asm new file mode 100644 index 0000000..8513894 --- /dev/null +++ b/scripts/StandRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandRoute.asm", ROMX + +StandRouteScriptLoader:: + ret + + db "@" diff --git a/scripts/StandRouteGateKanto.asm b/scripts/StandRouteGateKanto.asm new file mode 100644 index 0000000..46a839c --- /dev/null +++ b/scripts/StandRouteGateKanto.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/StandRouteGateKanto.asm", ROMX + +StandRouteGateKantoScriptLoader:: + ret + +StandRouteGateKantoTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Sugar.asm b/scripts/Sugar.asm new file mode 100644 index 0000000..3dd07e9 --- /dev/null +++ b/scripts/Sugar.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Sugar.asm", ROMX + +SugarScriptLoader:: + ret + + db "@" diff --git a/scripts/SugarHouse.asm b/scripts/SugarHouse.asm new file mode 100644 index 0000000..1688252 --- /dev/null +++ b/scripts/SugarHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SugarHouse.asm", ROMX + +SugarHouseScriptLoader:: + ret + +SugarHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/SugarHouse2.asm b/scripts/SugarHouse2.asm new file mode 100644 index 0000000..90e59af --- /dev/null +++ b/scripts/SugarHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SugarHouse2.asm", ROMX + +SugarHouse2ScriptLoader:: + ret + +SugarHouse2TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/SugarMart.asm b/scripts/SugarMart.asm new file mode 100644 index 0000000..29baf4f --- /dev/null +++ b/scripts/SugarMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SugarMart.asm", ROMX + +SugarMartScriptLoader:: + ret + +SugarMartTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/SugarPokecenter1F.asm b/scripts/SugarPokecenter1F.asm new file mode 100644 index 0000000..f04e4ad --- /dev/null +++ b/scripts/SugarPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SugarPokecenter1F.asm", ROMX + +SugarPokecenter1FScriptLoader:: + ret + +SugarPokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/SugarPokecenter2F.asm b/scripts/SugarPokecenter2F.asm new file mode 100644 index 0000000..5ec3ff6 --- /dev/null +++ b/scripts/SugarPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SugarPokecenter2F.asm", ROMX + +SugarPokecenter2FScriptLoader:: + ret + +SugarPokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/SugarRoute.asm b/scripts/SugarRoute.asm new file mode 100644 index 0000000..c417796 --- /dev/null +++ b/scripts/SugarRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SugarRoute.asm", ROMX + +SugarRouteScriptLoader:: + ret + + db "@" diff --git a/scripts/SugarRouteGate.asm b/scripts/SugarRouteGate.asm new file mode 100644 index 0000000..f81aa0a --- /dev/null +++ b/scripts/SugarRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/SugarRouteGate.asm", ROMX + +SugarRouteGateScriptLoader:: + ret + +SugarRouteGateTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/UnusedMap13.asm b/scripts/UnusedMap13.asm new file mode 100644 index 0000000..b96574e --- /dev/null +++ b/scripts/UnusedMap13.asm @@ -0,0 +1,28 @@ +include "constants.asm" + +SECTION "scripts/UnusedMap13.asm", ROMX + +UnusedMap13ScriptLoader:: + ld hl, UnusedMap13ScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +UnusedMap13ScriptPointers: + dw UnusedMap13Script + dw UnusedMap13NPCIDs + +UnusedMap13NPCIDs: + db $FF + +UnusedMap13SignPointers: + dw MapDefaultText + +UnusedMap13TextPointers:: + dw MapDefaultText + +UnusedMap13Script: + ld hl, UnusedMap13NPCIDs + ld de, UnusedMap13SignPointers + call CallMapTextSubroutine + ret diff --git a/scripts/West.asm b/scripts/West.asm new file mode 100644 index 0000000..44e9ef6 --- /dev/null +++ b/scripts/West.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/West.asm", ROMX + +WestScriptLoader:: + ret + + db "@" diff --git a/scripts/WestGym.asm b/scripts/WestGym.asm new file mode 100644 index 0000000..e13c33d --- /dev/null +++ b/scripts/WestGym.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestGym.asm", ROMX + +WestGymScriptLoader:: + ret + +WestGymTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestHouse1.asm b/scripts/WestHouse1.asm new file mode 100644 index 0000000..962bf9c --- /dev/null +++ b/scripts/WestHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestHouse1.asm", ROMX + +WestHouse1ScriptLoader:: + ret + +WestHouse1TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestHouse2.asm b/scripts/WestHouse2.asm new file mode 100644 index 0000000..80e9632 --- /dev/null +++ b/scripts/WestHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestHouse2.asm", ROMX + +WestHouse2ScriptLoader:: + ret + +WestHouse2TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestMart1F.asm b/scripts/WestMart1F.asm new file mode 100644 index 0000000..e7da65a --- /dev/null +++ b/scripts/WestMart1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestMart1F.asm", ROMX + +WestMart1FScriptLoader:: + ret + +WestMart1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestMart2F.asm b/scripts/WestMart2F.asm new file mode 100644 index 0000000..59b7859 --- /dev/null +++ b/scripts/WestMart2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestMart2F.asm", ROMX + +WestMart2FScriptLoader:: + ret + +WestMart2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestMart3F.asm b/scripts/WestMart3F.asm new file mode 100644 index 0000000..a06dccb --- /dev/null +++ b/scripts/WestMart3F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestMart3F.asm", ROMX + +WestMart3FScriptLoader:: + ret + +WestMart3FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestMart4F.asm b/scripts/WestMart4F.asm new file mode 100644 index 0000000..ccde786 --- /dev/null +++ b/scripts/WestMart4F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestMart4F.asm", ROMX + +WestMart4FScriptLoader:: + ret + +WestMart4FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestMart5F.asm b/scripts/WestMart5F.asm new file mode 100644 index 0000000..63cd740 --- /dev/null +++ b/scripts/WestMart5F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestMart5F.asm", ROMX + +WestMart5FScriptLoader:: + ret + +WestMart5FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestMart6F.asm b/scripts/WestMart6F.asm new file mode 100644 index 0000000..e2d0e55 --- /dev/null +++ b/scripts/WestMart6F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestMart6F.asm", ROMX + +WestMart6FScriptLoader:: + ret + +WestMart6FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestMartElevator.asm b/scripts/WestMartElevator.asm new file mode 100644 index 0000000..cf16f0a --- /dev/null +++ b/scripts/WestMartElevator.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestMartElevator.asm", ROMX + +WestMartElevatorScriptLoader:: + ret + +WestMartElevatorTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestPokecenter1F.asm b/scripts/WestPokecenter1F.asm new file mode 100644 index 0000000..6485294 --- /dev/null +++ b/scripts/WestPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestPokecenter1F.asm", ROMX + +WestPokecenter1FScriptLoader:: + ret + +WestPokecenter1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestPokecenter2F.asm b/scripts/WestPokecenter2F.asm new file mode 100644 index 0000000..70e7e77 --- /dev/null +++ b/scripts/WestPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestPokecenter2F.asm", ROMX + +WestPokecenter2FScriptLoader:: + ret + +WestPokecenter2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestRadioTower1F.asm b/scripts/WestRadioTower1F.asm new file mode 100644 index 0000000..f00f505 --- /dev/null +++ b/scripts/WestRadioTower1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestRadioTower1F.asm", ROMX + +WestRadioTower1FScriptLoader:: + ret + +WestRadioTower1FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestRadioTower2F.asm b/scripts/WestRadioTower2F.asm new file mode 100644 index 0000000..3bc4c53 --- /dev/null +++ b/scripts/WestRadioTower2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestRadioTower2F.asm", ROMX + +WestRadioTower2FScriptLoader:: + ret + +WestRadioTower2FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestRadioTower3F.asm b/scripts/WestRadioTower3F.asm new file mode 100644 index 0000000..002d109 --- /dev/null +++ b/scripts/WestRadioTower3F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestRadioTower3F.asm", ROMX + +WestRadioTower3FScriptLoader:: + ret + +WestRadioTower3FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestRadioTower4F.asm b/scripts/WestRadioTower4F.asm new file mode 100644 index 0000000..66d4aed --- /dev/null +++ b/scripts/WestRadioTower4F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestRadioTower4F.asm", ROMX + +WestRadioTower4FScriptLoader:: + ret + +WestRadioTower4FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestRadioTower5F.asm b/scripts/WestRadioTower5F.asm new file mode 100644 index 0000000..f45fb6e --- /dev/null +++ b/scripts/WestRadioTower5F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestRadioTower5F.asm", ROMX + +WestRadioTower5FScriptLoader:: + ret + +WestRadioTower5FTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/WestRocketRaidedHouse.asm b/scripts/WestRocketRaidedHouse.asm new file mode 100644 index 0000000..4fa6632 --- /dev/null +++ b/scripts/WestRocketRaidedHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/WestRocketRaidedHouse.asm", ROMX + +WestRocketRaidedHouseScriptLoader:: + ret + +WestRocketRaidedHouseTextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/dummy_text_pointers.asm b/scripts/dummy_text_pointers.asm new file mode 100644 index 0000000..95f2c79 --- /dev/null +++ b/scripts/dummy_text_pointers.asm @@ -0,0 +1,51 @@ +INCLUDE "constants.asm" + +SECTION "scripts/dummy_text_pointers.asm", ROMX +OldCityTextPointers:: +WestTextPointers:: +HaitekuTextPointers:: +FontoTextPointers:: +BaadonTextPointers:: +NewtypeTextPointers:: +SugarTextPointers:: +BullForestTextPointers:: +StandTextPointers:: +KantoTextPointers:: +PrinceTextPointers:: +MtFujiTextPointers:: +SouthTextPointers:: +NorthTextPointers:: +Route2TextPointers:: +HaitekuWestRouteTextPointers:: +HaitekuWestRouteOceanTextPointers:: +FontoRoute1TextPointers:: +FontoRoute6TextPointers:: +FontoRoute2TextPointers:: +FontoRoute4TextPointers:: +FontoRoute3TextPointers:: +BaadonRoute1TextPointers:: +BaadonRoute2TextPointers:: +BaadonRoute3TextPointers:: +Route15TextPointers:: +NewtypeRouteTextPointers:: +Route18TextPointers:: +BullForestRoute1TextPointers:: +SugarRouteTextPointers:: +BullForestRoute2TextPointers:: +StandRouteTextPointers:: +KantoEastRouteTextPointers:: +RouteSilentEastTextPointers:: +PrinceRouteTextPointers:: +MtFujiRouteTextPointers:: +FontoRoute5TextPointers:: +BullForestRoute3TextPointers:: + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText |