diff options
813 files changed, 11813 insertions, 3028 deletions
@@ -5,7 +5,7 @@ *.sym *.map *.sav -*.sn1 +*.sn* *.rtc !shim.sym @@ -23,6 +23,7 @@ shim.asm tools/scan_includes tools/pkmncompress tools/gfx +tools/fix_sections_directory.py *.exe *.pyc @@ -33,4 +34,6 @@ tools/gfx # extra utilities coverage.png coverage.log -pokegold-spaceworld.link +temp/ +pokegold-spaceworld-gen.link +*.txt
\ No newline at end of file @@ -9,18 +9,18 @@ RGBGFX := rgbgfx RGBLINK := rgblink RGBFIX := rgbfix sort_sym := tools/sort_symfile.sh -#sort_sym := $(PYTHON3) tools/sort_sym.py RGBASMFLAGS := -h -E -i $(BUILD)/ -DGOLD -DDEBUG=1 tools/gfx := ROM := pokegold-spaceworld.gb +LINKERSCRIPT := pokegold-spaceworld-gen.link BASEROM := baserom.gb SHIM := shim.sym CORRECTEDROM := $(ROM:%.gb=%-correctheader.gb) rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2)) -DIRS := home engine data audio +DIRS := home engine data audio maps ASMFILES := $(call rwildcard, $(DIRS), *.asm) gfx.asm vram.asm sram.asm wram.asm hram.asm OBJS := $(patsubst %.asm, $(BUILD)/%.o, $(ASMFILES)) OBJS += $(BUILD)/shim.o @@ -55,9 +55,10 @@ coverage: $(ROM:.gb=.map) tools/disasm_coverage.py $(PYTHON) tools/disasm_coverage.py -m $< -b 0x40 .PHONY: linkerscript -linkerscript: $(ROM:.gb=.link) +linkerscript: $(ROM:.gb=-gen.link) -%.link: %.map tools/map2link.py +# TODO FIX HARDCODE +%.link: pokegold-spaceworld.map tools/map2link.py $(PYTHON3) tools/map2link.py $< $@ %.map: %.gb @@ -69,7 +70,7 @@ $(CORRECTEDROM): %-correctheader.gb: %.gb cp $(<:.gb=.sym) $(@:.gb=.sym) $(ROM): poke%-spaceworld.gb: $(OBJS) | $(BASEROM) - $(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -O $(BASEROM) -o $@ $^ + $(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -l $(@:.gb=.link) -O $(BASEROM) -o $@ $^ $(RGBFIX) -f lh -k 01 -l 0x33 -m 0x03 -p 0 -r 3 -t "POKEMON2$(shell echo $* | cut -d _ -f 1 | tr '[:lower:]' '[:upper:]')" $@ $(sort_sym) $(@:.gb=.sym) diff --git a/audio/cries.asm b/audio/cries.asm index 3b57f4c..7ceef13 100644 --- a/audio/cries.asm +++ b/audio/cries.asm @@ -1,5 +1,5 @@ INCLUDE "constants.asm" -SECTION "Cries", ROMX[$51CB], BANK[$3C] ; TODO: Temporary, please map 4000-51CA and move this section's base +SECTION "audio/cries.asm", ROMX -CryHeaders:: ; TODO: Rip the data, then INCBIN it +CryHeaders:: ; TODO: Rip the data, then INCBIN it
\ No newline at end of file diff --git a/audio/engine.asm b/audio/engine.asm index e4f3a2f..6fdc555 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Audio", ROMX[$4000], BANK[$3A] +SECTION "audio/engine.asm@Audio", ROMX _DisableAudio:: ; 3a:4000 push hl @@ -208,7 +208,7 @@ Functione80fa: ; 3a:40fa .jumptable ; TODO -SECTION "IsChannelSFXOn", ROMX[$42bd], BANK[$3a] +SECTION "audio/engine.asm@IsChannelSFXOn", ROMX IsChannelSFXOn: ; 3a:42bd ; If it's not a valid channel, return ld a, [wCurChannel] @@ -249,7 +249,7 @@ IsAnySFXOn: ; 3a:42d0 scf ret -SECTION "Functione82f0", ROMX[$42f0], BANK[$3a] +SECTION "audio/engine.asm@Functione82f0", ROMX Functione82f0: ; 3a:42f0 call IncrementTempo call PlayDanger @@ -502,7 +502,7 @@ FadeMusic: ; 3a:43ce ld [wVolume], a ret -SECTION "Audio engine, part 2", ROMX[$4CEE], BANK[$3A] ; TODO: disassemble what's above (gulp) and remove this +SECTION "audio/engine.asm@Audio engine, part 2", ROMX SetGlobalTempo: ; 3a:4cee push bc @@ -612,5 +612,5 @@ _PlayMusic:: ; 3a:4d66 xor a ; TODO -SECTION "Song Header Pointers", ROMX[$52C7], BANK[$3A] -INCLUDE "audio/song_header_pointers.inc" +SECTION "audio/engine.asm@Song Header Pointers", ROMX +INCLUDE "audio/song_header_pointers.inc"
\ No newline at end of file diff --git a/audio/songs/bicycle.asm b/audio/songs/bicycle.asm index 7c773fa..9108c84 100755 --- a/audio/songs/bicycle.asm +++ b/audio/songs/bicycle.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song Bicycle", ROMX[$563e], BANK[$3b] +SECTION "audio/songs/bicycle.asm", ROMX Song_Bicycle:: ; ed63e (3b:563e) db 3 << 6 | 0 @@ -721,4 +721,4 @@ Song_Bicycle_branch_ed96e:: snare7 1 snare7 1 endchannel -; 0xed978 +; 0xed978
\ No newline at end of file diff --git a/audio/songs/evolution.asm b/audio/songs/evolution.asm index 98bfc0e..3a018de 100755 --- a/audio/songs/evolution.asm +++ b/audio/songs/evolution.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song Evolution", ROMX[$5b1c], BANK[$3b] +SECTION "audio/songs/evolution.asm", ROMX Song_Evolution:: ; edb1c (3b:5b1c) db 2 << 6 | 0 @@ -123,4 +123,4 @@ Song_Evolution_branch_edba7:: A_ 2 rest 2 endchannel -; 0xedbbd +; 0xedbbd
\ No newline at end of file diff --git a/audio/songs/heal.asm b/audio/songs/heal.asm index 9ea7368..60e204d 100755 --- a/audio/songs/heal.asm +++ b/audio/songs/heal.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song Heal", ROMX[$55f4], BANK[$3b] +SECTION "audio/songs/heal.asm", ROMX Song_Heal:: ; ed5f4 (3b:55f4) db 2 << 6 | 0 @@ -59,4 +59,4 @@ Song_Heal_Ch2:: ; ed631 (3b:5631) E_ 6 rest 2 endchannel -; 0xed63e +; 0xed63e
\ No newline at end of file diff --git a/audio/songs/leaderbattle.asm b/audio/songs/leaderbattle.asm index e013759..e336b1d 100755 --- a/audio/songs/leaderbattle.asm +++ b/audio/songs/leaderbattle.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song LeaderBattle", ROMX[$4858], BANK[$3b] +SECTION "audio/songs/leaderbattle.asm", ROMX Song_LeaderBattle:: ; ec858 (3b:4858) db 2 << 6 | 0 @@ -1412,4 +1412,4 @@ Song_LeaderBattle_branch_eccc9:: octave 4 G_ 6 loopchannel 0, Song_LeaderBattle_branch_eccc9 -; 0xece31 +; 0xece31
\ No newline at end of file diff --git a/audio/songs/nidorinointro.asm b/audio/songs/nidorinointro.asm index 2124bc1..280e449 100755 --- a/audio/songs/nidorinointro.asm +++ b/audio/songs/nidorinointro.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song NidorinoIntro", ROMX[$4000], BANK[$3b] +SECTION "audio/songs/nidorinointro.asm", ROMX Song_NidorinoIntro:: ; ec000 (3b:4000) db 3 << 6 | 0 @@ -344,4 +344,4 @@ Song_NidorinoIntro_Ch3:: ; ec155 (3b:4155) rest 16 rest 14 endchannel -; 0xec1b9 +; 0xec1b9
\ No newline at end of file diff --git a/audio/songs/none.asm b/audio/songs/none.asm index 746a1c9..57109c5 100755 --- a/audio/songs/none.asm +++ b/audio/songs/none.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song None", ROMX[$52ee], BANK[$3a] +SECTION "audio/songs/none.asm", ROMX Song_None:: ; e92ee (3a:52ee) db 3 << 6 | 0 @@ -17,4 +17,4 @@ Song_None_Ch1:: ; e92fa (3a:52fa) Song_None_Ch2:: ; e92fa (3a:52fa) Song_None_Ch3:: ; e92fa (3a:52fa) endchannel -; 0xe92fb +; 0xe92fb
\ No newline at end of file diff --git a/audio/songs/oakintro.asm b/audio/songs/oakintro.asm index e6d6bb4..c545dae 100755 --- a/audio/songs/oakintro.asm +++ b/audio/songs/oakintro.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song OakIntro", ROMX[$4685], BANK[$3b] +SECTION "audio/songs/oakintro.asm", ROMX Song_OakIntro:: ; ec685 (3b:4685) db 3 << 6 | 0 @@ -442,4 +442,4 @@ Song_OakIntro_branch_ec7e9:: rest 3 loopchannel 0, Song_OakIntro_branch_ec7e9 endchannel -; 0xec858 +; 0xec858
\ No newline at end of file diff --git a/audio/songs/route1.asm b/audio/songs/route1.asm index 0ad9311..35cab89 100755 --- a/audio/songs/route1.asm +++ b/audio/songs/route1.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song Route1", ROMX[$44c2], BANK[$3b] +SECTION "audio/songs/route1.asm", ROMX Song_Route1:: ; ec4c2 (3b:44c2) db 3 << 6 | 0 @@ -423,4 +423,4 @@ Song_Route1_branch_ec625:: snare4 2 loopchannel 0, Song_Route1_branch_ec625 endchannel -; 0xec685 +; 0xec685
\ No newline at end of file diff --git a/audio/songs/spottedrocket.asm b/audio/songs/spottedrocket.asm index aef6bb5..90717c8 100755 --- a/audio/songs/spottedrocket.asm +++ b/audio/songs/spottedrocket.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song SpottedRocket", ROMX[$5978], BANK[$3b] +SECTION "audio/songs/spottedrocket.asm", ROMX Song_SpottedRocket:: ; ed978 (3b:5978) db 2 << 6 | 0 @@ -92,4 +92,4 @@ Song_SpottedRocket_branch_ed9df:: rest 3 A# 4 loopchannel 0, Song_SpottedRocket_branch_ed9df -; 0xed9ea +; 0xed9ea
\ No newline at end of file diff --git a/audio/songs/title.asm b/audio/songs/title.asm index 087980d..38b1823 100755 --- a/audio/songs/title.asm +++ b/audio/songs/title.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song Title", ROMX[$62fe], BANK[$3c] +SECTION "audio/songs/title.asm", ROMX Song_Title:: ; f22fe (3c:62fe) db 3 << 6 | 0 @@ -692,4 +692,4 @@ Song_Title_branch_f2645:: snare2 1 rest 3 endchannel -; 0xf264e +; 0xf264e
\ No newline at end of file diff --git a/audio/songs/trainerbattle.asm b/audio/songs/trainerbattle.asm index a7e9a84..77c1d89 100755 --- a/audio/songs/trainerbattle.asm +++ b/audio/songs/trainerbattle.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song TrainerBattle", ROMX[$4e31], BANK[$3b] +SECTION "audio/songs/trainerbattle.asm", ROMX Song_TrainerBattle:: ; ece31 (3b:4e31) db 2 << 6 | 0 @@ -1869,4 +1869,4 @@ Song_TrainerBattle_branch_ed2f7:: D_ 2 C_ 2 loopchannel 0, Song_TrainerBattle_branch_ed2f7 -; 0xed5f4 +; 0xed5f4
\ No newline at end of file diff --git a/audio/songs/victorytrainer.asm b/audio/songs/victorytrainer.asm index 3fe523e..479df0e 100755 --- a/audio/songs/victorytrainer.asm +++ b/audio/songs/victorytrainer.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song VictoryTrainer", ROMX[$59ea], BANK[$3b] +SECTION "audio/songs/victorytrainer.asm", ROMX Song_VictoryTrainer:: ; ed9ea (3b:59ea) db 2 << 6 | 0 @@ -275,4 +275,4 @@ Song_VictoryTrainer_branch_edacc:: octave 4 A_ 3 loopchannel 0, Song_VictoryTrainer_branch_edacc -; 0xedb1c +; 0xedb1c
\ No newline at end of file diff --git a/audio/songs/viridiancity.asm b/audio/songs/viridiancity.asm index 4b3a35e..0682a5d 100755 --- a/audio/songs/viridiancity.asm +++ b/audio/songs/viridiancity.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Song ViridianCity", ROMX[$41b9], BANK[$3b] +SECTION "audio/songs/viridiancity.asm", ROMX Song_ViridianCity:: ; ec1b9 (3b:41b9) db 3 << 6 | 0 @@ -674,4 +674,4 @@ Song_ViridianCity_branch_ec4bd:: triangle2 2 triangle2 2 endchannel -; 0xec4c2 +; 0xec4c2
\ No newline at end of file diff --git a/compare.sh b/compare.sh new file mode 100644 index 0000000..b52696d --- /dev/null +++ b/compare.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# Compares baserom.gb and pokegold-spaceworld.gb + +# create baserom.txt if necessary +if [ ! -f baserom.txt ]; then + hexdump -C baserom.gb > baserom.txt +fi + +hexdump -C pokegold-spaceworld.gb > pokegold-spaceworld.txt + +diff -u baserom.txt pokegold-spaceworld.txt | less
\ No newline at end of file diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 828b01a..ba2563c 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -27,11 +27,11 @@ ENDM map_const ROUTE_SILENT_EAST_GATE, 5, 4 ; 7 map_const PLAYER_HOUSE_1F, 5, 4 ; 8 map_const PLAYER_HOUSE_2F, 5, 4 ; 9 - map_const SILENT_POKECENTER, 8, 4 ; 10 + map_const SILENT_HILL_POKECENTER, 8, 4 ; 10 map_const SILENT_HILL_HOUSE, 5, 4 ; 11 - map_const SILENT_HILL_LAB, 4, 8 ; 12 - map_const SILENT_HILL_LAB_2, 4, 4 ; 13 - map_const UNUSED_13, 4, 4 ; 14 + map_const SILENT_HILL_LAB_FRONT, 4, 8 ; 12 + map_const SILENT_HILL_LAB_BACK, 4, 4 ; 13 + map_const UNUSED_MAP_13, 4, 4 ; 14 map_const SHIZUKANA_OKA, 25, 18 ; 15 newgroup ; 2 diff --git a/data/collision/collision_type_table.asm b/data/collision/collision_type_table.asm index df3dc33..a4ec2ba 100644 --- a/data/collision/collision_type_table.asm +++ b/data/collision/collision_type_table.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Collision Type Table", ROMX[$4664], BANK[$03] +SECTION "data/collision/collision_type_table.asm", ROMX CollisionTypeTable: ; 03:4664 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $00 @@ -66,4 +66,4 @@ CollisionTypeTable: ; 03:4664 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $F4 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $F8 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $FC - db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, ALWAYS_SOLID ; $100 + db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, ALWAYS_SOLID ; $100
\ No newline at end of file diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 4308b44..1e54451 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -7,7 +7,7 @@ item_attribute: MACRO dn \6, \7 ENDM -SECTION "Item Attributes", ROMX [$68f3], BANK [$01] +SECTION "data/items/attributes.asm", ROMX ItemAttributes:: ; 68f3 ; ITEM_MASTER_BALL @@ -517,4 +517,4 @@ ItemAttributes:: ; 68f3 ; ITEM_HM06 item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ITEM_HM07 - item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY
\ No newline at end of file diff --git a/data/items/names.asm b/data/items/names.asm index 942af41..0036cd6 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "ItemNames", ROMX[$6FEC], BANK[$01] -else -SECTION "ItemNames", ROMX[$6FE9], BANK[$01] -endc +; if DEBUG +SECTION "data/items/names.asm", ROMX +; else +; SECTION "ItemNames", ROMX[$6FE9], BANK[$01] +; endc ItemNames:: db "マスターボール@" ; MASTER_BALL @@ -261,4 +261,4 @@ ItemNames:: db "ひでんマシン０５@" ; HM05 db "ひでんマシン０６@" ; HM06 db "ひでんマシン０７@" ; HM07 - db "しようきんし@" ; FF + db "しようきんし@" ; FF
\ No newline at end of file diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm deleted file mode 100644 index 4ff1d0e..0000000 --- a/data/maps/attributes.asm +++ /dev/null @@ -1,836 +0,0 @@ -INCLUDE "constants.asm" - -map_id: MACRO -;\1: map id - db GROUP_\1, MAP_\1 -ENDM - -map_attributes: MACRO -;\1: map name -;\2: map id -;\3: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none -CURRENT_MAP_WIDTH = \2_WIDTH -CURRENT_MAP_HEIGHT = \2_HEIGHT -\1_MapAttributes:: - db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH - dw \1_Blocks - dw \1_Unk - dw \1_MapScripts - dw \1_MapEvents - db \3 -ENDM - -; Connections go in order: north, south, west, east -connection: MACRO -;\1: direction -;\2: map name -;\3: map id -;\4: final y offset for east/west, x offset for north/south -;\5: map data y offset for east/west, x offset for north/south -;\6: strip length -if "\1" == "north" - map_id \3 - dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5 - dw wOverworldMapBlocks + \4 + 3 - db \6 - db \3_WIDTH - db \3_HEIGHT * 2 - 1 - db (\4 - \5) * -2 - dw wOverworldMapBlocks + \3_HEIGHT * (\3_WIDTH + 6) + 1 -elif "\1" == "south" - map_id \3 - dw \2_Blocks + \5 - dw wOverworldMapBlocks + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3 - db \6 - db \3_WIDTH - db 0 - db (\4 - \5) * -2 - dw wOverworldMapBlocks + \3_WIDTH + 7 -elif "\1" == "west" - map_id \3 - dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3 - dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3) - db \6 - db \3_WIDTH - db (\4 - \5) * -2 - db \3_WIDTH * 2 - 1 - dw wOverworldMapBlocks + \3_WIDTH * 2 + 6 -elif "\1" == "east" - map_id \3 - dw \2_Blocks + (\3_WIDTH * \5) - dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3 - db \6 - db \3_WIDTH - db (\4 - \5) * -2 - db 0 - dw wOverworldMapBlocks + \3_WIDTH + 7 -endc -ENDM - -SECTION "Route2Gate1F", ROMX[$4000], BANK[$25] - map_attributes Route2Gate1F, ROUTE_2_GATE_1F, 0 - -SECTION "Route2Gate2F", ROMX[$407C], BANK[$25] - map_attributes Route2Gate2F, ROUTE_2_GATE_2F, 0 - -SECTION "Route2House", ROMX[$40DC], BANK[$25] - map_attributes Route2House, ROUTE_2_HOUSE, 0 - -SECTION "OldCityMuseum", ROMX[$414A], BANK[$25] - map_attributes OldCityMuseum, OLD_CITY_MUSEUM, 0 - -SECTION "OldCityGym", ROMX[$41CD], BANK[$25] - map_attributes OldCityGym, OLD_CITY_GYM, 0 - -SECTION "OldCityTower1F", ROMX[$4289], BANK[$25] - map_attributes OldCityTower1F, OLD_CITY_TOWER_1F, 0 - -SECTION "OldCityTower2F", ROMX[$4319], BANK[$25] - map_attributes OldCityTower2F, OLD_CITY_TOWER_2F, 0 - -SECTION "OldCityTower3F", ROMX[$439E], BANK[$25] - map_attributes OldCityTower3F, OLD_CITY_TOWER_3F, 0 - -SECTION "OldCityTower4F", ROMX[$4423], BANK[$25] - map_attributes OldCityTower4F, OLD_CITY_TOWER_4F, 0 - -SECTION "OldCityTower5F", ROMX[$44A8], BANK[$25] - map_attributes OldCityTower5F, OLD_CITY_TOWER_5F, 0 - -SECTION "OldCityBillsHouse", ROMX[$44FC], BANK[$25] - map_attributes OldCityBillsHouse, OLD_CITY_BILLS_HOUSE, 0 - -SECTION "OldCityMart", ROMX[$456A], BANK[$25] - map_attributes OldCityMart, OLD_CITY_MART, 0 - -SECTION "OldCityHouse", ROMX[$45EE], BANK[$25] - map_attributes OldCityHouse, OLD_CITY_HOUSE, 0 - -SECTION "OldCityPokecenter1F", ROMX[$466E], BANK[$25] - map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, 0 - -SECTION "OldCityPokecenter2F", ROMX[$46FE], BANK[$25] - map_attributes OldCityPokecenter2F, OLD_CITY_POKECENTER_2F, 0 - -SECTION "OldCityPokecenterTrade", ROMX[$4826], BANK[$25] - map_attributes OldCityPokecenterTrade, OLD_CITY_POKECENTER_TRADE, 0 - -SECTION "OldCityPokecenterBattle", ROMX[$48AC], BANK[$25] - map_attributes OldCityPokecenterBattle, OLD_CITY_POKECENTER_BATTLE, 0 - -SECTION "OldCityPokecenterTimeMachine", ROMX[$492F], BANK[$25] - map_attributes OldCityPokecenterTimeMachine, OLD_CITY_POKECENTER_TIME_MACHINE, 0 - -SECTION "OldCityKurtsHouse", ROMX[$49AC], BANK[$25] - map_attributes OldCityKurtsHouse, OLD_CITY_KURTS_HOUSE, 0 - -SECTION "OldCitySchool", ROMX[$4A26], BANK[$25] - map_attributes OldCitySchool, OLD_CITY_SCHOOL, 0 - -SECTION "Route1Gate1F", ROMX[$4000], BANK[$26] - map_attributes Route1Gate1F, ROUTE_1_GATE_1F, 0 - -SECTION "Route1Gate2F", ROMX[$40DA], BANK[$26] - map_attributes Route1Gate2F, ROUTE_1_GATE_2F, 0 - -SECTION "WestMart1F", ROMX[$4224], BANK[$26] - map_attributes WestMart1F, WEST_MART_1F, 0 - -SECTION "WestMart2F", ROMX[$42A0], BANK[$26] - map_attributes WestMart2F, WEST_MART_2F, 0 - -SECTION "WestMart3F", ROMX[$4374], BANK[$26] - map_attributes WestMart3F, WEST_MART_3F, 0 - -SECTION "WestMart4F", ROMX[$4433], BANK[$26] - map_attributes WestMart4F, WEST_MART_4F, 0 - -SECTION "WestMart5F", ROMX[$44F2], BANK[$26] - map_attributes WestMart5F, WEST_MART_5F, 0 - -SECTION "WestMart6F", ROMX[$4581], BANK[$26] - map_attributes WestMart6F, WEST_MART_6F, 0 - -SECTION "WestMartElevator", ROMX[$460E], BANK[$26] - map_attributes WestMartElevator, WEST_MART_ELEVATOR, 0 - -SECTION "WestRadioTower1F", ROMX[$464B], BANK[$26] - map_attributes WestRadioTower1F, WEST_RADIO_TOWER_1F, 0 - -SECTION "WestRadioTower2F", ROMX[$46CA], BANK[$26] - map_attributes WestRadioTower2F, WEST_RADIO_TOWER_2F, 0 - -SECTION "WestRadioTower3F", ROMX[$4772], BANK[$26] - map_attributes WestRadioTower3F, WEST_RADIO_TOWER_3F, 0 - -SECTION "WestRadioTower4F", ROMX[$4827], BANK[$26] - map_attributes WestRadioTower4F, WEST_RADIO_TOWER_4F, 0 - -SECTION "WestRadioTower5F", ROMX[$48E9], BANK[$26] - map_attributes WestRadioTower5F, WEST_RADIO_TOWER_5F, 0 - -SECTION "WestRocketRaidedHouse", ROMX[$499F], BANK[$26] - map_attributes WestRocketRaidedHouse, WEST_ROCKET_RAIDED_HOUSE, 0 - -SECTION "WestPokecenter1F", ROMX[$4A49], BANK[$26] - map_attributes WestPokecenter1F, WEST_POKECENTER_1F, 0 - -SECTION "WestPokecenter2F", ROMX[$4AE1], BANK[$26] - map_attributes WestPokecenter2F, WEST_POKECENTER_2F, 0 - -SECTION "WestGym", ROMX[$4B5E], BANK[$26] - map_attributes WestGym, WEST_GYM, 0 - -SECTION "WestHouse1", ROMX[$4C1A], BANK[$26] - map_attributes WestHouse1, WEST_HOUSE_1, 0 - -SECTION "WestHouse2", ROMX[$4C9E], BANK[$26] - map_attributes WestHouse2, WEST_HOUSE_2, 0 - -SECTION "HaitekuWestRouteGate", ROMX[$4000], BANK[$27] - map_attributes HaitekuWestRouteGate, HAITEKU_WEST_ROUTE_GATE, 0 - -SECTION "HaitekuPokecenter1F", ROMX[$405B], BANK[$27] - map_attributes HaitekuPokecenter1F, HAITEKU_POKECENTER_1F, 0 - -SECTION "HaitekuPokecenter2F", ROMX[$40EF], BANK[$27] - map_attributes HaitekuPokecenter2F, HAITEKU_POKECENTER_2F, 0 - -SECTION "HaitekuLeague1F", ROMX[$4168], BANK[$27] - map_attributes HaitekuLeague1F, HAITEKU_LEAGUE_1F, 0 - -SECTION "HaitekuLeague2F", ROMX[$4209], BANK[$27] - map_attributes HaitekuLeague2F, HAITEKU_LEAGUE_2F, 0 - -SECTION "HaitekuMart", ROMX[$42A9], BANK[$27] - map_attributes HaitekuMart, HAITEKU_MART, 0 - -SECTION "HaitekuHouse1", ROMX[$4329], BANK[$27] - map_attributes HaitekuHouse1, HAITEKU_HOUSE_1, 0 - -SECTION "HaitekuHouse2", ROMX[$4383], BANK[$27] - map_attributes HaitekuHouse2, HAITEKU_HOUSE_2, 0 - -SECTION "HaitekuImposterOakHouse", ROMX[$43DD], BANK[$27] - map_attributes HaitekuImposterOakHouse, HAITEKU_IMPOSTER_OAK_HOUSE, 0 - -SECTION "HaitekuAquarium1F", ROMX[$4444], BANK[$27] - map_attributes HaitekuAquarium1F, HAITEKU_AQUARIUM_1F, 0 - -SECTION "HaitekuAquarium2F", ROMX[$44CB], BANK[$27] - map_attributes HaitekuAquarium2F, HAITEKU_AQUARIUM_2F, 0 - -SECTION "FontoRouteGate1", ROMX[$4537], BANK[$27] - map_attributes FontoRouteGate1, FONTO_ROUTE_GATE_1, 0 - -SECTION "FontoRouteGate2", ROMX[$4592], BANK[$27] - map_attributes FontoRouteGate2, FONTO_ROUTE_GATE_2, 0 - -SECTION "FontoRouteGate3", ROMX[$45ED], BANK[$27] - map_attributes FontoRouteGate3, FONTO_ROUTE_GATE_3, 0 - -SECTION "FontoRocketHouse", ROMX[$4648], BANK[$27] - map_attributes FontoRocketHouse, FONTO_ROCKET_HOUSE, 0 - -SECTION "FontoMart", ROMX[$46D5], BANK[$27] - map_attributes FontoMart, FONTO_MART, 0 - -SECTION "FontoHouse", ROMX[$4755], BANK[$27] - map_attributes FontoHouse, FONTO_HOUSE, 0 - -SECTION "FontoPokecenter1F", ROMX[$47AF], BANK[$27] - map_attributes FontoPokecenter1F, FONTO_POKECENTER_1F, 0 - -SECTION "FontoPokecenter2F", ROMX[$4843], BANK[$27] - map_attributes FontoPokecenter2F, FONTO_POKECENTER_2F, 0 - -SECTION "FontoLab", ROMX[$48BC], BANK[$27] - map_attributes FontoLab, FONTO_LAB, 0 - -SECTION "BaadonMart", ROMX[$4923], BANK[$27] - map_attributes BaadonMart, BAADON_MART, 0 - -SECTION "BaadonPokecenter1F", ROMX[$49A3], BANK[$27] - map_attributes BaadonPokecenter1F, BAADON_POKECENTER_1F, 0 - -SECTION "BaadonPokecenter2F", ROMX[$4A2A], BANK[$27] - map_attributes BaadonPokecenter2F, BAADON_POKECENTER_2F, 0 - -SECTION "BaadonHouse1", ROMX[$4AA3], BANK[$27] - map_attributes BaadonHouse1, BAADON_HOUSE_1, 0 - -SECTION "BaadonWallpaperHouse", ROMX[$4AF9], BANK[$27] - map_attributes BaadonWallpaperHouse, BAADON_WALLPAPER_HOUSE, 0 - -SECTION "BaadonHouse2", ROMX[$4B42], BANK[$27] - map_attributes BaadonHouse2, BAADON_HOUSE_2, 0 - -SECTION "BaadonLeague1F", ROMX[$4B9C], BANK[$27] - map_attributes BaadonLeague1F, BAADON_LEAGUE_1F, 0 - -SECTION "BaadonLeague2F", ROMX[$4C3D], BANK[$27] - map_attributes BaadonLeague2F, BAADON_LEAGUE_2F, 0 - -SECTION "BaadonRouteGateWest", ROMX[$4CDD], BANK[$27] - map_attributes BaadonRouteGateWest, BAADON_ROUTE_GATE_WEST, 0 - -SECTION "BaadonRouteGateNewtype", ROMX[$4D38], BANK[$27] - map_attributes BaadonRouteGateNewtype, BAADON_ROUTE_GATE_NEWTYPE, 0 - -SECTION "NewtypePokecenter1F", ROMX[$4D93], BANK[$27] - map_attributes NewtypePokecenter1F, NEWTYPE_POKECENTER_1F, 0 - -SECTION "NewtypePokecenter2F", ROMX[$4E27], BANK[$27] - map_attributes NewtypePokecenter2F, NEWTYPE_POKECENTER_2F, 0 - -SECTION "NewtypeLeague1F", ROMX[$4EA0], BANK[$27] - map_attributes NewtypeLeague1F, NEWTYPE_LEAGUE_1F, 0 - -SECTION "NewtypeLeague2F", ROMX[$4F41], BANK[$27] - map_attributes NewtypeLeague2F, NEWTYPE_LEAGUE_2F, 0 - -SECTION "NewtypeSailorHouse", ROMX[$4FE1], BANK[$27] - map_attributes NewtypeSailorHouse, NEWTYPE_SAILOR_HOUSE, 0 - -SECTION "NewtypeMart", ROMX[$503B], BANK[$27] - map_attributes NewtypeMart, NEWTYPE_MART, 0 - -SECTION "NewtypeDojo", ROMX[$50BB], BANK[$27] - map_attributes NewtypeDojo, NEWTYPE_DOJO, 0 - -SECTION "NewtypeHouse1", ROMX[$5155], BANK[$27] - map_attributes NewtypeHouse1, NEWTYPE_HOUSE_1, 0 - -SECTION "NewtypeDiner", ROMX[$51AF], BANK[$27] - map_attributes NewtypeDiner, NEWTYPE_DINER, 0 - -SECTION "NewtypeHouse2", ROMX[$522C], BANK[$27] - map_attributes NewtypeHouse2, NEWTYPE_HOUSE_2, 0 - -SECTION "NewtypeHouse3", ROMX[$5286], BANK[$27] - map_attributes NewtypeHouse3, NEWTYPE_HOUSE_3, 0 - -SECTION "Route15Pokecenter1F", ROMX[$52E0], BANK[$27] - map_attributes Route15Pokecenter1F, ROUTE_15_POKECENTER_1F, 0 - -SECTION "Route15Pokecenter2F", ROMX[$5374], BANK[$27] - map_attributes Route15Pokecenter2F, ROUTE_15_POKECENTER_2F, 0 - -SECTION "NewtypeRouteGate", ROMX[$53C6], BANK[$27] - map_attributes NewtypeRouteGate, NEWTYPE_ROUTE_GATE, 0 - -SECTION "Route18Pokecenter1F", ROMX[$5421], BANK[$27] - map_attributes Route18Pokecenter1F, ROUTE_18_POKECENTER_1F, 0 - -SECTION "Route18Pokecenter2F", ROMX[$54B5], BANK[$27] - map_attributes Route18Pokecenter2F, ROUTE_18_POKECENTER_2F, 0 - -SECTION "SugarRouteGate", ROMX[$5507], BANK[$27] - map_attributes SugarRouteGate, SUGAR_ROUTE_GATE, 0 - -SECTION "SugarHouse", ROMX[$5562], BANK[$27] - map_attributes SugarHouse, SUGAR_HOUSE, 0 - -SECTION "SugarHouse2", ROMX[$55E2], BANK[$27] - map_attributes SugarHouse2, SUGAR_HOUSE_2, 0 - -SECTION "SugarMart", ROMX[$5638], BANK[$27] - map_attributes SugarMart, SUGAR_MART, 0 - -SECTION "SugarPokecenter1F", ROMX[$56B8], BANK[$27] - map_attributes SugarPokecenter1F, SUGAR_POKECENTER_1F, 0 - -SECTION "SugarPokecenter2F", ROMX[$574C], BANK[$27] - map_attributes SugarPokecenter2F, SUGAR_POKECENTER_2F, 0 - -SECTION "BullForestRoute1House", ROMX[$57C5], BANK[$27] - map_attributes BullForestRoute1House, BULL_FOREST_ROUTE_1_HOUSE, 0 - -SECTION "BullForestRouteGateStand", ROMX[$581F], BANK[$27] - map_attributes BullForestRouteGateStand, BULL_FOREST_ROUTE_GATE_STAND, 0 - -SECTION "BullMart", ROMX[$587A], BANK[$27] - map_attributes BullMart, BULL_MART, 0 - -SECTION "BullHouse1", ROMX[$58FA], BANK[$27] - map_attributes BullHouse1, BULL_HOUSE_1, 0 - -SECTION "BullHouse2", ROMX[$5950], BANK[$27] - map_attributes BullHouse2, BULL_HOUSE_2, 0 - -SECTION "BullHouse3", ROMX[$59AA], BANK[$27] - map_attributes BullHouse3, BULL_HOUSE_3, 0 - -SECTION "BullPokecenter1F", ROMX[$5A04], BANK[$27] - map_attributes BullPokecenter1F, BULL_POKECENTER_1F, 0 - -SECTION "BullPokecenter2F", ROMX[$5A98], BANK[$27] - map_attributes BullPokecenter2F, BULL_POKECENTER_2F, 0 - -SECTION "BullLeague1F", ROMX[$5B11], BANK[$27] - map_attributes BullLeague1F, BULL_LEAGUE_1F, 0 - -SECTION "BullLeague2F", ROMX[$5BB2], BANK[$27] - map_attributes BullLeague2F, BULL_LEAGUE_2F, 0 - -SECTION "BullHouse4", ROMX[$5C52], BANK[$27] - map_attributes BullHouse4, BULL_HOUSE_4, 0 - -SECTION "StandRouteGateKanto", ROMX[$5C9F], BANK[$27] - map_attributes StandRouteGateKanto, STAND_ROUTE_GATE_KANTO, 0 - -SECTION "StandLab", ROMX[$5CFA], BANK[$27] - map_attributes StandLab, STAND_LAB, 0 - -SECTION "StandPokecenter1F", ROMX[$5D50], BANK[$27] - map_attributes StandPokecenter1F, STAND_POKECENTER_1F, 0 - -SECTION "StandPokecenter2F", ROMX[$5DE4], BANK[$27] - map_attributes StandPokecenter2F, STAND_POKECENTER_2F, 0 - -SECTION "StandOffice", ROMX[$5E5D], BANK[$27] - map_attributes StandOffice, STAND_OFFICE, 0 - -SECTION "StandMart", ROMX[$5EDD], BANK[$27] - map_attributes StandMart, STAND_MART, 0 - -SECTION "StandHouse", ROMX[$5F5D], BANK[$27] - map_attributes StandHouse, STAND_HOUSE, 0 - -SECTION "StandRocketHouse1F", ROMX[$5FB7], BANK[$27] - map_attributes StandRocketHouse1F, STAND_ROCKET_HOUSE_1F, 0 - -SECTION "StandRocketHouse2F", ROMX[$6024], BANK[$27] - map_attributes StandRocketHouse2F, STAND_ROCKET_HOUSE_2F, 0 - -SECTION "StandLeague1F", ROMX[$6083], BANK[$27] - map_attributes StandLeague1F, STAND_LEAGUE_1F, 0 - -SECTION "StandLeague2F", ROMX[$6124], BANK[$27] - map_attributes StandLeague2F, STAND_LEAGUE_2F, 0 - -SECTION "KantoCeruleanHouse", ROMX[$61C4], BANK[$27] - map_attributes KantoCeruleanHouse, KANTO_CERULEAN_HOUSE, 0 - -SECTION "KantoPokecenter1F", ROMX[$621E], BANK[$27] - map_attributes KantoPokecenter1F, KANTO_POKECENTER_1F, 0 - -SECTION "KantoPokecenter2F", ROMX[$62B2], BANK[$27] - map_attributes KantoPokecenter2F, KANTO_POKECENTER_2F, 0 - -SECTION "KantoLeague1F", ROMX[$632B], BANK[$27] - map_attributes KantoLeague1F, KANTO_LEAGUE_1F, 0 - -SECTION "KantoLeague2F", ROMX[$63CC], BANK[$27] - map_attributes KantoLeague2F, KANTO_LEAGUE_2F, 0 - -SECTION "KantoLavenderHouse", ROMX[$646C], BANK[$27] - map_attributes KantoLavenderHouse, KANTO_LAVENDER_HOUSE, 0 - -SECTION "KantoCeladonMart1F", ROMX[$64D3], BANK[$27] - map_attributes KantoCeladonMart1F, KANTO_CELADON_MART_1F, 0 - -SECTION "KantoCeladonMart2F", ROMX[$6547], BANK[$27] - map_attributes KantoCeladonMart2F, KANTO_CELADON_MART_2F, 0 - -SECTION "KantoCeladonMart3F", ROMX[$65C1], BANK[$27] - map_attributes KantoCeladonMart3F, KANTO_CELADON_MART_3F, 0 - -SECTION "KantoCeladonMart4F", ROMX[$663B], BANK[$27] - map_attributes KantoCeladonMart4F, KANTO_CELADON_MART_4F, 0 - -SECTION "KantoCeladonMart5F", ROMX[$66C2], BANK[$27] - map_attributes KantoCeladonMart5F, KANTO_CELADON_MART_5F, 0 - -SECTION "KantoCeladonElevator", ROMX[$6742], BANK[$27] - map_attributes KantoCeladonElevator, KANTO_CELADON_ELEVATOR, 0 - -SECTION "KantoMart", ROMX[$677F], BANK[$27] - map_attributes KantoMart, KANTO_MART, 0 - -SECTION "KantoGamefreakHQ1", ROMX[$67FF], BANK[$27] - map_attributes KantoGamefreakHQ1, KANTO_GAMEFREAK_HQ_1, 0 - -SECTION "KantoGamefreakHQ2", ROMX[$6899], BANK[$27] - map_attributes KantoGamefreakHQ2, KANTO_GAMEFREAK_HQ_2, 0 - -SECTION "KantoGamefreakHQ3", ROMX[$6905], BANK[$27] - map_attributes KantoGamefreakHQ3, KANTO_GAMEFREAK_HQ_3, 0 - -SECTION "KantoGamefreakHQ4", ROMX[$698B], BANK[$27] - map_attributes KantoGamefreakHQ4, KANTO_GAMEFREAK_HQ_4, 0 - -SECTION "KantoGamefreakHQ5", ROMX[$69E3], BANK[$27] - map_attributes KantoGamefreakHQ5, KANTO_GAMEFREAK_HQ_5, 0 - -SECTION "KantoSilphCo", ROMX[$6A2C], BANK[$27] - map_attributes KantoSilphCo, KANTO_SILPH_CO, 0 - -SECTION "KantoViridianHouse", ROMX[$6ADF], BANK[$27] - map_attributes KantoViridianHouse, KANTO_VIRIDIAN_HOUSE, 0 - -SECTION "KantoGameCorner", ROMX[$6B46], BANK[$27] - map_attributes KantoGameCorner, KANTO_GAME_CORNER, 0 - -SECTION "KantoUnusedArea", ROMX[$6C55], BANK[$27] - map_attributes KantoUnusedArea, KANTO_UNUSED_AREA, 0 - -SECTION "KantoGameCornerPrizes", ROMX[$6C90], BANK[$27] - map_attributes KantoGameCornerPrizes, KANTO_GAME_CORNER_PRIZES, 0 - -SECTION "KantoDiner", ROMX[$6D04], BANK[$27] - map_attributes KantoDiner, KANTO_DINER, 0 - -SECTION "KantoSchool", ROMX[$6D51], BANK[$27] - map_attributes KantoSchool, KANTO_SCHOOL, 0 - -SECTION "KantoHospital", ROMX[$6DEB], BANK[$27] - map_attributes KantoHospital, KANTO_HOSPITAL, 0 - -SECTION "KantoPokecenter21F", ROMX[$6E6B], BANK[$27] - map_attributes KantoPokecenter21F, KANTO_POKECENTER_2_1F, 0 - -SECTION "KantoPokecenter22F", ROMX[$6EFF], BANK[$27] - map_attributes KantoPokecenter22F, KANTO_POKECENTER_2_2F, 0 - -SECTION "KantoRedsHouse", ROMX[$6F78], BANK[$27] - map_attributes KantoRedsHouse, KANTO_REDS_HOUSE, 0 - -SECTION "KantoGreensHouse1F", ROMX[$6FDF], BANK[$27] - map_attributes KantoGreensHouse1F, KANTO_GREENS_HOUSE_1F, 0 - -SECTION "KantoGreensHouse2F", ROMX[$703C], BANK[$27] - map_attributes KantoGreensHouse2F, KANTO_GREENS_HOUSE_2F, 0 - -SECTION "KantoEldersHouse", ROMX[$707E], BANK[$27] - map_attributes KantoEldersHouse, KANTO_ELDERS_HOUSE, 0 - -SECTION "KantoOaksLab", ROMX[$70E5], BANK[$27] - map_attributes KantoOaksLab, KANTO_OAKS_LAB, 0 - -SECTION "KantoLeague21F", ROMX[$713B], BANK[$27] - map_attributes KantoLeague21F, KANTO_LEAGUE_2_1F, 0 - -SECTION "KantoLeague22F", ROMX[$71DC], BANK[$27] - map_attributes KantoLeague22F, KANTO_LEAGUE_2_2F, 0 - -SECTION "KantoFishingGuru", ROMX[$727C], BANK[$27] - map_attributes KantoFishingGuru, KANTO_FISHING_GURU, 0 - -SECTION "SouthHouse1", ROMX[$72D6], BANK[$27] - map_attributes SouthHouse1, SOUTH_HOUSE_1, 0 - -SECTION "SouthPokecenter1F", ROMX[$7330], BANK[$27] - map_attributes SouthPokecenter1F, SOUTH_POKECENTER_1F, 0 - -SECTION "SouthPokecenter2F", ROMX[$73C4], BANK[$27] - map_attributes SouthPokecenter2F, SOUTH_POKECENTER_2F, 0 - -SECTION "SouthMart", ROMX[$743D], BANK[$27] - map_attributes SouthMart, SOUTH_MART, 0 - -SECTION "SouthHouse2", ROMX[$74BD], BANK[$27] - map_attributes SouthHouse2, SOUTH_HOUSE_2, 0 - -SECTION "NorthHouse1", ROMX[$7517], BANK[$27] - map_attributes NorthHouse1, NORTH_HOUSE_1, 0 - -SECTION "NorthMart", ROMX[$7571], BANK[$27] - map_attributes NorthMart, NORTH_MART, 0 - -SECTION "NorthHouse2", ROMX[$75F1], BANK[$27] - map_attributes NorthHouse2, NORTH_HOUSE_2, 0 - -SECTION "NorthPokecenter1F", ROMX[$764B], BANK[$27] - map_attributes NorthPokecenter1F, NORTH_POKECENTER_1F, 0 - -SECTION "NorthPokecenter2F", ROMX[$76DF], BANK[$27] - map_attributes NorthPokecenter2F, NORTH_POKECENTER_2F, 0 - -SECTION "PowerPlant1", ROMX[$4000], BANK[$2F] - map_attributes PowerPlant1, POWER_PLANT_1, 0 - -SECTION "PowerPlant2", ROMX[$407D], BANK[$2F] - map_attributes PowerPlant2, POWER_PLANT_2, 0 - -SECTION "PowerPlant3", ROMX[$40FA], BANK[$2F] - map_attributes PowerPlant3, POWER_PLANT_3, 0 - -SECTION "PowerPlant4", ROMX[$422B], BANK[$2F] - map_attributes PowerPlant4, POWER_PLANT_4, 0 - -SECTION "RuinsOfAlphEntrance", ROMX[$435C], BANK[$2F] - map_attributes RuinsOfAlphEntrance, RUINS_OF_ALPH_ENTRANCE, 0 - -SECTION "RuinsOfAlphMain", ROMX[$43D9], BANK[$2F] - map_attributes RuinsOfAlphMain, RUINS_OF_ALPH_MAIN, 0 - -SECTION "CaveMinecarts1", ROMX[$469F], BANK[$2F] - map_attributes CaveMinecarts1, CAVE_MINECARTS_1, 0 - -SECTION "CaveMinecarts2", ROMX[$482A], BANK[$2F] - map_attributes CaveMinecarts2, CAVE_MINECARTS_2, 0 - -SECTION "CaveMinecarts3", ROMX[$49B5], BANK[$2F] - map_attributes CaveMinecarts3, CAVE_MINECARTS_3, 0 - -SECTION "CaveMinecarts4", ROMX[$4B40], BANK[$2F] - map_attributes CaveMinecarts4, CAVE_MINECARTS_4, 0 - -SECTION "CaveMinecarts5", ROMX[$4CCB], BANK[$2F] - map_attributes CaveMinecarts5, CAVE_MINECARTS_5, 0 - -SECTION "CaveMinecarts6", ROMX[$4E56], BANK[$2F] - map_attributes CaveMinecarts6, CAVE_MINECARTS_6, 0 - -SECTION "CaveMinecarts7", ROMX[$4F2D], BANK[$2F] - map_attributes CaveMinecarts7, CAVE_MINECARTS_7, 0 - -SECTION "Office1", ROMX[$5004], BANK[$2F] - map_attributes Office1, OFFICE_1, 0 - -SECTION "Office2", ROMX[$5081], BANK[$2F] - map_attributes Office2, OFFICE_2, 0 - -SECTION "Office3", ROMX[$51B2], BANK[$2F] - map_attributes Office3, OFFICE_3, 0 - -SECTION "SlowpokeWellEntrance", ROMX[$5289], BANK[$2F] - map_attributes SlowpokeWellEntrance, SLOWPOKE_WELL_ENTRANCE, 0 - -SECTION "SlowpokeWellMain", ROMX[$5306], BANK[$2F] - map_attributes SlowpokeWellMain, SLOWPOKE_WELL_MAIN, 0 - -SECTION "ShizukanaOka", ROMX[$53DD], BANK[$2F] - map_attributes ShizukanaOka, SHIZUKANA_OKA, 0 - -SECTION "RouteSilentEastGate", ROMX[$4000], BANK[$34] - map_attributes RouteSilentEastGate, ROUTE_SILENT_EAST_GATE, 0 - -SECTION "PlayerHouse1F", ROMX[$4042], BANK[$34] - map_attributes PlayerHouse1F, PLAYER_HOUSE_1F, 0 - -SECTION "PlayerHouse2F", ROMX[$4132], BANK[$34] - map_attributes PlayerHouse2F, PLAYER_HOUSE_2F, 0 - -SECTION "SilentPokecenter", ROMX[$45FF], BANK[$34] - map_attributes SilentPokecenter, SILENT_POKECENTER, 0 - -SECTION "SilentHillHouse", ROMX[$47D5], BANK[$34] - map_attributes SilentHillHouse, SILENT_HILL_HOUSE, 0 - -SECTION "SilentHillLab", ROMX[$4AAC], BANK[$34] - map_attributes SilentHillLab, SILENT_HILL_LAB, 0 - -SECTION "SilentHillLab2", ROMX[$5BE6], BANK[$34] - map_attributes SilentHillLab2, SILENT_HILL_LAB_2, 0 - -SECTION "Unused13", ROMX[$605D], BANK[$34] - map_attributes Unused13, UNUSED_13, 0 - -SECTION "SilentHill", ROMX[$4014], BANK[$36] - 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 - -SECTION "OldCity", ROMX[$410D], BANK[$36] - map_attributes OldCity, OLD_CITY, SOUTH | WEST - connection south, Route1P2, ROUTE_1_P2, 5, 0, 10 - connection west, Route2, ROUTE_2, 5, 0, 9 - -SECTION "West", ROMX[$4372], BANK[$36] - map_attributes West, WEST, NORTH | EAST - connection north, BaadonRoute1, BAADON_ROUTE_1, 5, 0, 10 - connection east, Route2, ROUTE_2, 5, 0, 9 - -SECTION "Haiteku", ROMX[$45D2], BANK[$36] - map_attributes Haiteku, HAITEKU, WEST - connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0, 0, 9 - -SECTION "Fonto", ROMX[$47F8], BANK[$36] - 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 - -SECTION "Baadon", ROMX[$48F3], BANK[$36] - 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 - -SECTION "Newtype", ROMX[$49F9], BANK[$36] - 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 - -SECTION "Sugar", ROMX[$4C3A], BANK[$36] - map_attributes Sugar, SUGAR, SOUTH - connection south, SugarRoute, SUGAR_ROUTE, 0, 0, 10 - -SECTION "BullForest", ROMX[$4D05], BANK[$36] - 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 - -SECTION "Stand", ROMX[$4F28], BANK[$36] - map_attributes Stand, STAND, NORTH | SOUTH - connection north, BullForestRoute2, BULL_FOREST_ROUTE_2, 10, 0, 10 - connection south, StandRoute, STAND_ROUTE, 10, 0, 10 - -SECTION "Kanto", ROMX[$519D], BANK[$36] - map_attributes Kanto, KANTO, WEST | EAST - connection west, RouteSilentEast, ROUTE_SILENT_EAST, 9, 0, 9 - connection east, KantoEastRoute, KANTO_EAST_ROUTE, 9, 0, 9 - -SECTION "Prince", ROMX[$55F3], BANK[$36] - map_attributes Prince, PRINCE, NORTH | SOUTH - connection north, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10 - connection south, PrinceRoute, PRINCE_ROUTE, 0, 0, 10 - -SECTION "MtFuji", ROMX[$5677], BANK[$36] - map_attributes MtFuji, MT_FUJI, SOUTH - connection south, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10 - -SECTION "South", ROMX[$56EF], BANK[$36] - 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 - -SECTION "North", ROMX[$5914], BANK[$36] - map_attributes North, NORTH, SOUTH - connection south, BullForestRoute3, BULL_FOREST_ROUTE_3, 0, 0, 10 - -SECTION "Route1P1", ROMX[$59DF], BANK[$36] - 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 - -SECTION "Route1P2", ROMX[$5ABE], BANK[$36] - 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 - -SECTION "Route2", ROMX[$5BD4], BANK[$36] - map_attributes Route2, ROUTE_2, WEST | EAST - connection west, West, WEST, -3, 2, 15 - connection east, OldCity, OLD_CITY, -3, 2, 15 - -SECTION "HaitekuWestRoute", ROMX[$5CC6], BANK[$36] - 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 - -SECTION "HaitekuWestRouteOcean", ROMX[$5DD1], BANK[$36] - 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 - -SECTION "FontoRoute1", ROMX[$5F17], BANK[$36] - map_attributes FontoRoute1, FONTO_ROUTE_1, WEST | EAST - connection west, South, SOUTH, 0, 0, 12 - connection east, Fonto, FONTO, 0, 0, 9 - -SECTION "FontoRoute6", ROMX[$6083], BANK[$36] - 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 - -SECTION "FontoRoute2", ROMX[$61E8], BANK[$36] - map_attributes FontoRoute2, FONTO_ROUTE_2, SOUTH | WEST - connection south, Fonto, FONTO, 0, 0, 10 - connection west, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9 - -SECTION "FontoRoute4", ROMX[$62C6], BANK[$36] - map_attributes FontoRoute4, FONTO_ROUTE_4, SOUTH | WEST - connection south, Baadon, BAADON, 0, 0, 10 - connection west, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9 - -SECTION "FontoRoute3", ROMX[$63B2], BANK[$36] - map_attributes FontoRoute3, FONTO_ROUTE_3, WEST | EAST - connection west, Fonto, FONTO, 0, 0, 9 - connection east, FontoRoute4, FONTO_ROUTE_4, 0, 0, 12 - -SECTION "BaadonRoute1", ROMX[$64BD], BANK[$36] - map_attributes BaadonRoute1, BAADON_ROUTE_1, NORTH | SOUTH - connection north, Baadon, BAADON, 0, 0, 10 - connection south, West, WEST, -3, 2, 16 - -SECTION "BaadonRoute2", ROMX[$6603], BANK[$36] - map_attributes BaadonRoute2, BAADON_ROUTE_2, WEST | EAST - connection west, Baadon, BAADON, 0, 0, 9 - connection east, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 12 - -SECTION "BaadonRoute3", ROMX[$67EF], BANK[$36] - 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 - -SECTION "Route15", ROMX[$68DB], BANK[$36] - map_attributes Route15, ROUTE_15, NORTH | EAST - connection north, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 10 - connection east, Newtype, NEWTYPE, 0, 0, 12 - -SECTION "NewtypeRoute", ROMX[$69BD], BANK[$36] - map_attributes NewtypeRoute, NEWTYPE_ROUTE, WEST | EAST - connection west, Newtype, NEWTYPE, -3, 6, 12 - connection east, Route18, ROUTE_18, -3, 33, 12 - -SECTION "Route18", ROMX[$6A6E], BANK[$36] - 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 - -SECTION "BullForestRoute1", ROMX[$6C6F], BANK[$36] - 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 - -SECTION "SugarRoute", ROMX[$6D8F], BANK[$36] - map_attributes SugarRoute, SUGAR_ROUTE, NORTH | SOUTH - connection north, Sugar, SUGAR, 0, 0, 10 - connection south, Newtype, NEWTYPE, -3, 2, 16 - -SECTION "BullForestRoute2", ROMX[$6ED5], BANK[$36] - map_attributes BullForestRoute2, BULL_FOREST_ROUTE_2, NORTH | SOUTH - connection north, BullForest, BULL_FOREST, -3, 2, 16 - connection south, Stand, STAND, -3, 7, 13 - -SECTION "StandRoute", ROMX[$701B], BANK[$36] - map_attributes StandRoute, STAND_ROUTE, NORTH | SOUTH - connection north, Stand, STAND, -3, 7, 13 - connection south, KantoEastRoute, KANTO_EAST_ROUTE, -3, 7, 13 - -SECTION "KantoEastRoute", ROMX[$7161], BANK[$36] - map_attributes KantoEastRoute, KANTO_EAST_ROUTE, NORTH | WEST - connection north, StandRoute, STAND_ROUTE, 10, 0, 10 - connection west, Kanto, KANTO, -3, 6, 15 - -SECTION "RouteSilentEast", ROMX[$724D], BANK[$36] - map_attributes RouteSilentEast, ROUTE_SILENT_EAST, WEST | EAST - connection west, SilentHill, SILENT_HILL, 0, 0, 9 - connection east, Kanto, KANTO, -3, 6, 15 - -SECTION "PrinceRoute", ROMX[$738C], BANK[$36] - map_attributes PrinceRoute, PRINCE_ROUTE, NORTH | SOUTH - connection north, Prince, PRINCE, 0, 0, 10 - connection south, SilentHill, SILENT_HILL, 0, 0, 10 - -SECTION "MtFujiRoute", ROMX[$73E8], BANK[$36] - map_attributes MtFujiRoute, MT_FUJI_ROUTE, NORTH | SOUTH - connection north, MtFuji, MT_FUJI, 0, 0, 10 - connection south, Prince, PRINCE, 0, 0, 10 - -SECTION "FontoRoute5", ROMX[$7444], BANK[$36] - map_attributes FontoRoute5, FONTO_ROUTE_5, SOUTH | EAST - connection south, South, SOUTH, -3, 7, 13 - connection east, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9 - -SECTION "BullForestRoute3", ROMX[$7530], BANK[$36] - map_attributes BullForestRoute3, BULL_FOREST_ROUTE_3, NORTH | SOUTH - connection north, North, NORTH, 0, 0, 10 - connection south, BullForest, BULL_FOREST, -3, 2, 16 diff --git a/data/maps/attributes/Baadon.asm b/data/maps/attributes/Baadon.asm new file mode 100644 index 0000000..41cecb7 --- /dev/null +++ b/data/maps/attributes/Baadon.asm @@ -0,0 +1,34 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Baadon.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonHouse1.asm b/data/maps/attributes/BaadonHouse1.asm new file mode 100644 index 0000000..d7a82db --- /dev/null +++ b/data/maps/attributes/BaadonHouse1.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonHouse1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonHouse2.asm b/data/maps/attributes/BaadonHouse2.asm new file mode 100644 index 0000000..e3cf13c --- /dev/null +++ b/data/maps/attributes/BaadonHouse2.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonHouse2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonLeague1F.asm b/data/maps/attributes/BaadonLeague1F.asm new file mode 100644 index 0000000..093b478 --- /dev/null +++ b/data/maps/attributes/BaadonLeague1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonLeague1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonLeague2F.asm b/data/maps/attributes/BaadonLeague2F.asm new file mode 100644 index 0000000..e2385ef --- /dev/null +++ b/data/maps/attributes/BaadonLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonLeague2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonMart.asm b/data/maps/attributes/BaadonMart.asm new file mode 100644 index 0000000..e782b4e --- /dev/null +++ b/data/maps/attributes/BaadonMart.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonPokecenter1F.asm b/data/maps/attributes/BaadonPokecenter1F.asm new file mode 100644 index 0000000..510b51a --- /dev/null +++ b/data/maps/attributes/BaadonPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonPokecenter2F.asm b/data/maps/attributes/BaadonPokecenter2F.asm new file mode 100644 index 0000000..5568865 --- /dev/null +++ b/data/maps/attributes/BaadonPokecenter2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonPokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonRoute1.asm b/data/maps/attributes/BaadonRoute1.asm new file mode 100644 index 0000000..feba099 --- /dev/null +++ b/data/maps/attributes/BaadonRoute1.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonRoute1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonRoute2.asm b/data/maps/attributes/BaadonRoute2.asm new file mode 100644 index 0000000..ce09e7a --- /dev/null +++ b/data/maps/attributes/BaadonRoute2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonRoute2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonRoute3.asm b/data/maps/attributes/BaadonRoute3.asm new file mode 100644 index 0000000..b4ebc67 --- /dev/null +++ b/data/maps/attributes/BaadonRoute3.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonRoute3.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonRouteGateNewtype.asm b/data/maps/attributes/BaadonRouteGateNewtype.asm new file mode 100644 index 0000000..4752cc6 --- /dev/null +++ b/data/maps/attributes/BaadonRouteGateNewtype.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonRouteGateNewtype.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonRouteGateWest.asm b/data/maps/attributes/BaadonRouteGateWest.asm new file mode 100644 index 0000000..7eb03b4 --- /dev/null +++ b/data/maps/attributes/BaadonRouteGateWest.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonRouteGateWest.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BaadonWallpaperHouse.asm b/data/maps/attributes/BaadonWallpaperHouse.asm new file mode 100644 index 0000000..b200551 --- /dev/null +++ b/data/maps/attributes/BaadonWallpaperHouse.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BaadonWallpaperHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullForest.asm b/data/maps/attributes/BullForest.asm new file mode 100644 index 0000000..ae742f7 --- /dev/null +++ b/data/maps/attributes/BullForest.asm @@ -0,0 +1,34 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullForest.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullForestRoute1.asm b/data/maps/attributes/BullForestRoute1.asm new file mode 100644 index 0000000..4b22cc1 --- /dev/null +++ b/data/maps/attributes/BullForestRoute1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullForestRoute1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullForestRoute1House.asm b/data/maps/attributes/BullForestRoute1House.asm new file mode 100644 index 0000000..78b0695 --- /dev/null +++ b/data/maps/attributes/BullForestRoute1House.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullForestRoute1House.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullForestRoute2.asm b/data/maps/attributes/BullForestRoute2.asm new file mode 100644 index 0000000..0130045 --- /dev/null +++ b/data/maps/attributes/BullForestRoute2.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullForestRoute2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullForestRoute3.asm b/data/maps/attributes/BullForestRoute3.asm new file mode 100644 index 0000000..37647e5 --- /dev/null +++ b/data/maps/attributes/BullForestRoute3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullForestRoute3.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullForestRouteGateStand.asm b/data/maps/attributes/BullForestRouteGateStand.asm new file mode 100644 index 0000000..941d222 --- /dev/null +++ b/data/maps/attributes/BullForestRouteGateStand.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullForestRouteGateStand.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullHouse1.asm b/data/maps/attributes/BullHouse1.asm new file mode 100644 index 0000000..f0c72b0 --- /dev/null +++ b/data/maps/attributes/BullHouse1.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullHouse1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullHouse2.asm b/data/maps/attributes/BullHouse2.asm new file mode 100644 index 0000000..abca127 --- /dev/null +++ b/data/maps/attributes/BullHouse2.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullHouse2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullHouse3.asm b/data/maps/attributes/BullHouse3.asm new file mode 100644 index 0000000..85a4542 --- /dev/null +++ b/data/maps/attributes/BullHouse3.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullHouse3.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullHouse4.asm b/data/maps/attributes/BullHouse4.asm new file mode 100644 index 0000000..6537d61 --- /dev/null +++ b/data/maps/attributes/BullHouse4.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullHouse4.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullLeague1F.asm b/data/maps/attributes/BullLeague1F.asm new file mode 100644 index 0000000..e4b1f66 --- /dev/null +++ b/data/maps/attributes/BullLeague1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullLeague1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullLeague2F.asm b/data/maps/attributes/BullLeague2F.asm new file mode 100644 index 0000000..b603bdb --- /dev/null +++ b/data/maps/attributes/BullLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullLeague2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullMart.asm b/data/maps/attributes/BullMart.asm new file mode 100644 index 0000000..760638d --- /dev/null +++ b/data/maps/attributes/BullMart.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullPokecenter1F.asm b/data/maps/attributes/BullPokecenter1F.asm new file mode 100644 index 0000000..5950c68 --- /dev/null +++ b/data/maps/attributes/BullPokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/BullPokecenter2F.asm b/data/maps/attributes/BullPokecenter2F.asm new file mode 100644 index 0000000..0a01dbc --- /dev/null +++ b/data/maps/attributes/BullPokecenter2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/BullPokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/CaveMinecarts1.asm b/data/maps/attributes/CaveMinecarts1.asm new file mode 100644 index 0000000..50f3759 --- /dev/null +++ b/data/maps/attributes/CaveMinecarts1.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/CaveMinecarts1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/CaveMinecarts2.asm b/data/maps/attributes/CaveMinecarts2.asm new file mode 100644 index 0000000..984e731 --- /dev/null +++ b/data/maps/attributes/CaveMinecarts2.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/CaveMinecarts2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/CaveMinecarts3.asm b/data/maps/attributes/CaveMinecarts3.asm new file mode 100644 index 0000000..4fc9aa1 --- /dev/null +++ b/data/maps/attributes/CaveMinecarts3.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/CaveMinecarts3.blk"
\ No newline at end of file diff --git a/data/maps/attributes/CaveMinecarts4.asm b/data/maps/attributes/CaveMinecarts4.asm new file mode 100644 index 0000000..482eb5f --- /dev/null +++ b/data/maps/attributes/CaveMinecarts4.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/CaveMinecarts4.blk"
\ No newline at end of file diff --git a/data/maps/attributes/CaveMinecarts5.asm b/data/maps/attributes/CaveMinecarts5.asm new file mode 100644 index 0000000..cc90507 --- /dev/null +++ b/data/maps/attributes/CaveMinecarts5.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/CaveMinecarts5.blk"
\ No newline at end of file diff --git a/data/maps/attributes/CaveMinecarts6.asm b/data/maps/attributes/CaveMinecarts6.asm new file mode 100644 index 0000000..709c616 --- /dev/null +++ b/data/maps/attributes/CaveMinecarts6.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/CaveMinecarts6.blk"
\ No newline at end of file diff --git a/data/maps/attributes/CaveMinecarts7.asm b/data/maps/attributes/CaveMinecarts7.asm new file mode 100644 index 0000000..488165e --- /dev/null +++ b/data/maps/attributes/CaveMinecarts7.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/CaveMinecarts7.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Fonto.asm b/data/maps/attributes/Fonto.asm new file mode 100644 index 0000000..b452972 --- /dev/null +++ b/data/maps/attributes/Fonto.asm @@ -0,0 +1,32 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Fonto.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoHouse.asm b/data/maps/attributes/FontoHouse.asm new file mode 100644 index 0000000..d37ed92 --- /dev/null +++ b/data/maps/attributes/FontoHouse.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoLab.asm b/data/maps/attributes/FontoLab.asm new file mode 100644 index 0000000..7ef980c --- /dev/null +++ b/data/maps/attributes/FontoLab.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoLab.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoMart.asm b/data/maps/attributes/FontoMart.asm new file mode 100644 index 0000000..0e3cd47 --- /dev/null +++ b/data/maps/attributes/FontoMart.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoPokecenter1F.asm b/data/maps/attributes/FontoPokecenter1F.asm new file mode 100644 index 0000000..41369dc --- /dev/null +++ b/data/maps/attributes/FontoPokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoPokecenter2F.asm b/data/maps/attributes/FontoPokecenter2F.asm new file mode 100644 index 0000000..86c4fd8 --- /dev/null +++ b/data/maps/attributes/FontoPokecenter2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoPokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoRocketHouse.asm b/data/maps/attributes/FontoRocketHouse.asm new file mode 100644 index 0000000..96889bb --- /dev/null +++ b/data/maps/attributes/FontoRocketHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoRocketHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoRoute1.asm b/data/maps/attributes/FontoRoute1.asm new file mode 100644 index 0000000..ffe2ae5 --- /dev/null +++ b/data/maps/attributes/FontoRoute1.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoRoute1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoRoute2.asm b/data/maps/attributes/FontoRoute2.asm new file mode 100644 index 0000000..44e0bc9 --- /dev/null +++ b/data/maps/attributes/FontoRoute2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoRoute2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoRoute3.asm b/data/maps/attributes/FontoRoute3.asm new file mode 100644 index 0000000..9768a10 --- /dev/null +++ b/data/maps/attributes/FontoRoute3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoRoute3.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoRoute4.asm b/data/maps/attributes/FontoRoute4.asm new file mode 100644 index 0000000..6925520 --- /dev/null +++ b/data/maps/attributes/FontoRoute4.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoRoute4.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoRoute5.asm b/data/maps/attributes/FontoRoute5.asm new file mode 100644 index 0000000..da1894c --- /dev/null +++ b/data/maps/attributes/FontoRoute5.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoRoute5.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoRoute6.asm b/data/maps/attributes/FontoRoute6.asm new file mode 100644 index 0000000..e9e3b9c --- /dev/null +++ b/data/maps/attributes/FontoRoute6.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoRoute6.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoRouteGate1.asm b/data/maps/attributes/FontoRouteGate1.asm new file mode 100644 index 0000000..f75d799 --- /dev/null +++ b/data/maps/attributes/FontoRouteGate1.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoRouteGate1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoRouteGate2.asm b/data/maps/attributes/FontoRouteGate2.asm new file mode 100644 index 0000000..016ef98 --- /dev/null +++ b/data/maps/attributes/FontoRouteGate2.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoRouteGate2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/FontoRouteGate3.asm b/data/maps/attributes/FontoRouteGate3.asm new file mode 100644 index 0000000..4bb5fc6 --- /dev/null +++ b/data/maps/attributes/FontoRouteGate3.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/FontoRouteGate3.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Haiteku.asm b/data/maps/attributes/Haiteku.asm new file mode 100644 index 0000000..79e2b5c --- /dev/null +++ b/data/maps/attributes/Haiteku.asm @@ -0,0 +1,38 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Haiteku.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuAquarium1F.asm b/data/maps/attributes/HaitekuAquarium1F.asm new file mode 100644 index 0000000..d58a8b1 --- /dev/null +++ b/data/maps/attributes/HaitekuAquarium1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuAquarium1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuAquarium2F.asm b/data/maps/attributes/HaitekuAquarium2F.asm new file mode 100644 index 0000000..8cd748c --- /dev/null +++ b/data/maps/attributes/HaitekuAquarium2F.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuAquarium2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuHouse1.asm b/data/maps/attributes/HaitekuHouse1.asm new file mode 100644 index 0000000..f9a1338 --- /dev/null +++ b/data/maps/attributes/HaitekuHouse1.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuHouse1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuHouse2.asm b/data/maps/attributes/HaitekuHouse2.asm new file mode 100644 index 0000000..3e264b1 --- /dev/null +++ b/data/maps/attributes/HaitekuHouse2.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuHouse2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuImposterOakHouse.asm b/data/maps/attributes/HaitekuImposterOakHouse.asm new file mode 100644 index 0000000..ec1a050 --- /dev/null +++ b/data/maps/attributes/HaitekuImposterOakHouse.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuImposterOakHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuLeague1F.asm b/data/maps/attributes/HaitekuLeague1F.asm new file mode 100644 index 0000000..06f67d0 --- /dev/null +++ b/data/maps/attributes/HaitekuLeague1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuLeague1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuLeague2F.asm b/data/maps/attributes/HaitekuLeague2F.asm new file mode 100644 index 0000000..95d5c93 --- /dev/null +++ b/data/maps/attributes/HaitekuLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuLeague2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuMart.asm b/data/maps/attributes/HaitekuMart.asm new file mode 100644 index 0000000..891a576 --- /dev/null +++ b/data/maps/attributes/HaitekuMart.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuPokecenter1F.asm b/data/maps/attributes/HaitekuPokecenter1F.asm new file mode 100644 index 0000000..52e18ae --- /dev/null +++ b/data/maps/attributes/HaitekuPokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuPokecenter2F.asm b/data/maps/attributes/HaitekuPokecenter2F.asm new file mode 100644 index 0000000..596293c --- /dev/null +++ b/data/maps/attributes/HaitekuPokecenter2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuPokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuWestRoute.asm b/data/maps/attributes/HaitekuWestRoute.asm new file mode 100644 index 0000000..6743c07 --- /dev/null +++ b/data/maps/attributes/HaitekuWestRoute.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuWestRoute.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuWestRouteGate.asm b/data/maps/attributes/HaitekuWestRouteGate.asm new file mode 100644 index 0000000..a52f1b9 --- /dev/null +++ b/data/maps/attributes/HaitekuWestRouteGate.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuWestRouteGate.blk"
\ No newline at end of file diff --git a/data/maps/attributes/HaitekuWestRouteOcean.asm b/data/maps/attributes/HaitekuWestRouteOcean.asm new file mode 100644 index 0000000..4f09ba0 --- /dev/null +++ b/data/maps/attributes/HaitekuWestRouteOcean.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/HaitekuWestRouteOcean.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Kanto.asm b/data/maps/attributes/Kanto.asm new file mode 100644 index 0000000..410005e --- /dev/null +++ b/data/maps/attributes/Kanto.asm @@ -0,0 +1,59 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Kanto.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoCeladonElevator.asm b/data/maps/attributes/KantoCeladonElevator.asm new file mode 100644 index 0000000..41ff130 --- /dev/null +++ b/data/maps/attributes/KantoCeladonElevator.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoCeladonElevator.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoCeladonMart1F.asm b/data/maps/attributes/KantoCeladonMart1F.asm new file mode 100644 index 0000000..33629f8 --- /dev/null +++ b/data/maps/attributes/KantoCeladonMart1F.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoCeladonMart1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoCeladonMart2F.asm b/data/maps/attributes/KantoCeladonMart2F.asm new file mode 100644 index 0000000..e4cf6bb --- /dev/null +++ b/data/maps/attributes/KantoCeladonMart2F.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoCeladonMart2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoCeladonMart3F.asm b/data/maps/attributes/KantoCeladonMart3F.asm new file mode 100644 index 0000000..32dfd63 --- /dev/null +++ b/data/maps/attributes/KantoCeladonMart3F.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoCeladonMart3F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoCeladonMart4F.asm b/data/maps/attributes/KantoCeladonMart4F.asm new file mode 100644 index 0000000..7825fe5 --- /dev/null +++ b/data/maps/attributes/KantoCeladonMart4F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoCeladonMart4F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoCeladonMart5F.asm b/data/maps/attributes/KantoCeladonMart5F.asm new file mode 100644 index 0000000..7f01eae --- /dev/null +++ b/data/maps/attributes/KantoCeladonMart5F.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoCeladonMart5F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoCeruleanHouse.asm b/data/maps/attributes/KantoCeruleanHouse.asm new file mode 100644 index 0000000..c3857ec --- /dev/null +++ b/data/maps/attributes/KantoCeruleanHouse.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoCeruleanHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoDiner.asm b/data/maps/attributes/KantoDiner.asm new file mode 100644 index 0000000..c41abd6 --- /dev/null +++ b/data/maps/attributes/KantoDiner.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoDiner.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoEastRoute.asm b/data/maps/attributes/KantoEastRoute.asm new file mode 100644 index 0000000..60c54ba --- /dev/null +++ b/data/maps/attributes/KantoEastRoute.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoEastRoute.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoEldersHouse.asm b/data/maps/attributes/KantoEldersHouse.asm new file mode 100644 index 0000000..1ff8f7f --- /dev/null +++ b/data/maps/attributes/KantoEldersHouse.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoEldersHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoFishingGuru.asm b/data/maps/attributes/KantoFishingGuru.asm new file mode 100644 index 0000000..2dd09fc --- /dev/null +++ b/data/maps/attributes/KantoFishingGuru.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoFishingGuru.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoGameCorner.asm b/data/maps/attributes/KantoGameCorner.asm new file mode 100644 index 0000000..d8e6c73 --- /dev/null +++ b/data/maps/attributes/KantoGameCorner.asm @@ -0,0 +1,29 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoGameCorner.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoGameCornerPrizes.asm b/data/maps/attributes/KantoGameCornerPrizes.asm new file mode 100644 index 0000000..1c57728 --- /dev/null +++ b/data/maps/attributes/KantoGameCornerPrizes.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoGameCornerPrizes.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoGamefreakHQ1.asm b/data/maps/attributes/KantoGamefreakHQ1.asm new file mode 100644 index 0000000..5cc8064 --- /dev/null +++ b/data/maps/attributes/KantoGamefreakHQ1.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoGamefreakHQ1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoGamefreakHQ2.asm b/data/maps/attributes/KantoGamefreakHQ2.asm new file mode 100644 index 0000000..8b16113 --- /dev/null +++ b/data/maps/attributes/KantoGamefreakHQ2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoGamefreakHQ2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoGamefreakHQ3.asm b/data/maps/attributes/KantoGamefreakHQ3.asm new file mode 100644 index 0000000..01930b4 --- /dev/null +++ b/data/maps/attributes/KantoGamefreakHQ3.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoGamefreakHQ3.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoGamefreakHQ4.asm b/data/maps/attributes/KantoGamefreakHQ4.asm new file mode 100644 index 0000000..a3ad778 --- /dev/null +++ b/data/maps/attributes/KantoGamefreakHQ4.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoGamefreakHQ4.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoGamefreakHQ5.asm b/data/maps/attributes/KantoGamefreakHQ5.asm new file mode 100644 index 0000000..bbf0bb5 --- /dev/null +++ b/data/maps/attributes/KantoGamefreakHQ5.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoGamefreakHQ5.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoGreensHouse1F.asm b/data/maps/attributes/KantoGreensHouse1F.asm new file mode 100644 index 0000000..b76fdae --- /dev/null +++ b/data/maps/attributes/KantoGreensHouse1F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoGreensHouse1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoGreensHouse2F.asm b/data/maps/attributes/KantoGreensHouse2F.asm new file mode 100644 index 0000000..8f11c6c --- /dev/null +++ b/data/maps/attributes/KantoGreensHouse2F.asm @@ -0,0 +1,16 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoGreensHouse2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoHospital.asm b/data/maps/attributes/KantoHospital.asm new file mode 100644 index 0000000..930e155 --- /dev/null +++ b/data/maps/attributes/KantoHospital.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoHospital.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoLavenderHouse.asm b/data/maps/attributes/KantoLavenderHouse.asm new file mode 100644 index 0000000..d5c8b2b --- /dev/null +++ b/data/maps/attributes/KantoLavenderHouse.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoLavenderHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoLeague1F.asm b/data/maps/attributes/KantoLeague1F.asm new file mode 100644 index 0000000..d9609ae --- /dev/null +++ b/data/maps/attributes/KantoLeague1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoLeague1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoLeague21F.asm b/data/maps/attributes/KantoLeague21F.asm new file mode 100644 index 0000000..20188bd --- /dev/null +++ b/data/maps/attributes/KantoLeague21F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoLeague21F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoLeague22F.asm b/data/maps/attributes/KantoLeague22F.asm new file mode 100644 index 0000000..6885a5f --- /dev/null +++ b/data/maps/attributes/KantoLeague22F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoLeague22F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoLeague2F.asm b/data/maps/attributes/KantoLeague2F.asm new file mode 100644 index 0000000..7595cd1 --- /dev/null +++ b/data/maps/attributes/KantoLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoLeague2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoMart.asm b/data/maps/attributes/KantoMart.asm new file mode 100644 index 0000000..41625af --- /dev/null +++ b/data/maps/attributes/KantoMart.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoOaksLab.asm b/data/maps/attributes/KantoOaksLab.asm new file mode 100644 index 0000000..dc3186f --- /dev/null +++ b/data/maps/attributes/KantoOaksLab.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoOaksLab.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoPokecenter1F.asm b/data/maps/attributes/KantoPokecenter1F.asm new file mode 100644 index 0000000..8d87dd9 --- /dev/null +++ b/data/maps/attributes/KantoPokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoPokecenter21F.asm b/data/maps/attributes/KantoPokecenter21F.asm new file mode 100644 index 0000000..03c8fde --- /dev/null +++ b/data/maps/attributes/KantoPokecenter21F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoPokecenter21F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoPokecenter22F.asm b/data/maps/attributes/KantoPokecenter22F.asm new file mode 100644 index 0000000..e1b92ca --- /dev/null +++ b/data/maps/attributes/KantoPokecenter22F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoPokecenter22F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoPokecenter2F.asm b/data/maps/attributes/KantoPokecenter2F.asm new file mode 100644 index 0000000..9b9fba8 --- /dev/null +++ b/data/maps/attributes/KantoPokecenter2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoPokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoRedsHouse.asm b/data/maps/attributes/KantoRedsHouse.asm new file mode 100644 index 0000000..fdc1fd3 --- /dev/null +++ b/data/maps/attributes/KantoRedsHouse.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoRedsHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoSchool.asm b/data/maps/attributes/KantoSchool.asm new file mode 100644 index 0000000..812aa4b --- /dev/null +++ b/data/maps/attributes/KantoSchool.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoSchool.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoSilphCo.asm b/data/maps/attributes/KantoSilphCo.asm new file mode 100644 index 0000000..96fa055 --- /dev/null +++ b/data/maps/attributes/KantoSilphCo.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoSilphCo.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoUnusedArea.asm b/data/maps/attributes/KantoUnusedArea.asm new file mode 100644 index 0000000..2177ebf --- /dev/null +++ b/data/maps/attributes/KantoUnusedArea.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoUnusedArea.blk"
\ No newline at end of file diff --git a/data/maps/attributes/KantoViridianHouse.asm b/data/maps/attributes/KantoViridianHouse.asm new file mode 100644 index 0000000..42f4d88 --- /dev/null +++ b/data/maps/attributes/KantoViridianHouse.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/KantoViridianHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/MtFuji.asm b/data/maps/attributes/MtFuji.asm new file mode 100644 index 0000000..46f1ced --- /dev/null +++ b/data/maps/attributes/MtFuji.asm @@ -0,0 +1,16 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/MtFuji.blk"
\ No newline at end of file diff --git a/data/maps/attributes/MtFujiRoute.asm b/data/maps/attributes/MtFujiRoute.asm new file mode 100644 index 0000000..9bd12cf --- /dev/null +++ b/data/maps/attributes/MtFujiRoute.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/MtFujiRoute.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Newtype.asm b/data/maps/attributes/Newtype.asm new file mode 100644 index 0000000..c676dea --- /dev/null +++ b/data/maps/attributes/Newtype.asm @@ -0,0 +1,40 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Newtype.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeDiner.asm b/data/maps/attributes/NewtypeDiner.asm new file mode 100644 index 0000000..e882458 --- /dev/null +++ b/data/maps/attributes/NewtypeDiner.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeDiner.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeDojo.asm b/data/maps/attributes/NewtypeDojo.asm new file mode 100644 index 0000000..cd0a93e --- /dev/null +++ b/data/maps/attributes/NewtypeDojo.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeDojo.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeHouse1.asm b/data/maps/attributes/NewtypeHouse1.asm new file mode 100644 index 0000000..64e95c7 --- /dev/null +++ b/data/maps/attributes/NewtypeHouse1.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeHouse1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeHouse2.asm b/data/maps/attributes/NewtypeHouse2.asm new file mode 100644 index 0000000..86ba8b2 --- /dev/null +++ b/data/maps/attributes/NewtypeHouse2.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeHouse2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeHouse3.asm b/data/maps/attributes/NewtypeHouse3.asm new file mode 100644 index 0000000..3cad74d --- /dev/null +++ b/data/maps/attributes/NewtypeHouse3.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeHouse3.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeLeague1F.asm b/data/maps/attributes/NewtypeLeague1F.asm new file mode 100644 index 0000000..d953bfa --- /dev/null +++ b/data/maps/attributes/NewtypeLeague1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeLeague1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeLeague2F.asm b/data/maps/attributes/NewtypeLeague2F.asm new file mode 100644 index 0000000..34b9d80 --- /dev/null +++ b/data/maps/attributes/NewtypeLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeLeague2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeMart.asm b/data/maps/attributes/NewtypeMart.asm new file mode 100644 index 0000000..8bd8153 --- /dev/null +++ b/data/maps/attributes/NewtypeMart.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypePokecenter1F.asm b/data/maps/attributes/NewtypePokecenter1F.asm new file mode 100644 index 0000000..91534b1 --- /dev/null +++ b/data/maps/attributes/NewtypePokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypePokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypePokecenter2F.asm b/data/maps/attributes/NewtypePokecenter2F.asm new file mode 100644 index 0000000..30ac3db --- /dev/null +++ b/data/maps/attributes/NewtypePokecenter2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypePokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeRoute.asm b/data/maps/attributes/NewtypeRoute.asm new file mode 100644 index 0000000..13742e7 --- /dev/null +++ b/data/maps/attributes/NewtypeRoute.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeRoute.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeRouteGate.asm b/data/maps/attributes/NewtypeRouteGate.asm new file mode 100644 index 0000000..04c1bd6 --- /dev/null +++ b/data/maps/attributes/NewtypeRouteGate.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeRouteGate.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NewtypeSailorHouse.asm b/data/maps/attributes/NewtypeSailorHouse.asm new file mode 100644 index 0000000..7440a21 --- /dev/null +++ b/data/maps/attributes/NewtypeSailorHouse.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NewtypeSailorHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/North.asm b/data/maps/attributes/North.asm new file mode 100644 index 0000000..05c5baf --- /dev/null +++ b/data/maps/attributes/North.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/North.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NorthHouse1.asm b/data/maps/attributes/NorthHouse1.asm new file mode 100644 index 0000000..d2fdd9a --- /dev/null +++ b/data/maps/attributes/NorthHouse1.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NorthHouse1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NorthHouse2.asm b/data/maps/attributes/NorthHouse2.asm new file mode 100644 index 0000000..248426a --- /dev/null +++ b/data/maps/attributes/NorthHouse2.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NorthHouse2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NorthMart.asm b/data/maps/attributes/NorthMart.asm new file mode 100644 index 0000000..2fe94de --- /dev/null +++ b/data/maps/attributes/NorthMart.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NorthMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NorthPokecenter1F.asm b/data/maps/attributes/NorthPokecenter1F.asm new file mode 100644 index 0000000..332755f --- /dev/null +++ b/data/maps/attributes/NorthPokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NorthPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/NorthPokecenter2F.asm b/data/maps/attributes/NorthPokecenter2F.asm new file mode 100644 index 0000000..fbaf171 --- /dev/null +++ b/data/maps/attributes/NorthPokecenter2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/NorthPokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Office1.asm b/data/maps/attributes/Office1.asm new file mode 100644 index 0000000..f0b5c71 --- /dev/null +++ b/data/maps/attributes/Office1.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Office1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Office2.asm b/data/maps/attributes/Office2.asm new file mode 100644 index 0000000..0875e4e --- /dev/null +++ b/data/maps/attributes/Office2.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Office2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Office3.asm b/data/maps/attributes/Office3.asm new file mode 100644 index 0000000..e19d19a --- /dev/null +++ b/data/maps/attributes/Office3.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Office3.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCity.asm b/data/maps/attributes/OldCity.asm new file mode 100644 index 0000000..890498d --- /dev/null +++ b/data/maps/attributes/OldCity.asm @@ -0,0 +1,48 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCity.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityBillsHouse.asm b/data/maps/attributes/OldCityBillsHouse.asm new file mode 100644 index 0000000..d192703 --- /dev/null +++ b/data/maps/attributes/OldCityBillsHouse.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityBillsHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityGym.asm b/data/maps/attributes/OldCityGym.asm new file mode 100644 index 0000000..e2f3fd1 --- /dev/null +++ b/data/maps/attributes/OldCityGym.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityGym.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityHouse.asm b/data/maps/attributes/OldCityHouse.asm new file mode 100644 index 0000000..b016d31 --- /dev/null +++ b/data/maps/attributes/OldCityHouse.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityKurtsHouse.asm b/data/maps/attributes/OldCityKurtsHouse.asm new file mode 100644 index 0000000..1a58419 --- /dev/null +++ b/data/maps/attributes/OldCityKurtsHouse.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityKurtsHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityMart.asm b/data/maps/attributes/OldCityMart.asm new file mode 100644 index 0000000..4a41e0c --- /dev/null +++ b/data/maps/attributes/OldCityMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityMuseum.asm b/data/maps/attributes/OldCityMuseum.asm new file mode 100644 index 0000000..555c43b --- /dev/null +++ b/data/maps/attributes/OldCityMuseum.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityMuseum.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityPokecenter1F.asm b/data/maps/attributes/OldCityPokecenter1F.asm new file mode 100644 index 0000000..052b012 --- /dev/null +++ b/data/maps/attributes/OldCityPokecenter1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityPokecenter2F.asm b/data/maps/attributes/OldCityPokecenter2F.asm new file mode 100644 index 0000000..ebe5480 --- /dev/null +++ b/data/maps/attributes/OldCityPokecenter2F.asm @@ -0,0 +1,24 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityPokecenterBattle.asm b/data/maps/attributes/OldCityPokecenterBattle.asm new file mode 100644 index 0000000..5b13157 --- /dev/null +++ b/data/maps/attributes/OldCityPokecenterBattle.asm @@ -0,0 +1,18 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityPokecenterTimeMachine.asm b/data/maps/attributes/OldCityPokecenterTimeMachine.asm new file mode 100644 index 0000000..bbf048e --- /dev/null +++ b/data/maps/attributes/OldCityPokecenterTimeMachine.asm @@ -0,0 +1,19 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityPokecenterTrade.asm b/data/maps/attributes/OldCityPokecenterTrade.asm new file mode 100644 index 0000000..122f0b7 --- /dev/null +++ b/data/maps/attributes/OldCityPokecenterTrade.asm @@ -0,0 +1,18 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/OldCitySchool.asm b/data/maps/attributes/OldCitySchool.asm new file mode 100644 index 0000000..c25dd8d --- /dev/null +++ b/data/maps/attributes/OldCitySchool.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCitySchool.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityTower1F.asm b/data/maps/attributes/OldCityTower1F.asm new file mode 100644 index 0000000..f45b609 --- /dev/null +++ b/data/maps/attributes/OldCityTower1F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityTower1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityTower2F.asm b/data/maps/attributes/OldCityTower2F.asm new file mode 100644 index 0000000..27fc406 --- /dev/null +++ b/data/maps/attributes/OldCityTower2F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityTower2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityTower3F.asm b/data/maps/attributes/OldCityTower3F.asm new file mode 100644 index 0000000..6e9c35d --- /dev/null +++ b/data/maps/attributes/OldCityTower3F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityTower3F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityTower4F.asm b/data/maps/attributes/OldCityTower4F.asm new file mode 100644 index 0000000..fee0fb9 --- /dev/null +++ b/data/maps/attributes/OldCityTower4F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityTower4F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/OldCityTower5F.asm b/data/maps/attributes/OldCityTower5F.asm new file mode 100644 index 0000000..894e702 --- /dev/null +++ b/data/maps/attributes/OldCityTower5F.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/OldCityTower5F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/PlayerHouse1F.asm b/data/maps/attributes/PlayerHouse1F.asm new file mode 100644 index 0000000..bb03326 --- /dev/null +++ b/data/maps/attributes/PlayerHouse1F.asm @@ -0,0 +1,24 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/PlayerHouse2F.asm b/data/maps/attributes/PlayerHouse2F.asm new file mode 100644 index 0000000..9a889ec --- /dev/null +++ b/data/maps/attributes/PlayerHouse2F.asm @@ -0,0 +1,23 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/PowerPlant1.asm b/data/maps/attributes/PowerPlant1.asm new file mode 100644 index 0000000..149eb08 --- /dev/null +++ b/data/maps/attributes/PowerPlant1.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/PowerPlant1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/PowerPlant2.asm b/data/maps/attributes/PowerPlant2.asm new file mode 100644 index 0000000..f810599 --- /dev/null +++ b/data/maps/attributes/PowerPlant2.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/PowerPlant2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/PowerPlant3.asm b/data/maps/attributes/PowerPlant3.asm new file mode 100644 index 0000000..6e8825c --- /dev/null +++ b/data/maps/attributes/PowerPlant3.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/PowerPlant3.blk"
\ No newline at end of file diff --git a/data/maps/attributes/PowerPlant4.asm b/data/maps/attributes/PowerPlant4.asm new file mode 100644 index 0000000..7d8737a --- /dev/null +++ b/data/maps/attributes/PowerPlant4.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/PowerPlant4.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Prince.asm b/data/maps/attributes/Prince.asm new file mode 100644 index 0000000..3ecebde --- /dev/null +++ b/data/maps/attributes/Prince.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Prince.blk"
\ No newline at end of file diff --git a/data/maps/attributes/PrinceRoute.asm b/data/maps/attributes/PrinceRoute.asm new file mode 100644 index 0000000..3f6bfc7 --- /dev/null +++ b/data/maps/attributes/PrinceRoute.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/PrinceRoute.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Route15.asm b/data/maps/attributes/Route15.asm new file mode 100644 index 0000000..f07b0c1 --- /dev/null +++ b/data/maps/attributes/Route15.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Route15.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Route15Pokecenter1F.asm b/data/maps/attributes/Route15Pokecenter1F.asm new file mode 100644 index 0000000..faa5ca9 --- /dev/null +++ b/data/maps/attributes/Route15Pokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Route15Pokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Route15Pokecenter2F.asm b/data/maps/attributes/Route15Pokecenter2F.asm new file mode 100644 index 0000000..3247382 --- /dev/null +++ b/data/maps/attributes/Route15Pokecenter2F.asm @@ -0,0 +1,16 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Route15Pokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Route18.asm b/data/maps/attributes/Route18.asm new file mode 100644 index 0000000..ad12255 --- /dev/null +++ b/data/maps/attributes/Route18.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Route18.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Route18Pokecenter1F.asm b/data/maps/attributes/Route18Pokecenter1F.asm new file mode 100644 index 0000000..7ebc44b --- /dev/null +++ b/data/maps/attributes/Route18Pokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Route18Pokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Route18Pokecenter2F.asm b/data/maps/attributes/Route18Pokecenter2F.asm new file mode 100644 index 0000000..4527e98 --- /dev/null +++ b/data/maps/attributes/Route18Pokecenter2F.asm @@ -0,0 +1,16 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Route18Pokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Route1Gate1F.asm b/data/maps/attributes/Route1Gate1F.asm new file mode 100644 index 0000000..f6e6804 --- /dev/null +++ b/data/maps/attributes/Route1Gate1F.asm @@ -0,0 +1,22 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/Route1Gate2F.asm b/data/maps/attributes/Route1Gate2F.asm new file mode 100644 index 0000000..d38f281 --- /dev/null +++ b/data/maps/attributes/Route1Gate2F.asm @@ -0,0 +1,20 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/Route1P1.asm b/data/maps/attributes/Route1P1.asm new file mode 100644 index 0000000..4dfcd57 --- /dev/null +++ b/data/maps/attributes/Route1P1.asm @@ -0,0 +1,23 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/Route1P2.asm b/data/maps/attributes/Route1P2.asm new file mode 100644 index 0000000..52e1dbf --- /dev/null +++ b/data/maps/attributes/Route1P2.asm @@ -0,0 +1,24 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/Route2.asm b/data/maps/attributes/Route2.asm new file mode 100644 index 0000000..ef32725 --- /dev/null +++ b/data/maps/attributes/Route2.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Route2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Route2Gate1F.asm b/data/maps/attributes/Route2Gate1F.asm new file mode 100644 index 0000000..48399da --- /dev/null +++ b/data/maps/attributes/Route2Gate1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Route2Gate1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Route2Gate2F.asm b/data/maps/attributes/Route2Gate2F.asm new file mode 100644 index 0000000..88bcd9b --- /dev/null +++ b/data/maps/attributes/Route2Gate2F.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Route2Gate2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Route2House.asm b/data/maps/attributes/Route2House.asm new file mode 100644 index 0000000..dbc816e --- /dev/null +++ b/data/maps/attributes/Route2House.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Route2House.blk"
\ No newline at end of file diff --git a/data/maps/attributes/RouteSilentEast.asm b/data/maps/attributes/RouteSilentEast.asm new file mode 100644 index 0000000..67c3da7 --- /dev/null +++ b/data/maps/attributes/RouteSilentEast.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/RouteSilentEast.blk"
\ No newline at end of file diff --git a/data/maps/attributes/RouteSilentEastGate.asm b/data/maps/attributes/RouteSilentEastGate.asm new file mode 100644 index 0000000..01ac29f --- /dev/null +++ b/data/maps/attributes/RouteSilentEastGate.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/RouteSilentEastGate.blk"
\ No newline at end of file diff --git a/data/maps/attributes/RuinsOfAlphEntrance.asm b/data/maps/attributes/RuinsOfAlphEntrance.asm new file mode 100644 index 0000000..09a5f31 --- /dev/null +++ b/data/maps/attributes/RuinsOfAlphEntrance.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/RuinsOfAlphEntrance.blk"
\ No newline at end of file diff --git a/data/maps/attributes/RuinsOfAlphMain.asm b/data/maps/attributes/RuinsOfAlphMain.asm new file mode 100644 index 0000000..b5b6c51 --- /dev/null +++ b/data/maps/attributes/RuinsOfAlphMain.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/RuinsOfAlphMain.blk"
\ No newline at end of file diff --git a/data/maps/attributes/ShizukanaOka.asm b/data/maps/attributes/ShizukanaOka.asm new file mode 100644 index 0000000..fe1b3e3 --- /dev/null +++ b/data/maps/attributes/ShizukanaOka.asm @@ -0,0 +1,33 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/SilentHill.asm b/data/maps/attributes/SilentHill.asm new file mode 100644 index 0000000..022d75d --- /dev/null +++ b/data/maps/attributes/SilentHill.asm @@ -0,0 +1,32 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/SilentHillHouse.asm b/data/maps/attributes/SilentHillHouse.asm new file mode 100644 index 0000000..d80a4c7 --- /dev/null +++ b/data/maps/attributes/SilentHillHouse.asm @@ -0,0 +1,25 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/SilentHillLabBack.asm b/data/maps/attributes/SilentHillLabBack.asm new file mode 100644 index 0000000..9ebe949 --- /dev/null +++ b/data/maps/attributes/SilentHillLabBack.asm @@ -0,0 +1,27 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/SilentHillLabFront.asm b/data/maps/attributes/SilentHillLabFront.asm new file mode 100644 index 0000000..4c11d62 --- /dev/null +++ b/data/maps/attributes/SilentHillLabFront.asm @@ -0,0 +1,44 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/SilentHillPokecenter.asm b/data/maps/attributes/SilentHillPokecenter.asm new file mode 100644 index 0000000..929def1 --- /dev/null +++ b/data/maps/attributes/SilentHillPokecenter.asm @@ -0,0 +1,23 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/SlowpokeWellEntrance.asm b/data/maps/attributes/SlowpokeWellEntrance.asm new file mode 100644 index 0000000..b6bc73d --- /dev/null +++ b/data/maps/attributes/SlowpokeWellEntrance.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SlowpokeWellEntrance.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SlowpokeWellMain.asm b/data/maps/attributes/SlowpokeWellMain.asm new file mode 100644 index 0000000..6e2fde0 --- /dev/null +++ b/data/maps/attributes/SlowpokeWellMain.asm @@ -0,0 +1,15 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SlowpokeWellMain.blk"
\ No newline at end of file diff --git a/data/maps/attributes/South.asm b/data/maps/attributes/South.asm new file mode 100644 index 0000000..ffff0be --- /dev/null +++ b/data/maps/attributes/South.asm @@ -0,0 +1,36 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/South.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SouthHouse1.asm b/data/maps/attributes/SouthHouse1.asm new file mode 100644 index 0000000..4b4915a --- /dev/null +++ b/data/maps/attributes/SouthHouse1.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SouthHouse1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SouthHouse2.asm b/data/maps/attributes/SouthHouse2.asm new file mode 100644 index 0000000..bfe3a19 --- /dev/null +++ b/data/maps/attributes/SouthHouse2.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SouthHouse2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SouthMart.asm b/data/maps/attributes/SouthMart.asm new file mode 100644 index 0000000..d013874 --- /dev/null +++ b/data/maps/attributes/SouthMart.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SouthMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SouthPokecenter1F.asm b/data/maps/attributes/SouthPokecenter1F.asm new file mode 100644 index 0000000..e57741c --- /dev/null +++ b/data/maps/attributes/SouthPokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SouthPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SouthPokecenter2F.asm b/data/maps/attributes/SouthPokecenter2F.asm new file mode 100644 index 0000000..b95bbd3 --- /dev/null +++ b/data/maps/attributes/SouthPokecenter2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SouthPokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Stand.asm b/data/maps/attributes/Stand.asm new file mode 100644 index 0000000..8444a43 --- /dev/null +++ b/data/maps/attributes/Stand.asm @@ -0,0 +1,46 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Stand.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandHouse.asm b/data/maps/attributes/StandHouse.asm new file mode 100644 index 0000000..d1511ae --- /dev/null +++ b/data/maps/attributes/StandHouse.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandLab.asm b/data/maps/attributes/StandLab.asm new file mode 100644 index 0000000..39d23c7 --- /dev/null +++ b/data/maps/attributes/StandLab.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandLab.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandLeague1F.asm b/data/maps/attributes/StandLeague1F.asm new file mode 100644 index 0000000..9580aa8 --- /dev/null +++ b/data/maps/attributes/StandLeague1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandLeague1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandLeague2F.asm b/data/maps/attributes/StandLeague2F.asm new file mode 100644 index 0000000..7165e3c --- /dev/null +++ b/data/maps/attributes/StandLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandLeague2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandMart.asm b/data/maps/attributes/StandMart.asm new file mode 100644 index 0000000..2b804dd --- /dev/null +++ b/data/maps/attributes/StandMart.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandOffice.asm b/data/maps/attributes/StandOffice.asm new file mode 100644 index 0000000..f06b0d5 --- /dev/null +++ b/data/maps/attributes/StandOffice.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandOffice.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandPokecenter1F.asm b/data/maps/attributes/StandPokecenter1F.asm new file mode 100644 index 0000000..78d6d5f --- /dev/null +++ b/data/maps/attributes/StandPokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandPokecenter2F.asm b/data/maps/attributes/StandPokecenter2F.asm new file mode 100644 index 0000000..8595dae --- /dev/null +++ b/data/maps/attributes/StandPokecenter2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandPokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandRocketHouse1F.asm b/data/maps/attributes/StandRocketHouse1F.asm new file mode 100644 index 0000000..5f3ee51 --- /dev/null +++ b/data/maps/attributes/StandRocketHouse1F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandRocketHouse1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandRocketHouse2F.asm b/data/maps/attributes/StandRocketHouse2F.asm new file mode 100644 index 0000000..1d9b8da --- /dev/null +++ b/data/maps/attributes/StandRocketHouse2F.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandRocketHouse2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandRoute.asm b/data/maps/attributes/StandRoute.asm new file mode 100644 index 0000000..aff6d29 --- /dev/null +++ b/data/maps/attributes/StandRoute.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandRoute.blk"
\ No newline at end of file diff --git a/data/maps/attributes/StandRouteGateKanto.asm b/data/maps/attributes/StandRouteGateKanto.asm new file mode 100644 index 0000000..a54c583 --- /dev/null +++ b/data/maps/attributes/StandRouteGateKanto.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/StandRouteGateKanto.blk"
\ No newline at end of file diff --git a/data/maps/attributes/Sugar.asm b/data/maps/attributes/Sugar.asm new file mode 100644 index 0000000..fbf2719 --- /dev/null +++ b/data/maps/attributes/Sugar.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/Sugar.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SugarHouse.asm b/data/maps/attributes/SugarHouse.asm new file mode 100644 index 0000000..d4eb261 --- /dev/null +++ b/data/maps/attributes/SugarHouse.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SugarHouse.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SugarHouse2.asm b/data/maps/attributes/SugarHouse2.asm new file mode 100644 index 0000000..a75afa4 --- /dev/null +++ b/data/maps/attributes/SugarHouse2.asm @@ -0,0 +1,18 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SugarHouse2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SugarMart.asm b/data/maps/attributes/SugarMart.asm new file mode 100644 index 0000000..b1be208 --- /dev/null +++ b/data/maps/attributes/SugarMart.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SugarMart.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SugarPokecenter1F.asm b/data/maps/attributes/SugarPokecenter1F.asm new file mode 100644 index 0000000..0961e2c --- /dev/null +++ b/data/maps/attributes/SugarPokecenter1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SugarPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SugarPokecenter2F.asm b/data/maps/attributes/SugarPokecenter2F.asm new file mode 100644 index 0000000..3e3a24a --- /dev/null +++ b/data/maps/attributes/SugarPokecenter2F.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SugarPokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SugarRoute.asm b/data/maps/attributes/SugarRoute.asm new file mode 100644 index 0000000..71fe900 --- /dev/null +++ b/data/maps/attributes/SugarRoute.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SugarRoute.blk"
\ No newline at end of file diff --git a/data/maps/attributes/SugarRouteGate.asm b/data/maps/attributes/SugarRouteGate.asm new file mode 100644 index 0000000..b1ce486 --- /dev/null +++ b/data/maps/attributes/SugarRouteGate.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/SugarRouteGate.blk"
\ No newline at end of file diff --git a/data/maps/attributes/UnusedMap13.asm b/data/maps/attributes/UnusedMap13.asm new file mode 100644 index 0000000..6976d22 --- /dev/null +++ b/data/maps/attributes/UnusedMap13.asm @@ -0,0 +1,7 @@ +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"
\ No newline at end of file diff --git a/data/maps/attributes/West.asm b/data/maps/attributes/West.asm new file mode 100644 index 0000000..d4427dc --- /dev/null +++ b/data/maps/attributes/West.asm @@ -0,0 +1,43 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/West.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestGym.asm b/data/maps/attributes/WestGym.asm new file mode 100644 index 0000000..be9bbc5 --- /dev/null +++ b/data/maps/attributes/WestGym.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestGym.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestHouse1.asm b/data/maps/attributes/WestHouse1.asm new file mode 100644 index 0000000..73989b6 --- /dev/null +++ b/data/maps/attributes/WestHouse1.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestHouse1.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestHouse2.asm b/data/maps/attributes/WestHouse2.asm new file mode 100644 index 0000000..03603ec --- /dev/null +++ b/data/maps/attributes/WestHouse2.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestHouse2.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestMart1F.asm b/data/maps/attributes/WestMart1F.asm new file mode 100644 index 0000000..3141c21 --- /dev/null +++ b/data/maps/attributes/WestMart1F.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestMart1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestMart2F.asm b/data/maps/attributes/WestMart2F.asm new file mode 100644 index 0000000..9113205 --- /dev/null +++ b/data/maps/attributes/WestMart2F.asm @@ -0,0 +1,38 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestMart2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestMart3F.asm b/data/maps/attributes/WestMart3F.asm new file mode 100644 index 0000000..198bb26 --- /dev/null +++ b/data/maps/attributes/WestMart3F.asm @@ -0,0 +1,35 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestMart3F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestMart4F.asm b/data/maps/attributes/WestMart4F.asm new file mode 100644 index 0000000..994e4a4 --- /dev/null +++ b/data/maps/attributes/WestMart4F.asm @@ -0,0 +1,35 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestMart4F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestMart5F.asm b/data/maps/attributes/WestMart5F.asm new file mode 100644 index 0000000..4ac7cf8 --- /dev/null +++ b/data/maps/attributes/WestMart5F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestMart5F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestMart6F.asm b/data/maps/attributes/WestMart6F.asm new file mode 100644 index 0000000..9a26086 --- /dev/null +++ b/data/maps/attributes/WestMart6F.asm @@ -0,0 +1,24 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestMart6F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestMartElevator.asm b/data/maps/attributes/WestMartElevator.asm new file mode 100644 index 0000000..92ae723 --- /dev/null +++ b/data/maps/attributes/WestMartElevator.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestMartElevator.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestPokecenter1F.asm b/data/maps/attributes/WestPokecenter1F.asm new file mode 100644 index 0000000..54d5e94 --- /dev/null +++ b/data/maps/attributes/WestPokecenter1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestPokecenter1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestPokecenter2F.asm b/data/maps/attributes/WestPokecenter2F.asm new file mode 100644 index 0000000..8352240 --- /dev/null +++ b/data/maps/attributes/WestPokecenter2F.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestPokecenter2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestRadioTower1F.asm b/data/maps/attributes/WestRadioTower1F.asm new file mode 100644 index 0000000..a5fec8d --- /dev/null +++ b/data/maps/attributes/WestRadioTower1F.asm @@ -0,0 +1,23 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestRadioTower1F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestRadioTower2F.asm b/data/maps/attributes/WestRadioTower2F.asm new file mode 100644 index 0000000..bf1dc93 --- /dev/null +++ b/data/maps/attributes/WestRadioTower2F.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestRadioTower2F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestRadioTower3F.asm b/data/maps/attributes/WestRadioTower3F.asm new file mode 100644 index 0000000..8ace355 --- /dev/null +++ b/data/maps/attributes/WestRadioTower3F.asm @@ -0,0 +1,26 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestRadioTower3F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestRadioTower4F.asm b/data/maps/attributes/WestRadioTower4F.asm new file mode 100644 index 0000000..a454c37 --- /dev/null +++ b/data/maps/attributes/WestRadioTower4F.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestRadioTower4F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestRadioTower5F.asm b/data/maps/attributes/WestRadioTower5F.asm new file mode 100644 index 0000000..802cd17 --- /dev/null +++ b/data/maps/attributes/WestRadioTower5F.asm @@ -0,0 +1,27 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestRadioTower5F.blk"
\ No newline at end of file diff --git a/data/maps/attributes/WestRocketRaidedHouse.asm b/data/maps/attributes/WestRocketRaidedHouse.asm new file mode 100644 index 0000000..fffd081 --- /dev/null +++ b/data/maps/attributes/WestRocketRaidedHouse.asm @@ -0,0 +1,29 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/attributes/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/blk/WestRocketRaidedHouse.blk"
\ No newline at end of file diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index bc05bd3..e53d1e0 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "LandmarkNames", ROMX[$4AAF], BANK[$3F] +SECTION "data/maps/landmarks.asm", ROMX LandmarkNames:: db "サイレント@" ; SILENT @@ -47,4 +47,4 @@ LandmarkNames:: db "#りーぐ６@" ; POKEMON_LEAGUE_6 db "#りーぐ７@" ; POKEMON_LEAGUE_7 db "#りーぐ７@" ; POKEMON_LEAGUE_7_2 - db "しずかなおか@" ; SILENT_HILL + db "しずかなおか@" ; SILENT_HILL
\ No newline at end of file diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 1332a0e..8cdef24 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -1,17 +1,6 @@ INCLUDE "constants.asm" -map: MACRO -;\1: map name: for the MapAttributes pointer (see data/maps/attributes.asm) -;\2: tileset: a TILESET_* constant -;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON -;\4: location: from constants/landmark_constants.asm - db BANK(\1_MapAttributes), \2, \3 - dw \1_MapAttributes - db \4 - db 0, 0 ; ??? -ENDM - -SECTION "Map Data", ROMX[$4000], BANK[$04] +SECTION "data/maps/maps.asm", ROMX db 0 ; ??? @@ -44,11 +33,11 @@ MapGroup_SilentHill: map RouteSilentEastGate, TILESET_ROUTE_GATE, GATE, LANDMARK_ROUTE_SILENT_EAST map PlayerHouse1F, TILESET_HOUSE, INDOOR, LANDMARK_SILENT_HILL map PlayerHouse2F, TILESET_HOUSE, INDOOR, LANDMARK_SILENT_HILL - map SilentPokecenter, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILL + map SilentHillPokecenter, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILL map SilentHillHouse, TILESET_HOUSE, INDOOR, LANDMARK_SILENT_HILL - map SilentHillLab, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL - map SilentHillLab2, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL - map Unused13, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL + map SilentHillLabFront, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL + map SilentHillLabBack, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL + map UnusedMap13, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL map ShizukanaOka, TILESET_FOREST, CAVE, LANDMARK_NONE MapGroup_OldCity: @@ -294,4 +283,4 @@ MapGroup_Misc: map SlowpokeWellEntrance, TILESET_CAVE, CAVE, LANDMARK_NONE map SlowpokeWellMain, TILESET_CAVE, CAVE, LANDMARK_NONE -MapGroup_Empty: +MapGroup_Empty:
\ No newline at end of file diff --git a/data/moves/names.asm b/data/moves/names.asm index db98d65..7936696 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "MoveNames", ROMX[$52A1], BANK[$10] +SECTION "data/moves/names.asm", ROMX MoveNames:: db "はたく@" ; POUND @@ -253,4 +253,4 @@ MoveNames:: db "てつわん@" ; STRONG_ARM db "ひかりゴケ@" ; BRIGHT_MOSS db "うずしお@" ; WHIRLPOOL - db "とびはねる@" ; BOUNCE + db "とびはねる@" ; BOUNCE
\ No newline at end of file diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index e62f1d5..84183ac 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "TM/HM Moves", ROMX[$52D1], BANK[$04] +SECTION "data/moves/tmhm_moves.asm", ROMX ; This is a nearly-sequential table of new moves. ; It was probably meant for easy testing, not as @@ -65,4 +65,4 @@ TMHMMoves: ; 04:52d1 db MOVE_STRONG_ARM ; HM04 db MOVE_BRIGHT_MOSS ; HM05 db MOVE_WHIRLPOOL ; HM06 - db MOVE_BOUNCE ; HM07 + db MOVE_BOUNCE ; HM07
\ No newline at end of file diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 7b3a07e..6da691e 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Base Data", ROMX[$4F10], BANK[$14] +SECTION "data/pokemon/base_stats.asm", ROMX tmhm: MACRO ; used in data/pokemon/base_stats/*.asm @@ -288,4 +288,4 @@ BaseStats_Houou:: INCLUDE "data/pokemon/base_stats/houou.inc" BaseStats_Togepy:: INCLUDE "data/pokemon/base_stats/togepy.inc" BaseStats_Bulu:: INCLUDE "data/pokemon/base_stats/bulu.inc" BaseStats_Tail:: INCLUDE "data/pokemon/base_stats/tail.inc" -BaseStats_Leafy:: INCLUDE "data/pokemon/base_stats/leafy.inc" +BaseStats_Leafy:: INCLUDE "data/pokemon/base_stats/leafy.inc"
\ No newline at end of file diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 1e6a6b5..6f0b804 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Alphabetical Pokedex Order", ROMX[$4943], BANK[$10] +SECTION "data/pokemon/dex_order_alpha.asm", ROMX ; Every Pokémon sorted alphabetically by name (gojūon order). @@ -255,4 +255,4 @@ AlphabeticalPokedexOrder: ; 0x40943 db DEX_ROKON db DEX_WARWOLF db DEX_WATANEKO - db DEX_WANRIKY + db DEX_WANRIKY
\ No newline at end of file diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index c18757b..fb94284 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Evolutions and Attacks", ROMX[$6493], BANK[$10] +SECTION "data/pokemon/evos_attacks.asm", ROMX ; Evolutions for Pokémon available in the demo were removed, ; and have been left in comments. @@ -3296,4 +3296,4 @@ LeafyEvosAttacks: ; 43aa4 db 49, MOVE_MORNING_SUN db 56, MOVE_WRAP db 63, MOVE_SOLARBEAM - db 0 ; no more level-up moves + db 0 ; no more level-up moves
\ No newline at end of file diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 54d5263..15475c9 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "PokemonNames", ROMX[$6D75], BANK[$14] +SECTION "data/pokemon/names.asm", ROMX PokemonNames:: db "フシギダネ" ; FUSHIGIDANE @@ -253,4 +253,4 @@ PokemonNames:: db "トゲピー@" ; TOGEPY db "ブルー@@" ; BULU db "テイル@@" ; TAIL - db "りーフィ@" ; LEAFY + db "りーフィ@" ; LEAFY
\ No newline at end of file diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc index f10af54..edb6a77 100644 --- a/data/predef_pointers.inc +++ b/data/predef_pointers.inc @@ -93,7 +93,7 @@ GiveItemPredef:: add_predef Function8c4be add_predef Function8c9c6 add_predef Function8c940 ; 50 - add_predef Functioncc001 + add_predef PlayBattleAnim add_predef Functioncc000 add_predef Functioncc000_2 add_predef Functionfdb66 diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 47b0c38..82d3d7e 100644 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Tileset Headers", ROMX[$488D], BANK[$03] -else -SECTION "Tileset Headers", ROMX[$4875], BANK[$03] -endc +; if DEBUG +SECTION "data/tileset_headers.asm", ROMX +; else +; SECTION "Tileset Headers", ROMX[$4875], BANK[$03] +; endc Tileset_00: ; 0xc88d db $06 ; bank @@ -285,4 +285,4 @@ Tileset_1b: ; 0xc9b6 db $77 ; talking over tile 1 db $40 ; talking over tile 2 db $00 ; talking over tile 3 - db $00 ; unknown + db $00 ; unknown
\ No newline at end of file diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index 8e130f8..02c8203 100644 --- a/data/trainers/class_names.asm +++ b/data/trainers/class_names.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "TrainerClassNames", ROMX[$4D90], BANK[$0E] +SECTION "data/trainers/class_names.asm", ROMX TrainerClassNames:: ; 38d90 db "ハヤト@" ; HAYATO @@ -66,4 +66,4 @@ TrainerClassNames:: ; 38d90 db "ふたごちゃん@" ; TWINS db "ゲルゲだんいん♂@" ; GERUGE_MEMBER_M_2 db "してんのう♂@" ; ELITE_FOUR_M - db "してんのう♀@" ; ELITE_FOUR_F + db "してんのう♀@" ; ELITE_FOUR_F
\ No newline at end of file diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 013cf58..b8d8a20 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -9,7 +9,7 @@ INCLUDE "constants.asm" ; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves ; - db -1 ; end -SECTION "Trainer Parties", ROMX[$5110], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties", ROMX INCLUDE "data/trainers/party_pointers.inc" @@ -622,7 +622,7 @@ KimonoGirlGroup:: else -SECTION "Trainer Parties 1 TEMPORARY", ROMX[$51BF], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 1 TEMPORARY", ROMX AkaneGroup:: BugCatcherBoyGroup:: ; BUG_CATCHER_BOY_KENJI @@ -635,47 +635,47 @@ BugCatcherBoyGroup:: db 7, DEX_KONGPANG, ITEM_NONE, MOVE_STUN_SPORE, MOVE_LEECH_LIFE, MOVE_NONE, MOVE_NONE db -1 ; end -SECTION "Trainer Parties 2 TEMPORARY", ROMX[$52B4], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 2 TEMPORARY", ROMX MikanGroup:: -SECTION "Trainer Parties 3 TEMPORARY", ROMX[$53BC], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 3 TEMPORARY", ROMX OkidoGroup:: -SECTION "Trainer Parties 4 TEMPORARY", ROMX[$54BA], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 4 TEMPORARY", ROMX WataruGroup:: -SECTION "Trainer Parties 5 TEMPORARY", ROMX[$54E0], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 5 TEMPORARY", ROMX GerugeMemberMGroup:: -SECTION "Trainer Parties 6 TEMPORARY", ROMX[$54FE], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 6 TEMPORARY", ROMX Trio1Group:: BeautyGroup:: -SECTION "Trainer Parties 7 TEMPORARY", ROMX[$55EB], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 7 TEMPORARY", ROMX FledglingGroup:: -SECTION "Trainer Parties 8 TEMPORARY", ROMX[$56CE], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 8 TEMPORARY", ROMX PokeManiacGroup:: -SECTION "Trainer Parties 9 TEMPORARY", ROMX[$57BC], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 9 TEMPORARY", ROMX GentlemanGroup:: -SECTION "Trainer Parties 10 TEMPORARY", ROMX[$57E0], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 10 TEMPORARY", ROMX TeacherMGroup:: -SECTION "Trainer Parties 11 TEMPORARY", ROMX[$57EC], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 11 TEMPORARY", ROMX TeacherFGroup:: -SECTION "Trainer Parties 12 TEMPORARY", ROMX[$57F2], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 12 TEMPORARY", ROMX ManchildGroup:: -SECTION "Trainer Parties 13 TEMPORARY", ROMX[$58C3], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 13 TEMPORARY", ROMX RockerGroup:: -SECTION "Trainer Parties 14 TEMPORARY", ROMX[$58F2], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 14 TEMPORARY", ROMX HikerGroup:: -SECTION "Trainer Parties 15 TEMPORARY", ROMX[$5995], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 15 TEMPORARY", ROMX KimonoGirlGroup:: ; KIMONO_GIRL_KOUME db "こうめ@", TRAINERTYPE_ITEM_MOVES @@ -687,112 +687,112 @@ KimonoGirlGroup:: db 10, DEX_PURIN, ITEM_NONE, MOVE_CHARM, MOVE_POUND, MOVE_ENCORE, MOVE_NONE db -1 ; end -SECTION "Trainer Parties 16 TEMPORARY", ROMX[$518A], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 16 TEMPORARY", ROMX HayatoGroup:: -SECTION "Trainer Parties 17 TEMPORARY", ROMX[$5216], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 17 TEMPORARY", ROMX TsukishiGroup:: LassGroup:: -SECTION "Trainer Parties 18 TEMPORARY", ROMX[$526F], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 18 TEMPORARY", ROMX EnokiGroup:: -SECTION "Trainer Parties 19 TEMPORARY", ROMX[$528F], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 19 TEMPORARY", ROMX OkeraGroup:: -SECTION "Trainer Parties 20 TEMPORARY", ROMX[$533D], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 20 TEMPORARY", ROMX GamaGroup:: -SECTION "Trainer Parties 21 TEMPORARY", ROMX[$5542], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 21 TEMPORARY", ROMX Trio2Group:: -SECTION "Trainer Parties 22 TEMPORARY", ROMX[$5554], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 22 TEMPORARY", ROMX Trio3Group:: -SECTION "Trainer Parties 23 TEMPORARY", ROMX[$5673], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 23 TEMPORARY", ROMX ProfessionalMGroup:: ProfessionalFGroup:: -SECTION "Trainer Parties 24 TEMPORARY", ROMX[$5812], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 24 TEMPORARY", ROMX SwimmerMGroup:: -SECTION "Trainer Parties 25 TEMPORARY", ROMX[$5821], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 25 TEMPORARY", ROMX SuperNerdGroup:: -SECTION "Trainer Parties 26 TEMPORARY", ROMX[$5833], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 26 TEMPORARY", ROMX EngineerGroup:: -SECTION "Trainer Parties 27 TEMPORARY", ROMX[$5965], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 27 TEMPORARY", ROMX JugglerGroup:: -SECTION "Trainer Parties 28 TEMPORARY", ROMX[$5971], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 28 TEMPORARY", ROMX TwinsGroup:: -SECTION "Trainer Parties 29 TEMPORARY", ROMX[$5976], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 29 TEMPORARY", ROMX SchoolboyGroup:: ; SCHOOLBOY_TETSUYA db "てつや@", TRAINERTYPE_ITEM db 8, DEX_YADOKING, ITEM_NONE db -1 ; end -SECTION "Trainer Parties 30 TEMPORARY", ROMX[$597F], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 30 TEMPORARY", ROMX FirebreatherGroup:: ; FIREBREATHER_AKITO db "あきと@", TRAINERTYPE_ITEM db 8, DEX_BOOBY, ITEM_NONE db -1 ; end -SECTION "Trainer Parties 31 TEMPORARY", ROMX[$5320], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 31 TEMPORARY", ROMX BlueGroup:: -SECTION "Trainer Parties 32 TEMPORARY", ROMX[$5375], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 32 TEMPORARY", ROMX RivalGroup:: -SECTION "Trainer Parties 33 TEMPORARY", ROMX[$5404], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 33 TEMPORARY", ROMX SakakiGroup:: -SECTION "Trainer Parties 34 TEMPORARY", ROMX[$5427], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 34 TEMPORARY", ROMX ProtagonistGroup:: -SECTION "Trainer Parties 35 TEMPORARY", ROMX[$5433], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 35 TEMPORARY", ROMX SibaGroup:: KasumiGroup:: FisherGroup:: -SECTION "Trainer Parties 36 TEMPORARY", ROMX[$5476], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 36 TEMPORARY", ROMX KannaGroup:: -SECTION "Trainer Parties 37 TEMPORARY", ROMX[$555D], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 37 TEMPORARY", ROMX RocketFGroup:: -SECTION "Trainer Parties 38 TEMPORARY", ROMX[$557E], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 38 TEMPORARY", ROMX YoungsterGroup:: -SECTION "Trainer Parties 39 TEMPORARY", ROMX[$564F], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 39 TEMPORARY", ROMX ProdigyGroup:: -SECTION "Trainer Parties 40 TEMPORARY", ROMX[$578C], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 40 TEMPORARY", ROMX RocketMGroup:: -SECTION "Trainer Parties 41 TEMPORARY", ROMX[$5808], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 41 TEMPORARY", ROMX SwimmerFGroup:: -SECTION "Trainer Parties 42 TEMPORARY", ROMX[$5817], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 42 TEMPORARY", ROMX SailorGroup:: -SECTION "Trainer Parties 43 TEMPORARY", ROMX[$58FE], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 43 TEMPORARY", ROMX BikerGroup:: -SECTION "Trainer Parties 44 TEMPORARY", ROMX[$594D], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 44 TEMPORARY", ROMX RockClimberGroup:: -SECTION "Trainer Parties 45 TEMPORARY", ROMX[$5959], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 45 TEMPORARY", ROMX BurglarGroup:: -SECTION "Trainer Parties 46 TEMPORARY", ROMX[$5969], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 46 TEMPORARY", ROMX BlackbeltGroup:: -SECTION "Trainer Parties 47 TEMPORARY", ROMX[$596D], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 47 TEMPORARY", ROMX PsychicGroup:: KungFuMasterGroup:: FortuneTellerGroup:: @@ -802,11 +802,11 @@ MediumGroup:: SoldierGroup:: GerugeMemberFGroup:: -SECTION "Trainer Parties 48 TEMPORARY", ROMX[$5988], BANK[$0E] +SECTION "data/trainers/parties.asm@Trainer Parties 48 TEMPORARY", ROMX SportsmanGroup:: ; SPORTSMAN_SHIGEKI db "てつじ@", TRAINERTYPE_ITEM_MOVES db 9, DEX_DONPHAN, ITEM_NONE, MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_NONE, MOVE_NONE db -1 ; end -endc +endc
\ No newline at end of file diff --git a/data/types/names.asm b/data/types/names.asm index 07ebec7..7036847 100644 --- a/data/types/names.asm +++ b/data/types/names.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "TypeNames", ROMX[$40DD], BANK[$14] +SECTION "data/types/names.asm", ROMX TypeNames:: dw .Normal ; NORMAL @@ -50,4 +50,4 @@ TypeNames:: .Ghost: db "ゴースト@" .Metal: db "メタル@" .Dragon: db "ドラゴン@" -.Dark: db "あく@" +.Dark: db "あく@"
\ No newline at end of file diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm index c36a249..905f478 100644 --- a/data/types/search_strings.asm +++ b/data/types/search_strings.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "PokedexTypeSearchStrings", ROMX[$4ECC], BANK[$10] +SECTION "data/types/search_strings.asm", ROMX PokedexTypeSearchStrings:: db "ノーマル@" ; NORMAL @@ -17,4 +17,4 @@ PokedexTypeSearchStrings:: db "むし @" ; BUG db "いわ @" ; ROCK db "ゴースト@" ; GHOST - db "ドラゴン@" ; DRAGON + db "ドラゴン@" ; DRAGON
\ No newline at end of file diff --git a/data/types/search_types.asm b/data/types/search_types.asm index fbaa70d..ed41650 100644 --- a/data/types/search_types.asm +++ b/data/types/search_types.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "PokedexTypeSearchConversionTable", ROMX[$5068], BANK[$10] +SECTION "data/types/search_types.asm", ROMX PokedexTypeSearchConversionTable:: db TYPE_NORMAL @@ -17,4 +17,4 @@ PokedexTypeSearchConversionTable:: db TYPE_BUG db TYPE_ROCK db TYPE_GHOST - db TYPE_DRAGON + db TYPE_DRAGON
\ No newline at end of file diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index 8923a80..e23227a 100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Type Matchups", ROMX[$506D], BANK[$0D] +SECTION "data/types/type_matchups.asm", ROMX TypeMatchups: ; 3506d ; attacker, defender, *= @@ -110,4 +110,4 @@ TypeMatchups: ; 3506d db TYPE_NORMAL, TYPE_GHOST, NO_EFFECT db -1 ; end -; 3519b +; 3519b
\ No newline at end of file diff --git a/data/wild.asm b/data/wild.asm index d1cea5c..2796e91 100644 --- a/data/wild.asm +++ b/data/wild.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Wild Pokémon", ROMX[$6A3C], BANK[$0F] +SECTION "data/wild.asm", ROMX GrassWildMons:: ; f:6a3c @@ -642,4 +642,4 @@ endc db 5, DEX_PIKACHU db -1 ; end -; f:6e3e +; f:6e3e
\ No newline at end of file diff --git a/engine/Intro.asm b/engine/Intro.asm index aa10842..04497e4 100644 --- a/engine/Intro.asm +++ b/engine/Intro.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Oak Intro and Game Setup", ROMX[$558D], BANK[$01] +SECTION "engine/intro.asm", ROMX DemoStart:: ; 558D ld de, OakPic diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c79fb22..e1996c2 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Battle Random", ROMX [$63DA], BANK [$0F] +SECTION "engine/battle/core.asm", ROMX _BattleRandom: ; 3e3da (f:63da) ; If the normal RNG is used in a link battle it'll desync. ; To circumvent this a shared PRNG is used instead. @@ -66,4 +66,4 @@ _BattleRandom: ; 3e3da (f:63da) pop af pop bc pop hl - ret + ret
\ No newline at end of file diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 7e51b03..ee1f132 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Battle Anims BG Effects", ROMX [$4000], BANK [$32] +SECTION "engine/battle_anims/bg_effects.asm", ROMX const_def const BGSQUARE_SIX @@ -2373,4 +2373,4 @@ BattleBGEffects_Cosine: ; c8cf3 (32:4cf3) ld a, e ret -; c906f (32:506f) +; c906f (32:506f)
\ No newline at end of file diff --git a/engine/bcd.asm b/engine/bcd.asm index 6d441b2..20c94b8 100755 --- a/engine/bcd.asm +++ b/engine/bcd.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "BCD", ROMX[$4de3], BANK[$03] +SECTION "engine/bcd.asm", ROMX AddBCD: ; 03:4de3 and a @@ -52,4 +52,4 @@ SubBCD: ; 03:4df9 jr nz, .fill scf .done - ret + ret
\ No newline at end of file diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 741d601..b27f4b0 100755 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -3,7 +3,7 @@ INCLUDE "constants.asm" ; TODO - need to constantize tile ids, movements -SECTION "Field Moves", ROMX[$4fab], BANK[$03] +SECTION "engine/events/field_moves.asm", ROMX CutFunction: ; 03:4fab call .ResetScriptID @@ -539,4 +539,4 @@ TeleportScript: ; 03:5375 Text_ReturnToLastMonCenter: ; 03:5395 text "さいごに たちよった" line "#センターにもどります" - done + done
\ No newline at end of file diff --git a/engine/gfx.asm b/engine/gfx.asm index b97d2f5..7ab0071 100644 --- a/engine/gfx.asm +++ b/engine/gfx.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Misc GFX Loading Functions", ROMX[$4000], BANK[$3E] +SECTION "engine/gfx.asm", ROMX LoadFontGraphics:: ; f8000 (3e:4000) ld de, FontGFX diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index c30e5c0..a11bcec 100755 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Inventory", ROMX[$4AA1], BANK[$03] +SECTION "engine/items/inventory.asm@Inventory", ROMX _ReceiveItem: ; 03:4AA1 call DoesHLEqualwNumBagItems @@ -588,7 +588,7 @@ GetNumberedTMHM: ; 03:4D1A and a ret -SECTION "GetItemAmount", ROMX[$4e10], BANK[$03] +SECTION "engine/items/inventory.asm@GetItemAmount", ROMX ; Returns carry if user has the item ; and the amount in b @@ -634,7 +634,7 @@ CheckAmountInKeyItems: ; 03:4E2B scf ret -SECTION "_CheckTossableItem", ROMX[$53AD], BANK[$03] +SECTION "engine/items/inventory.asm@_CheckTossableItem", ROMX ; Return 1 in wItemAttributeParamBuffer and ; carry if wCurItem can't be removed from the bag. @@ -720,4 +720,4 @@ GetItemPrice: ; 03:540C ld d, a pop bc pop hl - ret + ret
\ No newline at end of file diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 7f886f1..6f854f0 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "ApplyPPUp", ROMX[$78f6], BANK[$03] +SECTION "engine/items/item_effects.asm", ROMX ApplyPPUp: ; 03:78f6 ld a, MON_MOVES @@ -76,4 +76,4 @@ ComputeMaxPP: ; 03:792B .no_pp_up ld [hl], b pop bc - ret + ret
\ No newline at end of file diff --git a/engine/landmarks.asm b/engine/landmarks.asm index 9e3c95d..ac3ed9d 100644 --- a/engine/landmarks.asm +++ b/engine/landmarks.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "GetLandmarkName", ROMX[$4AA5], BANK[$3F] +SECTION "engine/landmarks.asm", ROMX GetLandmarkName:: dec a @@ -8,4 +8,4 @@ GetLandmarkName:: call GetNthString ld d, h ld e, l - ret + ret
\ No newline at end of file diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index a9f712e..ae11c74 100644 --- a/engine/link/place_waiting_text.asm +++ b/engine/link/place_waiting_text.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "PlaceWaitingText", ROMX[$4000], BANK[$01] +SECTION "engine/link/place_waiting_text.asm", ROMX PlaceWaitingText:: ; 1:4000 hlcoord 3, 10 @@ -22,4 +22,4 @@ PlaceWaitingText:: ; 1:4000 jp DelayFrames .Waiting - db "つうしんたいきちゅう！@" + db "つうしんたいきちゅう！@"
\ No newline at end of file diff --git a/engine/math/math.asm b/engine/math/math.asm index 4395009..503743b 100644 --- a/engine/math/math.asm +++ b/engine/math/math.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Multiply and Divide Engine", ROMX [$6810], BANK [$1] +SECTION "engine/math/math.asm", ROMX _Multiply:: ; 6810 @@ -197,4 +197,4 @@ _Divide:: ; 6870 ldh [hDividend + 0], a ret -; 68f3 +; 68f3
\ No newline at end of file diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index be46a00..17f24af 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Debug Menu", ROMX[$4031], BANK[$01] +SECTION "engine/menu/debug_menu.asm", ROMX DebugMenu:: ; $4031 call ClearTileMap diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 2fc0d31..e32aa3d 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Initialize new game WRAM", ROMX[$52F9], BANK[$01] +SECTION "engine/menu/main_menu.asm@Initialize new game WRAM", ROMX ; TODO: Move this to another file when surrounding ; functions have been disassembled. InitializeNewGameWRAM: @@ -85,7 +85,7 @@ InitializeByteList: ld [hl], a ret -SECTION "Main Menu", ROMX[$53CC], BANK[$01] +SECTION "engine/menu/main_menu.asm@MainMenu", ROMX MainMenu:: ; 01:53CC ld hl, wd4a9 @@ -293,4 +293,4 @@ StartNewGame:: ; 555C call DebugSetUpPlayer jp IntroCleanup -; 558D +; 558D
\ No newline at end of file diff --git a/engine/menu/reset_dialog.asm b/engine/menu/reset_dialog.asm index 5c676a7..688a2e3 100644 --- a/engine/menu/reset_dialog.asm +++ b/engine/menu/reset_dialog.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Debug Reset Menu", ROMX[$4362], BANK[$3F] +SECTION "engine/menu/reset_dialog.asm", ROMX DisplayResetDialog:: ; fc362 (3f:4362) ld hl, _ResetConfirmText @@ -12,4 +12,4 @@ DisplayResetDialog:: ; fc362 (3f:4362) _ResetConfirmText:: text "ほんとにりセットしますか？" - done + done
\ No newline at end of file diff --git a/engine/overworld/object_collision.asm b/engine/overworld/object_collision.asm index 8d42a93..bfc99cb 100644 --- a/engine/overworld/object_collision.asm +++ b/engine/overworld/object_collision.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "GetSpritesNextTile", ROMX[$774a], BANK[$01] +SECTION "engine/overworld/object_collision.asm@GetSpritesNextTile", ROMX ; Get the tile that the sprite will walk onto next GetSpritesNextTile: ; 01:774a @@ -31,7 +31,7 @@ _IsObjectCollisionTileSolid: ; 01:775a -SECTION "_CheckObjectCollision", ROMX[$77dd], BANK[$01] +SECTION "engine/overworld/object_collision.asm@_CheckObjectCollision", ROMX ; returns the carry flag if a sprite is at coords d, e ; will not collide with sprite index stored in hEventCollisionException @@ -92,7 +92,7 @@ _CheckObjectCollision: ; 01:77dd scf ret -SECTION "_CheckPlayerObjectCollision", ROMX[$7894], BANK[$01] +SECTION "engine/overworld/object_collision.asm@_CheckPlayerObjectCollision", ROMX ; Sets the carry flag if the player will collide with another sprite's current or next position _CheckPlayerObjectCollision: ; 01:7894 @@ -154,4 +154,4 @@ _CheckPlayerObjectCollision: ; 01:7894 .collision scf - ret + ret
\ No newline at end of file diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 3c8cf7c..39b75bb 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Player Movement", ROMX[$4000], BANK[$03] +SECTION "engine/overworld/player_movement.asm@Player Movement", ROMX OverworldMovementCheck:: ; 03:4000 jp _OverworldMovementCheck @@ -1080,7 +1080,7 @@ GetCollisionType:: pop de ret -SECTION "Rest of Player Movement", ROMX[$4764], BANK[$03] +SECTION "engine/overworld/player_movement.asm@Rest of Player Movement", ROMX _UnusedReturnFalse:: ; 03:4764 xor a @@ -1122,7 +1122,7 @@ CheckCollisionSometimesSolid:: ; 03:4769 ret -SECTION "_RedrawPlayerSprite", ROMX[$4000], BANK[$05] +SECTION "engine/overworld/player_movement.asm@_RedrawPlayerSprite", ROMX _RedrawPlayerSprite: ; 05:4000 call GetPlayerSprite @@ -1159,4 +1159,4 @@ PlayerSpriteTable: ; 03:402d db PLAYER_BIKE, SPRITE_GOLD_BIKE db PLAYER_SKATE, SPRITE_GOLD_SKATEBOARD db PLAYER_SURF, SPRITE_LAPLACE - db -1 + db -1
\ No newline at end of file diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm index 2476c46..e07c150 100755 --- a/engine/overworld/spawn_points.asm +++ b/engine/overworld/spawn_points.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "LoadSpawnPoint", ROMX[$4791], BANK[$03] +SECTION "engine/overworld/spawn_points.asm", ROMX LoadSpawnPoint: ; 03:4791 ; loads the spawn point in wDefaultSpawnPoint @@ -56,4 +56,4 @@ IsSpawnPoint: ; 03:47b6 ret .succeed scf - ret + ret
\ No newline at end of file diff --git a/engine/palettes.asm b/engine/palettes.asm index 67ed9fe..b90c99e 100644 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Overworld fade", ROMX[$433e], BANK[$23] +SECTION "engine/palettes.asm@Overworld fade", ROMX OverworldFadeIn:: ; 23:433e ld c, 0 @@ -18,7 +18,7 @@ OverworldFadeOut:: ; 23:4349 ; TODO: merge this -SECTION "Palette fading, part 2?", ROMX[$43d1], BANK[$23] +SECTION "engine/palettes.asm@Palette fading, part 2?", ROMX ApplyPalettesAtHL:: ; 23:43d1 push hl @@ -110,4 +110,4 @@ GetFadeStep:: ; 23:43fb db $e8, $d0, $d0 db $90, $80, $80 db $40, $40, $40 - db $00, $00, $00 + db $00, $00, $00
\ No newline at end of file diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm index 8456623..fbee391 100755 --- a/engine/pokemon/health.asm +++ b/engine/pokemon/health.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "HealParty", ROMX[$4d6f], BANK[$03] +SECTION "engine/pokemon/health.asm@HealParty", ROMX HealParty: ; 03:4d6f ld hl, wPartySpecies @@ -95,7 +95,7 @@ HealParty: ; 03:4d6f jr nz, .pp_up ret -SECTION "HP Bar", ROMX[$4e3c], BANK[$03] +SECTION "engine/pokemon/health.asm@HP Bar", ROMX ComputeHPBarPixels: ; 03:4e3c push hl @@ -355,4 +355,4 @@ UpdateHPBar_CalcOldNewHPBarPixels: ; 03:4F8B ld d, e ld e, a pop hl - ret + ret
\ No newline at end of file diff --git a/engine/predef.asm b/engine/predef.asm index 14de69f..c9293b4 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Predef pointers", ROMX[$62B0], BANK[$01] -else -SECTION "Predef pointers", ROMX[$62AD], BANK[$01] -endc +; if DEBUG +SECTION "engine/predef.asm", ROMX +; else +; SECTION "Predef pointers", ROMX[$62AD], BANK[$01] +; endc GetPredefPointer:: ; 1:62b0 ld a, h @@ -33,4 +33,4 @@ GetPredefPointer:: ; 1:62b0 ld d, [hl] ret -INCLUDE "data/predef_pointers.inc" +INCLUDE "data/predef_pointers.inc"
\ No newline at end of file diff --git a/engine/smallflag.asm b/engine/smallflag.asm index a231d0b..abf0df5 100755 --- a/engine/smallflag.asm +++ b/engine/smallflag.asm @@ -1,4 +1,4 @@ -SECTION "SmallFarFlagAction", ROMX[$4d33], BANK[$03] +SECTION "engine/smallflag.asm", ROMX SmallFarFlagAction: ; 03:4d33 ; Perform action b on bit c in flag array hl. diff --git a/engine/sprites/sprites.asm b/engine/sprites/sprites.asm index a1dc401..6f07956 100644 --- a/engine/sprites/sprites.asm +++ b/engine/sprites/sprites.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "LoadOverworldSprite", ROMX[$4150], BANK[$05] +SECTION "engine/sprites/sprites.asm@LoadOverworldSprite", ROMX LoadOverworldSprite: ; 05:4150 push af @@ -53,7 +53,7 @@ GetOverworldSpriteData: ; 05:417d pop hl ret -SECTION "OverworldSprites", ROMX[$423B], BANK[$05] +SECTION "engine/sprites/sprites.asm@OverworldSprites", ROMX overworld_sprite: MACRO ; pointer, length, bank @@ -152,4 +152,4 @@ OverworldSprites:: overworld_sprite OldLinkReceptionistSpriteGFX, 4 overworld_sprite OldLinkReceptionistSpriteGFX, 4 overworld_sprite EggSpriteGFX, 4 - overworld_sprite BoulderSpriteGFX, 4 + overworld_sprite BoulderSpriteGFX, 4
\ No newline at end of file diff --git a/engine/title.asm b/engine/title.asm index d7ae3a7..c39abdd 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Title screen", ROMX[$5D8C], BANK[$01] +SECTION "engine/title.asm@Title screen", ROMX IntroSequence:: callab GameFreakIntro ; Bank $39 @@ -629,15 +629,15 @@ SetTitleGfxNext:: jr nz, .loop ret -if DEBUG -SECTION "Title screen TEMPORARY", ROMX[$62A5], BANK[$01] ; TODO: merge this with the main section above -else -SECTION "Title screen TEMPORARY", ROMX[$62A2], BANK[$01] ; TODO: merge this with the main section above -endc +; if DEBUG +SECTION "engine/title.asm@Title screen TEMPORARY", ROMX +; else +; SECTION "Title screen TEMPORARY", ROMX[$62A2], BANK[$01] ; TODO: merge this with the main section above +; endc GameInit:: call ClearWindowData ld a, $23 ld [wce5f], a - jp IntroSequence + jp IntroSequence
\ No newline at end of file @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -SECTION "Mon Nest Icon", ROMX[$4A0F], BANK[$02] +SECTION "gfx.asm@Mon Nest Icon", ROMX PokedexNestIconGFX:: INCBIN "gfx/pokegear/dexmap_nest_icon.1bpp" -SECTION "Bank 2 Misc GFX", ROMX[$44bf], BANK[$02] +SECTION "gfx.asm@Bank 2 Misc GFX", ROMX INCBIN "gfx/overworld/gfx_84bf.2bpp" JumpShadowGFX:: INCBIN "gfx/overworld/shadow.2bpp" @@ -15,23 +15,23 @@ INCBIN "gfx/overworld/question.2bpp" HappyEmoteGFX:: INCBIN "gfx/overworld/happy.2bpp" -SECTION "Pokegear GFX", ROMX[$4F32], BANK[$02] +SECTION "gfx.asm@Pokegear GFX", ROMX PokegearGFX:: INCBIN "gfx/pokegear/pokegear.2bpp" -SECTION "Title Screen BG Decoration Border", ROMX[$51FB], BANK[$02] +SECTION "gfx.asm@Title Screen BG Decoration Border", ROMX TitleBGDecorationBorder:: INCBIN "gfx/title/titlebgdecoration.2bpp" -SECTION "Super Palettes", ROMX[$5B4C], BANK[$02] +SECTION "gfx.asm@Super Palettes", ROMX INCLUDE "data/pokemon/palettes.inc" INCLUDE "data/super_palettes.inc" -SECTION "Unused SGB Border GFX", ROMX[$62CC], BANK[$02] +SECTION "gfx.asm@Unused SGB Border GFX", ROMX UnusedSGBBorderGFX:: INCBIN "gfx/sgb/sgb_border_alt.2bpp" -SECTION "SGB Border GFX", ROMX[$6B1C], BANK[$02] +SECTION "gfx.asm@SGB Border GFX", ROMX SGBBorderGFX:: if def(GOLD) INCBIN "gfx/sgb/sgb_border_gold.2bpp" @@ -39,7 +39,7 @@ else INCBIN "gfx/sgb/sgb_border_silver.2bpp" endc -SECTION "Title Screen GFX", ROMX[$47CF], BANK[$04] +SECTION "gfx.asm@Title Screen GFX", ROMX if def(GOLD) TitleScreenGFX:: INCBIN "gfx/title/title.2bpp" TitleScreenVersionGFX:: INCBIN "gfx/title/title_gold_version.2bpp" @@ -54,11 +54,11 @@ TitleScreenLogoGFX:: INCBIN "gfx/title/title_logo.2bpp" TitleScreenGoldLogoGFX:: INCBIN "gfx/title/title_silverlogo.2bpp" endc -SECTION "Mail Icon GFX", ROMX[$5BB1], BANK[$04] +SECTION "gfx.asm@Mail Icon GFX", ROMX MailIconGFX:: INCBIN "gfx/icons/mail.2bpp" -SECTION "Trainer Card GFX", ROMX[$7171], BANK[$04] +SECTION "gfx.asm@Trainer Card GFX", ROMX TrainerCardGFX:: INCBIN "gfx/trainer_card/trainer_card.2bpp" ; 0x013171--0x013381 TrainerCardColonGFX:: INCBIN "gfx/trainer_card/colon.2bpp" ; 0x013381--0x013391 TrainerCardIDNoGFX:: INCBIN "gfx/trainer_card/id_no.2bpp" ; 0x013391--0x0133B1 @@ -75,91 +75,91 @@ if DEBUG Unreferenced_UnusedLeaderNameGFX:: INCBIN "gfx/trainer_card/unused_leader_name.2bpp" ; 0x13ba3 endc -SECTION "Bank 6 Tilesets 00", ROMX[$4000], BANK[$06] +SECTION "gfx.asm@Bank 6 Tilesets 00", ROMX Tileset_00_GFX: INCBIN "gfx/tilesets/tileset_00.2bpp" -SECTION "Bank 6 Tilesets 01", ROMX[$5800], BANK[$06] +SECTION "gfx.asm@Bank 6 Tilesets 01", ROMX Tileset_01_GFX: INCBIN "gfx/tilesets/tileset_01.2bpp" -SECTION "Bank 6 Tilesets 02", ROMX[$6600], BANK[$06] +SECTION "gfx.asm@Bank 6 Tilesets 02", ROMX Tileset_02_GFX: INCBIN "gfx/tilesets/tileset_02.2bpp" -SECTION "Bank 6 Tilesets 09", ROMX[$7400], BANK[$06] +SECTION "gfx.asm@Bank 6 Tilesets 09", ROMX Tileset_09_GFX: INCBIN "gfx/tilesets/tileset_09.2bpp" -SECTION "Bank 7 Tilesets 13", ROMX[$4000], BANK[$07] +SECTION "gfx.asm@Bank 7 Tilesets 13", ROMX Tileset_13_GFX: INCBIN "gfx/tilesets/tileset_13.2bpp" -SECTION "Bank 7 Tilesets 0e", ROMX[$4B00], BANK[$07] +SECTION "gfx.asm@Bank 7 Tilesets 0e", ROMX Tileset_0e_GFX: INCBIN "gfx/tilesets/tileset_0e.2bpp" -SECTION "Bank 7 Tilesets 06", ROMX[$5600], BANK[$07] +SECTION "gfx.asm@Bank 7 Tilesets 06", ROMX Tileset_06_GFX: INCBIN "gfx/tilesets/tileset_06.2bpp" -SECTION "Bank 7 Tilesets 05", ROMX[$6400], BANK[$07] +SECTION "gfx.asm@Bank 7 Tilesets 05", ROMX Tileset_05_GFX: INCBIN "gfx/tilesets/tileset_05.2bpp" -SECTION "Bank 7 Tilesets 03", ROMX[$7200], BANK[$07] +SECTION "gfx.asm@Bank 7 Tilesets 03", ROMX Tileset_03_GFX: INCBIN "gfx/tilesets/tileset_03.2bpp" -SECTION "Bank 8 Tilesets 04", ROMX[$4000], BANK[$08] +SECTION "gfx.asm@Bank 8 Tilesets 04", ROMX Tileset_04_GFX: INCBIN "gfx/tilesets/tileset_04.2bpp" -SECTION "Bank 8 Tilesets 07", ROMX[$4E00], BANK[$08] +SECTION "gfx.asm@Bank 8 Tilesets 07", ROMX Tileset_07_GFX: INCBIN "gfx/tilesets/tileset_07.2bpp" -SECTION "Bank 8 Tilesets 08", ROMX[$5C00], BANK[$08] +SECTION "gfx.asm@Bank 8 Tilesets 08", ROMX Tileset_08_GFX: INCBIN "gfx/tilesets/tileset_08.2bpp" -SECTION "Bank 8 Tilesets 0f", ROMX[$6A00], BANK[$08] +SECTION "gfx.asm@Bank 8 Tilesets 0f", ROMX Tileset_0f_GFX: INCBIN "gfx/tilesets/tileset_0f.2bpp" -SECTION "Bank 8 Tilesets 11", ROMX[$7500], BANK[$08] +SECTION "gfx.asm@Bank 8 Tilesets 11", ROMX Tileset_11_GFX: INCBIN "gfx/tilesets/tileset_11.2bpp" -SECTION "Gameboy GFX", ROMX[$5641], BANK[$0A] +SECTION "gfx.asm@Gameboy GFX", ROMX TradeGameBoyGFX:: INCBIN "gfx/trade/gameboy.2bpp" -SECTION "Bank C Tilesets 12", ROMX[$4000], BANK[$0C] +SECTION "gfx.asm@Bank C Tilesets 12", ROMX Tileset_12_GFX: INCBIN "gfx/tilesets/tileset_12.2bpp" -SECTION "Bank C Tilesets 0b", ROMX[$4B00], BANK[$0C] +SECTION "gfx.asm@Bank C Tilesets 0b", ROMX Tileset_0b_GFX: INCBIN "gfx/tilesets/tileset_0b.2bpp" -SECTION "Bank C Tilesets 0d", ROMX[$5600], BANK[$0C] +SECTION "gfx.asm@Bank C Tilesets 0d", ROMX Tileset_0d_GFX: INCBIN "gfx/tilesets/tileset_0d.2bpp" -SECTION "Bank C Tilesets 14", ROMX[$6100], BANK[$0C] +SECTION "gfx.asm@Bank C Tilesets 14", ROMX Tileset_14_GFX: INCBIN "gfx/tilesets/tileset_14.2bpp" -SECTION "Bank C Tilesets 0c", ROMX[$7100], BANK[$0C] +SECTION "gfx.asm@Bank C Tilesets 0c", ROMX Tileset_0c_GFX: INCBIN "gfx/tilesets/tileset_0c.2bpp" -SECTION "PokeBalls GFX", ROMX[$4494], BANK[$0E] +SECTION "gfx.asm@PokeBalls GFX", ROMX PokeBallsGFX:: INCBIN "gfx/misc/poke_balls.2bpp" ; 0x038494--0x0384d4 -SECTION "Pokedex GFX", ROMX[$40D5], BANK[$11] +SECTION "gfx.asm@Pokedex GFX", ROMX PokedexButtonsGFX:: INCBIN "gfx/pokedex/buttons.2bpp" PokedexPokeBallGFX:: @@ -169,7 +169,7 @@ INCBIN "gfx/pokedex/cursors.2bpp" PokedexSearchGFX:: INCBIN "gfx/pokedex/search.2bpp" -SECTION "Trainer Battle Sprites", ROMX[$4000], BANK[$12] +SECTION "gfx.asm@Trainer Battle Sprites", ROMX HayatoPic:: INCBIN "gfx/trainer/hayato.pic" AkanePic:: INCBIN "gfx/trainer/akane.pic" ; Gen 1 Bug Catcher TsukushiPic:: INCBIN "gfx/trainer/tsukushi.pic" @@ -212,38 +212,38 @@ KimonoGirlPic:: INCBIN "gfx/trainer/kimonogirl.pic" TwinsPic:: INCBIN "gfx/trainer/twins.pic" -SECTION "Bank 13 Tilesets 0a", ROMX[$4000], BANK[$13] +SECTION "gfx.asm@Bank 13 Tilesets 0a", ROMX Tileset_0a_GFX: INCBIN "gfx/tilesets/tileset_0a.2bpp" -SECTION "Bank 13 Tilesets 16", ROMX[$4B00], BANK[$13] +SECTION "gfx.asm@Bank 13 Tilesets 16", ROMX Tileset_16_GFX: INCBIN "gfx/tilesets/tileset_16.2bpp" -SECTION "Bank 13 Tilesets 19", ROMX[$5B00], BANK[$13] +SECTION "gfx.asm@Bank 13 Tilesets 19", ROMX Tileset_19_GFX: INCBIN "gfx/tilesets/tileset_19.2bpp" -SECTION "Bank 13 Tilesets 1a", ROMX[$6900], BANK[$13] +SECTION "gfx.asm@Bank 13 Tilesets 1a", ROMX Tileset_1a_GFX: INCBIN "gfx/tilesets/tileset_1a.2bpp" -SECTION "PKMN Sprite Bank List", ROMX[$725C], BANK[$14] +SECTION "gfx.asm@PKMN Sprite Bank List", ROMX INCLUDE "gfx/pokemon/pkmn_pic_banks.asm" INCLUDE "gfx/pokemon/pkmn_pics.asm" -SECTION "Annon Pic Ptrs and Pics", ROMX[$4d6a], BANK[$1f] +SECTION "gfx.asm@Annon Pic Ptrs and Pics", ROMX INCLUDE "gfx/pokemon/annon_pic_ptrs.asm" INCLUDE "gfx/pokemon/annon_pics.asm" INCLUDE "gfx/pokemon/egg.asm" -SECTION "Attack Animation GFX", ROMX[$4000], BANK[$21] +SECTION "gfx.asm@Attack Animation GFX", ROMX INCBIN "gfx/battle_anims/attack_animations.2bpp" -SECTION "Pokemon Party Sprites", ROMX[$60CC], BANK[$23] +SECTION "gfx.asm@Pokemon Party Sprites", ROMX NyoromoIcon:: INCBIN "gfx/icons/nyoromo.2bpp" PurinIcon:: INCBIN "gfx/icons/purin.2bpp" DigdaIcon:: INCBIN "gfx/icons/digda.2bpp" @@ -277,13 +277,13 @@ ButterfreeIcon:: INCBIN "gfx/icons/butterfree.2bpp" ZubatIcon:: INCBIN "gfx/icons/zubat.2bpp" KabigonIcon:: INCBIN "gfx/icons/kabigon.2bpp" -SECTION "Slot Machine GFX", ROMX[$4FDB], BANK[$24] +SECTION "gfx.asm@Slot Machine GFX", ROMX SlotMachineGFX:: INCBIN "gfx/minigames/slots.2bpp" SlotMachine2GFX:: INCBIN "gfx/minigames/slots_2.2bpp" -SECTION "Bank 30 Sprites 1", ROMX[$4000], BANK[$30] +SECTION "gfx.asm@Bank 30 Sprites 1", ROMX GoldSpriteGFX:: INCBIN "gfx/sprites/gold.2bpp" ; 30:4000 GoldBikeSpriteGFX:: INCBIN "gfx/sprites/gold_bike.2bpp" ; 30:4180 GoldSkateboardSpriteGFX:: INCBIN "gfx/sprites/gold_skateboard.2bpp" ; 30:4300 @@ -329,7 +329,7 @@ ClerkSpriteGFX:: INCBIN "gfx/sprites/clerk.2bpp" ; 30:79c0 FisherSpriteGFX:: INCBIN "gfx/sprites/fisher.2bpp" ; 30:7b40 FishingGuruSpriteGFX:: INCBIN "gfx/sprites/fishing_guru.2bpp" ; 30:7cc0 -SECTION "Bank 31 Sprites 2", ROMX[$4000], BANK[$31] +SECTION "gfx.asm@Bank 31 Sprites 2", ROMX ScientistSpriteGFX:: INCBIN "gfx/sprites/scientist.2bpp" ; 31:4000 MediumSpriteGFX:: INCBIN "gfx/sprites/medium.2bpp" ; 31:4180 SageSpriteGFX:: INCBIN "gfx/sprites/sage.2bpp" ; 31:4300 @@ -359,57 +359,57 @@ OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; EggSpriteGFX:: INCBIN "gfx/sprites/egg.2bpp" ; 31:65c0 BoulderSpriteGFX:: INCBIN "gfx/sprites/boulder.2bpp" ; 31:6600 -SECTION "Bank 37 Tilesets 10", ROMX[$4000], BANK[$37] +SECTION "gfx.asm@Bank 37 Tilesets 10", ROMX Tileset_10_GFX: INCBIN "gfx/tilesets/tileset_10.2bpp" -SECTION "Bank 37 Tilesets 15", ROMX[$4B00], BANK[$37] +SECTION "gfx.asm@Bank 37 Tilesets 15", ROMX Tileset_15_GFX: INCBIN "gfx/tilesets/tileset_15.2bpp" -SECTION "Bank 37 Tilesets 17", ROMX[$5B00], BANK[$37] +SECTION "gfx.asm@Bank 37 Tilesets 17", ROMX Tileset_17_GFX: INCBIN "gfx/tilesets/tileset_17.2bpp" -SECTION "Bank 37 Tilesets 18", ROMX[$6B00], BANK[$37] +SECTION "gfx.asm@Bank 37 Tilesets 18", ROMX Tileset_18_GFX: INCBIN "gfx/tilesets/tileset_18.2bpp" -SECTION "Poker GFX", ROMX[$5403], BANK[$38] +SECTION "gfx.asm@Poker GFX", ROMX PokerGFX:: INCBIN "gfx/minigames/poker.2bpp" -SECTION "15 Puzzle GFX", ROMX[$5F93], BANK[$38] +SECTION "gfx.asm@15 Puzzle GFX", ROMX FifteenPuzzleGFX:: INCBIN "gfx/minigames/15_puzzle.2bpp" -SECTION "Matches GFX", ROMX[$6606], BANK[$38] +SECTION "gfx.asm@Matches GFX", ROMX MemoryGameGFX:: INCBIN "gfx/minigames/matches.2bpp" -SECTION "Picross GFX", ROMX[$75B7], BANK[$38] +SECTION "gfx.asm@Picross GFX", ROMX PicrossGFX:: INCBIN "gfx/minigames/picross.2bpp" PicrossCursorGFX:: INCBIN "gfx/minigames/picross_cursor.2bpp" -SECTION "Gamefreak Logo GFX", ROMX[$41FF], BANK[$39] +SECTION "gfx.asm@Gamefreak Logo GFX", ROMX GameFreakLogoGFX:: INCBIN "gfx/splash/game_freak_logo.1bpp" GameFreakLogoSparkleGFX:: INCBIN "gfx/splash/game_freak_logo_oam.2bpp" -SECTION "Intro Underwater GFX", ROMX[$4ADF], BANK[$39] +SECTION "gfx.asm@Intro Underwater GFX", ROMX IntroUnderwaterGFX:: INCBIN "gfx/intro/underwater.2bpp" -SECTION "Intro Water Mon and Forest GFX", ROMX[$55EF], BANK[$39] +SECTION "gfx.asm@Intro Water Mon and Forest GFX", ROMX IntroWaterPokemonGFX:: INCBIN "gfx/intro/water_pokemon.2bpp" IntroForestGFX:: INCBIN "gfx/intro/forest.2bpp" -SECTION "Intro Mon", ROMX[$626F], BANK[$39] +SECTION "gfx.asm@Intro Mon", ROMX IntroPurinPikachuGFX:: INCBIN "gfx/intro/purin_pikachu.2bpp" IntroLizardon1GFX:: @@ -425,7 +425,7 @@ INCBIN "gfx/intro/kamex.2bpp" IntroFushigibanaGFX:: INCBIN "gfx/intro/fushigibana.2bpp" -SECTION "Misc GFX", ROMX[$4162], BANK[$3E] +SECTION "gfx.asm@Misc GFX", ROMX FontExtraGFX:: FontExtraAB_GFX:: INCBIN "gfx/font/font_extra.ab.2bpp" ; 0x0f8162--0x0f8182 FontExtraCDEFGHIVSLM_GFX:: INCBIN "gfx/font/font_extra.cdefghivslm.2bpp" ; 0x0f8182--0x0f8242 @@ -485,6 +485,6 @@ BlackTileAndCursor1bppGFXEnd:: PackIconGFX:: INCBIN "gfx/pack/pack_icons.2bpp" ; 0x0f933a--0x0f941a PackIconGFXEnd:: -SECTION "Town Map Cursor", ROMX[$506F], BANK[$3F] +SECTION "gfx.asm@Town Map Cursor", ROMX TownMapCursorGFX:: -INCBIN "gfx/pokegear/town_map_cursor.2bpp" +INCBIN "gfx/pokegear/town_map_cursor.2bpp"
\ No newline at end of file diff --git a/gfx/pokemon/egg.asm b/gfx/pokemon/egg.asm index ed41fed..4cf448c 100644 --- a/gfx/pokemon/egg.asm +++ b/gfx/pokemon/egg.asm @@ -1,2 +1,2 @@ -SECTION "PKMN Egg Pic", ROMX[$696a], BANK[$1f] -EggPicFront:: INCBIN "gfx/pokemon/egg/front.pic" ; 0x07e96a--0x07e9c9 +SECTION "gfx/pokemon/egg.asm", ROMX +EggPicFront:: INCBIN "gfx/pokemon/egg/front.pic" ; 0x07e96a--0x07e9c9
\ No newline at end of file diff --git a/gfx/pokemon/pkmn_pic_banks.asm b/gfx/pokemon/pkmn_pic_banks.asm index 07595ef..dd0fc42 100644 --- a/gfx/pokemon/pkmn_pic_banks.asm +++ b/gfx/pokemon/pkmn_pic_banks.asm @@ -1,14 +1,14 @@ MonSpriteBankList:: ; last mon in bank, bank # - db DEX_RAICHU, BANK("PKMN Pics 1") + 0 - db DEX_DUGTRIO, BANK("PKMN Pics 1") + 1 - db DEX_GOLONE, BANK("PKMN Pics 1") + 2 - db DEX_CRAB, BANK("PKMN Pics 1") + 3 - db DEX_STARMIE, BANK("PKMN Pics 1") + 4 - db DEX_FREEZER, BANK("PKMN Pics 1") + 5 - db DEX_JARANRA, BANK("PKMN Pics 1") + 6 - db DEX_KOUNYA, BANK("PKMN Pics 1") + 7 - db DEX_BOMBSEEKER, BANK("PKMN Pics 1") + 8 - db DEX_NYULA, BANK("PKMN Pics 1") + 9 - db $ff, BANK("PKMN Pics 1") + 10 - db $ff, BANK("PKMN Pics 1") + 11 + db DEX_RAICHU, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 0 + db DEX_DUGTRIO, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 1 + db DEX_GOLONE, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 2 + db DEX_CRAB, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 3 + db DEX_STARMIE, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 4 + db DEX_FREEZER, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 5 + db DEX_JARANRA, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 6 + db DEX_KOUNYA, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 7 + db DEX_BOMBSEEKER, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 8 + db DEX_NYULA, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 9 + db $ff, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 10 + db $ff, BANK("gfx/pokemon/pkmn_pics.asm@PKMN Pics 1") + 11 diff --git a/gfx/pokemon/pkmn_pics.asm b/gfx/pokemon/pkmn_pics.asm index 83f6b6f..2803449 100644 --- a/gfx/pokemon/pkmn_pics.asm +++ b/gfx/pokemon/pkmn_pics.asm @@ -1,4 +1,4 @@ -SECTION "PKMN Pics 1", ROMX[$4000], BANK[$15] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 1", ROMX FushigidanePicFront:: INCBIN "gfx/pokemon/fushigidane/front.pic" ; 0x054000--0x0540bc FushigidanePicBack:: INCBIN "gfx/pokemon/fushigidane/back.pic" ; 0x0540bc--0x0541ca @@ -54,7 +54,7 @@ RaichuPicFront:: INCBIN "gfx/pokemon/raichu/front.pic" ; 0x057cc3--0 RaichuPicBack:: INCBIN "gfx/pokemon/raichu/back.pic" ; 0x057e7e--0x057f9f -SECTION "PKMN Pics 2", ROMX[$4000], BANK[$16] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 2", ROMX SandPicFront:: INCBIN "gfx/pokemon/sand/front.pic" ; 0x058000--0x058103 SandPicBack:: INCBIN "gfx/pokemon/sand/back.pic" ; 0x058103--0x058238 @@ -108,7 +108,7 @@ DugtrioPicFront:: INCBIN "gfx/pokemon/dugtrio/front.pic" ; 0x05b9fc--0 DugtrioPicBack:: INCBIN "gfx/pokemon/dugtrio/back.pic" ; 0x05bc2d--0x05bda8 -SECTION "PKMN Pics 3", ROMX[$4000], BANK[$17] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 3", ROMX NyarthPicFront:: INCBIN "gfx/pokemon/nyarth/front.pic" ; 0x05c000--0x05c12f NyarthPicBack:: INCBIN "gfx/pokemon/nyarth/back.pic" ; 0x05c12f--0x05c272 @@ -160,7 +160,7 @@ GolonePicFront:: INCBIN "gfx/pokemon/golone/front.pic" ; 0x05f919--0 GolonePicBack:: INCBIN "gfx/pokemon/golone/back.pic" ; 0x05fa9c--0x05fbee -SECTION "PKMN Pics 4", ROMX[$4000], BANK[$18] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 4", ROMX GolonyaPicFront:: INCBIN "gfx/pokemon/golonya/front.pic" ; 0x060000--0x06017e GolonyaPicBack:: INCBIN "gfx/pokemon/golonya/back.pic" ; 0x06017e--0x060279 @@ -210,7 +210,7 @@ CrabPicFront:: INCBIN "gfx/pokemon/crab/front.pic" ; 0x0638ae--0 CrabPicBack:: INCBIN "gfx/pokemon/crab/back.pic" ; 0x0639e7--0x063b57 -SECTION "PKMN Pics 5", ROMX[$4000], BANK[$19] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 5", ROMX KinglerPicFront:: INCBIN "gfx/pokemon/kingler/front.pic" ; 0x064000--0x0641f2 KinglerPicBack:: INCBIN "gfx/pokemon/kingler/back.pic" ; 0x0641f2--0x06433d @@ -260,7 +260,7 @@ StarmiePicFront:: INCBIN "gfx/pokemon/starmie/front.pic" ; 0x067a28--0 StarmiePicBack:: INCBIN "gfx/pokemon/starmie/back.pic" ; 0x067bb8--0x067ca1 -SECTION "PKMN Pics 6", ROMX[$4000], BANK[$1A] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 6", ROMX BarrierdPicFront:: INCBIN "gfx/pokemon/barrierd/front.pic" ; 0x068000--0x068154 BarrierdPicBack:: INCBIN "gfx/pokemon/barrierd/back.pic" ; 0x068154--0x06828f @@ -310,7 +310,7 @@ FreezerPicFront:: INCBIN "gfx/pokemon/freezer/front.pic" ; 0x06b992--0 FreezerPicBack:: INCBIN "gfx/pokemon/freezer/back.pic" ; 0x06bbca--0x06bce6 -SECTION "PKMN Pics 7", ROMX[$4000], BANK[$1B] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 7", ROMX ThunderPicFront:: INCBIN "gfx/pokemon/thunder/front.pic" ; 0x06c000--0x06c1e7 ThunderPicBack:: INCBIN "gfx/pokemon/thunder/back.pic" ; 0x06c1e7--0x06c305 @@ -362,7 +362,7 @@ JaranraPicFront:: INCBIN "gfx/pokemon/jaranra/front.pic" ; 0x06fa05--0 JaranraPicBack:: INCBIN "gfx/pokemon/jaranra/back.pic" ; 0x06fc03--0x06fd27 -SECTION "PKMN Pics 8", ROMX[$4000], BANK[$1C] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 8", ROMX HaneeiPicFront:: INCBIN "gfx/pokemon/haneei/front.pic" ; 0x070000--0x070176 HaneeiPicBack:: INCBIN "gfx/pokemon/haneei/back.pic" ; 0x070176--0x0702cd @@ -422,7 +422,7 @@ KounyaPicFront:: INCBIN "gfx/pokemon/kounya/front.pic" ; 0x073bdb--0 KounyaPicBack:: INCBIN "gfx/pokemon/kounya/back.pic" ; 0x073ca8--0x073d7f -SECTION "PKMN Pics 9", ROMX[$4000], BANK[$1D] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 9", ROMX RinrinPicFront:: INCBIN "gfx/pokemon/rinrin/front.pic" ; 0x074000--0x074109 RinrinPicBack:: INCBIN "gfx/pokemon/rinrin/back.pic" ; 0x074109--0x07421a @@ -480,7 +480,7 @@ BombseekerPicFront:: INCBIN "gfx/pokemon/bombseeker/front.pic" ; 0x077c81--0 BombseekerPicBack:: INCBIN "gfx/pokemon/bombseeker/back.pic" ; 0x077dac--0x077ecf -SECTION "PKMN Pics 10", ROMX[$4000], BANK[$1E] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 10", ROMX GiftPicFront:: INCBIN "gfx/pokemon/gift/front.pic" ; 0x078000--0x078153 GiftPicBack:: INCBIN "gfx/pokemon/gift/back.pic" ; 0x078153--0x078281 @@ -529,7 +529,7 @@ NyulaPicFront:: INCBIN "gfx/pokemon/nyula/front.pic" ; 0x07bbb4--0 NyulaPicBack:: INCBIN "gfx/pokemon/nyula/back.pic" ; 0x07bccb--0x07be22 -SECTION "PKMN Pics 11", ROMX[$4000], BANK[$1F] +SECTION "gfx/pokemon/pkmn_pics.asm@PKMN Pics 11", ROMX HououPicFront:: INCBIN "gfx/pokemon/houou/front.pic" ; 0x07c000--0x07c2ab HououPicBack:: INCBIN "gfx/pokemon/houou/back.pic" ; 0x07c2ab--0x07c3e7 @@ -540,4 +540,4 @@ BuluPicBack:: INCBIN "gfx/pokemon/bulu/back.pic" ; 0x07c761--0 TailPicFront:: INCBIN "gfx/pokemon/tail/front.pic" ; 0x07c891--0x07c99f TailPicBack:: INCBIN "gfx/pokemon/tail/back.pic" ; 0x07c99f--0x07ca6b LeafyPicFront:: INCBIN "gfx/pokemon/leafy/front.pic" ; 0x07ca6b--0x07cc18 -LeafyPicBack:: INCBIN "gfx/pokemon/leafy/back.pic" ; 0x07cc18--0x07cd6a +LeafyPicBack:: INCBIN "gfx/pokemon/leafy/back.pic" ; 0x07cc18--0x07cd6a
\ No newline at end of file diff --git a/home/audio.asm b/home/audio.asm index 609c8dc..c157bed 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Audio interface", ROM0[$3CBF] -else -SECTION "Audio interface", ROM0[$3C83] -endc +; if DEBUG +SECTION "home/audio.asm", ROM0 +; else +; SECTION "Audio interface", ROM0[$3C83] +; endc DisableAudio:: ; 3cbf push hl diff --git a/home/bankswitch.asm b/home/bankswitch.asm index 278013c..a0e0d9d 100644 --- a/home/bankswitch.asm +++ b/home/bankswitch.asm @@ -1,14 +1,14 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Bankswitch", ROM0[$32C2] -else -SECTION "Bankswitch", ROM0[$3286] -endc +; if DEBUG +SECTION "home/bankswitch.asm", ROM0 +; else +; SECTION "Bankswitch", ROM0[$3286] +; endc ; Moved to a rst vector in final US releases (not sure about JP) ; All rst vectors are unused at this point in development Bankswitch:: ; 32c2 ldh [hROMBank], a ld [MBC3RomBank], a - ret + ret
\ No newline at end of file diff --git a/home/clear_sprites.asm b/home/clear_sprites.asm index 489b375..dca5479 100644 --- a/home/clear_sprites.asm +++ b/home/clear_sprites.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Sprite clearing", ROM0[$32DC] -else -SECTION "Sprite clearing", ROM0[$32A0] -endc +; if DEBUG +SECTION "home/clear_sprites.asm", ROM0 +; else +; SECTION "Sprite clearing", ROM0[$32A0] +; endc ClearSprites:: ; 32dc ld hl, wVirtualOAM @@ -26,4 +26,4 @@ HideSprites:: ; 32e7 add hl, de dec b jr nz, .loop - ret + ret
\ No newline at end of file diff --git a/home/copy.asm b/home/copy.asm index e5ba9cf..6efabc4 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Copy functions", ROM0[$32F7] -else -SECTION "Copy functions", ROM0[$32BB] -endc +; if DEBUG +SECTION "home/copy.asm", ROM0 +; else +; SECTION "Copy functions", ROM0[$32BB] +; endc FarCopyBytes:: ; 32f7 ; Copy bc bytes from a:hl to de. @@ -111,4 +111,4 @@ CopyString:: ld [hli], a cp "@" jr nz, CopyString - ret + ret
\ No newline at end of file diff --git a/home/copy2.asm b/home/copy2.asm index e74ef8b..1a30e63 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Video Copy functions", ROM0[$0D02] +SECTION "home/copy2.asm", ROM0 RedrawPlayerSprite:: jpab _RedrawPlayerSprite @@ -191,4 +191,4 @@ Copy1bpp:: ; 0e06 pop af pop hl jp FarCopyDataDouble -; 0xe18 +; 0xe18
\ No newline at end of file diff --git a/home/cry.asm b/home/cry.asm index 112505e..02a281b 100644 --- a/home/cry.asm +++ b/home/cry.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Cry Home", ROM0 [$39b1] +SECTION "home/cry.asm", ROM0 PlayStereoCry:: push af @@ -101,4 +101,4 @@ Function3a42:: ld b, $0 add hl, bc ld a, [hl] - ret + ret
\ No newline at end of file diff --git a/home/delay.asm b/home/delay.asm index 286cc0c..2f8ec13 100644 --- a/home/delay.asm +++ b/home/delay.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Delay", ROM0[$0317] +SECTION "home/delay.asm", ROM0 DelayFrame:: ; Wait for one frame @@ -19,4 +19,4 @@ DelayFrames:: call DelayFrame dec c jr nz, DelayFrames - ret + ret
\ No newline at end of file diff --git a/home/fade.asm b/home/fade.asm index e39bd83..4da54a0 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -1,10 +1,10 @@ include "constants.asm" -if DEBUG -SECTION "DMG Palette Fade Effect", ROM0 [$0343] -else -SECTION "DMG Palette Fade Effect", ROM0 [$0307] -endc +; if DEBUG +SECTION "home/fade.asm", ROM0 +; else +; SECTION "DMG Palette Fade Effect", ROM0 [$0307] +; endc Function0343:: ; 0343 ld a, [wTimeOfDayPal] @@ -92,4 +92,4 @@ IncGradGBPalTable_12:: db %11100100, %11010000, %11100000 IncGradGBPalTable_13:: db %10010000, %10000000, %10010000 IncGradGBPalTable_14:: db %01000000, %01000000, %01000000 -IncGradGBPalTable_15:: db %00000000, %00000000, %00000000 +IncGradGBPalTable_15:: db %00000000, %00000000, %00000000
\ No newline at end of file diff --git a/home/farcall.asm b/home/farcall.asm index 3fcf37f..7f4d759 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Farcall", ROM0[$2FA8] -else -SECTION "FarCall", ROM0[$2F6C] -endc +; if DEBUG +SECTION "home/farcall.asm", ROM0 +; else +; SECTION "FarCall", ROM0[$2F6C] +; endc FarCall_hl:: ; 2fa8 push af @@ -39,4 +39,4 @@ FarCall_hl:: ; 2fa8 ld b, a ld a, [wFarCallBCBuffer + 1] ld c, a - ret + ret
\ No newline at end of file diff --git a/home/init.asm b/home/init.asm index 17971c7..7407f63 100644 --- a/home/init.asm +++ b/home/init.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -SECTION "Entry point", ROM0[$100] +SECTION "home/init.asm@Entry point", ROM0 nop jp Init -SECTION "Global check value", ROM0[$14E] +SECTION "home/init.asm@Global check value", ROM0 ; The ROM has an incorrect global check, so set it here ; It is not corrected by RGBFIX if def(GOLD) @@ -21,7 +21,7 @@ else endc endc -SECTION "Init", ROM0[$51C] +SECTION "home/init.asm@Init", ROM0 Reset: ; 51c (0:051c) call DisableAudio @@ -153,4 +153,4 @@ _FillBGMap: jr nz, .loop dec d jr nz, .loop - ret + ret
\ No newline at end of file diff --git a/home/interrupts.asm b/home/interrupts.asm index f9d8ba1..949b351 100644 --- a/home/interrupts.asm +++ b/home/interrupts.asm @@ -1,28 +1,28 @@ INCLUDE "constants.asm" -SECTION "VBlank interrupt vector", ROM0[$040] +SECTION "home/interrupts.asm@VBlank interrupt vector", ROM0 jp VBlank -SECTION "LCD interrupt vector", ROM0[$048] +SECTION "home/interrupts.asm@LCD interrupt vector", ROM0 jp LCD -SECTION "Timer interrupt vector", ROM0[$050] +SECTION "home/interrupts.asm@Timer interrupt vector", ROM0 jp TimerDummy -SECTION "Serial interrupt vector", ROM0[$058] +SECTION "home/interrupts.asm@Serial interrupt vector", ROM0 jp Serial -SECTION "Joypad interrupt vector", ROM0[$060] +SECTION "home/interrupts.asm@Joypad interrupt vector", ROM0 jp JoypadDummy -SECTION "Timer dummy interrupt", ROM0[$42A] +SECTION "home/interrupts.asm@Timer dummy interrupt", ROM0 TimerDummy: ; 042a reti -SECTION "Joypad dummy interrupt", ROM0[$7F7] +SECTION "home/interrupts.asm@Joypad dummy interrupt", ROM0 JoypadDummy: ; 07f7 - reti + reti
\ No newline at end of file diff --git a/home/items.asm b/home/items.asm index 332d5e1..f37a4df 100755 --- a/home/items.asm +++ b/home/items.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "TossItem", ROM0[$3243] -else -SECTION "TossItem", ROM0[$3207] -endc +; if DEBUG +SECTION "home/items.asm@TossItem", ROM0 +; else +; SECTION "TossItem", ROM0[$3207] +; endc TossItem: ; 00:3243 ldh a, [hROMBank] @@ -45,11 +45,11 @@ ReceiveItem:: ; 3259 pop bc ret -if DEBUG -SECTION "GiveItem", ROM0[$366C] -else -SECTION "GiveItem", ROM0[$3630] -endc +; if DEBUG +SECTION "home/items.asm@GiveItem", ROM0 +; else +; SECTION "GiveItem", ROM0[$3630] +; endc GiveItem:: ; Give player quantity c of item b, @@ -66,4 +66,4 @@ GiveItem:: call GetItemName call CopyStringToStringBuffer2 scf - ret + ret
\ No newline at end of file diff --git a/home/joypad.asm b/home/joypad.asm index faa7cf0..6581413 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Joypad functions", ROM0[$07F8] +SECTION "home/joypad.asm", ROM0 ClearJoypad:: xor a @@ -290,4 +290,4 @@ TextboxBlinkCursor:: ; 914 (0:914) ldh [hTextBoxCursorBlinkInterval + 1], a ; reset to 0x6FF iterations ld a, "▼" ld [hl], a - ret + ret
\ No newline at end of file diff --git a/home/jumptable.asm b/home/jumptable.asm index 15d414b..4f9294f 100644 --- a/home/jumptable.asm +++ b/home/jumptable.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Jumptable functions", ROM0[$35cd] -else -SECTION "Jumptable functions", ROM0[$3591] -endc +; if DEBUG +SECTION "home/jumptable.asm", ROM0 +; else +; SECTION "Jumptable functions", ROM0[$3591] +; endc CallJumptable:: ; 35cd (0:35cd) ; CallJumptable @@ -44,4 +44,4 @@ CallFar_atHL:: call Bankswitch ret .jump: ; 35eb (0:35eb) - jp hl + jp hl
\ No newline at end of file diff --git a/home/lcd.asm b/home/lcd.asm index e915806..4553f09 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "LCD functions", ROM0[$3AE] +SECTION "home/lcd.asm", ROM0 LCD:: ; 03ae push af @@ -77,4 +77,4 @@ EnableLCD:: ; 0423 ld a, [rLCDC] set 7, a ld [rLCDC], a - ret + ret
\ No newline at end of file diff --git a/home/map.asm b/home/map.asm index 7b9bd71..58c568d 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Map functions", ROM0[$20FF] +SECTION "home/map.asm", ROM0 ; Runs a map script indexed by wMapScriptNumber RunMapScript:: ; 20ff @@ -1731,4 +1731,4 @@ Function2be5:: ; 00:2be5 ; TODO jp hl .Return: ; 00:2c04 - ret + ret
\ No newline at end of file diff --git a/home/map_objects.asm b/home/map_objects.asm index c473e13..6c3c640 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Map Object Related Functions", ROM0 [$15b5] +SECTION "home/map_objects.asm", ROM0 Function15b5:: ; 15b5 callab Function8000 @@ -683,4 +683,4 @@ SetObjectFacing:: ; 19C0 ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld [hl], a - ret + ret
\ No newline at end of file diff --git a/home/math.asm b/home/math.asm index 8b3db6f..dd7718d 100644 --- a/home/math.asm +++ b/home/math.asm @@ -1,10 +1,10 @@ include "constants.asm" -if DEBUG -SECTION "Math utility functions", ROM0 [$3380] -else -SECTION "Math utility functions", ROM0 [$3344] -endc +; if DEBUG +SECTION "home/math.asm", ROM0 +; else +; SECTION "Math utility functions", ROM0 [$3344] +; endc Multiply:: push hl @@ -22,4 +22,4 @@ Divide:: pop bc pop de pop hl - ret + ret
\ No newline at end of file diff --git a/home/menu.asm b/home/menu.asm index f84554c..3199400 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Menu Functions", ROM0 [$1d49] +SECTION "home/menu.asm", ROM0 LoadMenuHeader:: ; 00:1d49 call CopyMenuHeader @@ -422,4 +422,4 @@ ClearWindowData:: ; 00:1f9e ld bc, 16 xor a call ByteFill - ret + ret
\ No newline at end of file diff --git a/home/menu_window.asm b/home/menu_window.asm index 104a8eb..4911863 100644 --- a/home/menu_window.asm +++ b/home/menu_window.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Menu Window Functions", ROM0 [$1a64] +SECTION "home/menu_window.asm", ROM0 SetMenuAttributes:: push hl @@ -518,4 +518,4 @@ Coord2Tile:: ; 00:1d35 add hl, bc bccoord 0, 0 add hl, bc - ret + ret
\ No newline at end of file diff --git a/home/misc_32c8.asm b/home/misc_32c8.asm index 00e41ce..ae12d23 100644 --- a/home/misc_32c8.asm +++ b/home/misc_32c8.asm @@ -1,10 +1,10 @@ include "constants.asm" -if DEBUG -SECTION "Unknown 32c8", ROM0[$32c8] -else -SECTION "Unknown 32c8", ROM0[$328c] -endc +; if DEBUG +SECTION "home/misc_32c8.asm@Unknown 32c8", ROM0 +; else +; SECTION "Unknown 32c8", ROM0[$328c] +; endc Function32c8:: predef GetItemAmount @@ -27,11 +27,11 @@ SubtractSigned:: scf ret -if DEBUG -SECTION "Unknown 3686", ROM0[$3686] -else -SECTION "Unknown 3686", ROM0[$364a] -endc +; if DEBUG +SECTION "home/misc_32c8.asm@Unknown 3686", ROM0 +; else +; SECTION "Unknown 3686", ROM0[$364a] +; endc GiveMonToPlayer:: ; 3686 ; Give to the player Pokemon of species b at level c. @@ -95,4 +95,4 @@ CountSetBits:: ; 36b1 jr nz, .asm_36b3 ld a, c ld [wCountSetBitsResult], a - ret + ret
\ No newline at end of file diff --git a/home/misc_3c43.asm b/home/misc_3c43.asm new file mode 100644 index 0000000..0abbd79 --- /dev/null +++ b/home/misc_3c43.asm @@ -0,0 +1,91 @@ +INCLUDE "constants.asm" + +SECTION "home/misc_3c43.asm", ROM0 + +GetPartyParamLocation:: ; 3c43 (00:3c43) +; Get the location of parameter a from wCurPartyMon in hl + push bc + ld hl, wPartyMons + ld c, a + ld b, 0 + add hl, bc + ld bc, PARTYMON_STRUCT_LENGTH + ld a, [wWhichPokemon] + call AddNTimes + pop bc + ret + +UseItem:: ; 3c56 (00:3c56) + jpba _UseItem + +CheckTossableItem:: ; 3c5e (00:3c5e) + push hl + push de + push bc + callab _CheckTossableItem + pop bc + pop de + pop hl + ret + +GetBattleAnimPointer:: ; 3c6d (00:3c6d) + ld a, BANK(BattleAnimationsBankRef) + ld [MBC3RomBank], a + ldh [hROMBank], a + + ld a, [hli] + ld [wBattleAnimAddress], a + ld a, [hl] + ld [wBattleAnimAddress + 1], a + + ld a, BANK(PlayBattleAnim) + ld [MBC3RomBank], a + ldh [hROMBank], a + + ret + +GetBattleAnimByte:: ; 3c84 (00:3c84) + push hl + push de + + ld hl, wBattleAnimAddress + ld e, [hl] + inc hl + ld d, [hl] + + ld a, BANK(BattleAnimationsBankRef) + ld [MBC3RomBank], a + ldh [hROMBank], a + + ld a, [de] + ld [wBattleAnimByte], a + inc de + + ld a, BANK(PlayBattleAnim) + ld [MBC3RomBank], a + ldh [hROMBank], a + + ld [hl], d + dec hl + ld [hl], e + + pop de + pop hl + + ld a, [wBattleAnimByte] + ret + +InitSpriteAnimStruct:: ; 3ca8 (00:3ca8) + ld [wSpriteAnimIDBuffer], a + ldh a, [hROMBank] + push af + ld a, BANK(_InitSpriteAnimStruct) + call Bankswitch + ld a, [wSpriteAnimIDBuffer] + call _InitSpriteAnimStruct + pop af + call Bankswitch + ret + +EmptyFunction3cbe:: ; 3cbe (00:3cbe) + ret
\ No newline at end of file diff --git a/home/mon_stats.asm b/home/mon_stats.asm index e84e552..e5b16db 100644 --- a/home/mon_stats.asm +++ b/home/mon_stats.asm @@ -1,10 +1,10 @@ include "constants.asm" -if DEBUG -SECTION "Mon Stats", ROM0 [$394b] -else -SECTION "Mon Stats", ROM0 [$390f] -endc +; if DEBUG +SECTION "home/mon_stats.asm", ROM0 +; else +; SECTION "Mon Stats", ROM0 [$390f] +; endc DrawBattleHPBar:: push hl @@ -79,4 +79,4 @@ _PrepMonFrontpic:: ld [wSpriteFlipped], a inc a ld [wMonDexIndex], a - ret + ret
\ No newline at end of file diff --git a/home/movement.asm b/home/movement.asm index 212a4b3..b1dd6c0 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Movement ROM0", ROM0 [$19d1] +SECTION "home/movement.asm", ROM0 InitMovementBuffer:: ld [wMovementBufferObject], a @@ -126,4 +126,4 @@ ComputePathToWalkToPlayer:: ; big_step DOWN ; big_step UP ; big_step LEFT -; big_step RIGHT +; big_step RIGHT
\ No newline at end of file diff --git a/home/names.asm b/home/names.asm index aacd285..7b5b995 100644 --- a/home/names.asm +++ b/home/names.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Names", ROM0[$36c8] -else -SECTION "Names", ROM0[$368c] ; Unsure -endc +; if DEBUG +SECTION "home/names.asm@Names", ROM0 +; else +; SECTION "Names", ROM0[$368c] ; Unsure +; endc NamesPointers:: ; 00:36c8 ; entries correspond to GetName constants (see constants/text_constants.asm) @@ -244,7 +244,11 @@ Unreferenced_GetMoveName:: ; 00:37fc pop hl ret -SECTION "GetNick", ROM0[$3a97] +SECTION "home/names.asm@GetNick", ROM0 + +GetCurNick:: ; 3a91 (00:3a91) + ld a, [wWhichPokemon] + ld hl, wPartyMonNicknames GetNick: ; 00:3a97 ; Get nickname a from list hl. @@ -259,4 +263,4 @@ GetNick: ; 00:3a97 callab CorrectNickErrors pop bc pop hl - ret + ret
\ No newline at end of file diff --git a/home/oam_dma.asm b/home/oam_dma.asm index 42c68e7..db08f0e 100644 --- a/home/oam_dma.asm +++ b/home/oam_dma.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "OAM DMA", ROMX[$4153], BANK[$01] +SECTION "home/oam_dma.asm", ROMX WriteOAMDMACodeToHRAM:: ; 4153 ld c, LOW(hOAMDMA) @@ -22,4 +22,4 @@ WriteOAMDMACodeToHRAM:: ; 4153 dec a jr nz, .wait ret -.OAMDMAEnd ; 416b +.OAMDMAEnd ; 416b
\ No newline at end of file diff --git a/home/overworld.asm b/home/overworld.asm index 51ba0f5..f276ea1 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Startmenu and Select Button Check", ROM0[$2C05] -else -SECTION "Startmenu and Select Button Check", ROM0[$2BDF] -endc +; if DEBUG +SECTION "home/overworld.asm@Startmenu and Select Button Check", ROM0 +; else +; SECTION "Startmenu and Select Button Check", ROM0[$2BDF] +; endc OverworldStartButtonCheck:: ; 2c05 (0:2c05) ldh a, [hJoyState] @@ -177,11 +177,11 @@ ScheduleColumnRedrawHelper: ; 2d10 (0:2d10) jr nz, .loop ret -if DEBUG -SECTION "QueueScript", ROM0[$35EC] -else -SECTION "QueueScript", ROM0[$35B0] -endc +; if DEBUG +SECTION "home/overworld.asm@QueueScript", ROM0 +; else +; SECTION "QueueScript", ROM0[$35B0] +; endc QueueScript:: ; Install a function that is called as soon as @@ -192,4 +192,4 @@ QueueScript:: ld [wQueuedScriptAddr], a ld a, h ld [wQueuedScriptAddr + 1], a - ret + ret
\ No newline at end of file diff --git a/home/pic.asm b/home/pic.asm index 04cf7bb..2b36a57 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Decompression Functions", ROM0[$095E] +SECTION "home/pic.asm", ROM0 UncompressSpriteData:: ; 95e (0:95e) ; bankswitches and runs _UncompressSpriteData @@ -589,4 +589,4 @@ StoreSpriteOutputPointer:: ; cf3 (0:cf3) ld a, h ld [wSpriteOutputPtr + 1], a ld [wSpriteOutputPtrCached + 1], a - ret + ret
\ No newline at end of file diff --git a/home/pokemon.asm b/home/pokemon.asm index d2add97..a98122c 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "3A4B", ROM0[$3A4B] -else -SECTION "3A4B", ROM0[$3A0F] -endc +; if DEBUG +SECTION "home/pokemon.asm@3A4B", ROM0 +; else +; SECTION "3A4B", ROM0[$3A0F] +; endc GetMonHeader:: ; 3a4b (0:3a4b) ; copies the base stat data of a pokemon to wMonHeader ; INPUT: @@ -47,11 +47,11 @@ GetMonHeader:: ; 3a4b (0:3a4b) pop bc ret -if DEBUG -SECTION "3AED", ROM0[$3AED] -else -SECTION "3AED", ROM0[$3AB1] -endc +; if DEBUG +SECTION "home/pokemon.asm@3AED", ROM0 +; else +; SECTION "3AED", ROM0[$3AB1] +; endc UncompressMonSprite:: ; 3aed (0:3aed) ; Uncompresses the front or back sprite of the specified mon @@ -294,4 +294,4 @@ _InterlaceMergeSpriteBuffers:: ; 3bdf (0:3bdf) dec a ldh [hSpriteInterlaceCounter], a jr nz, .interlaceLoopFlipped - ret + ret
\ No newline at end of file diff --git a/home/predef.asm b/home/predef.asm index e6d5019..c9457a8 100644 --- a/home/predef.asm +++ b/home/predef.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Predef", ROM0[$2FDE] -else -SECTION "Predef", ROM0[$2FA2] -endc +; if DEBUG +SECTION "home/predef.asm", ROM0 +; else +; SECTION "Predef", ROM0[$2FA2] +; endc Predef:: ; 2fde ld [wPredefID], a @@ -46,4 +46,4 @@ Predef:: ; 2fde ld b, a ld a, [wPredefBC + 1] ld c, a - ret + ret
\ No newline at end of file diff --git a/home/print_bcd.asm b/home/print_bcd.asm index ed110e9..8b96d4b 100644 --- a/home/print_bcd.asm +++ b/home/print_bcd.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "BCD Functions", ROM0[$3AB2] -else -SECTION "BCD Functions", ROM0[$3A76] -endc +; if DEBUG +SECTION "home/print_bcd.asm", ROM0 +; else +; SECTION "BCD Functions", ROM0[$3A76] +; endc ; function to print a BCD (Binary-coded decimal) number ; de = address of BCD number diff --git a/home/print_hex.asm b/home/print_hex.asm index 8292884..2a68c2b 100644 --- a/home/print_hex.asm +++ b/home/print_hex.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Print Hexadecimal functions", ROM0[$3597] -else -SECTION "Print Hexadecimal functions", ROM0[$355B] -endc +; if DEBUG +SECTION "home/print_hex.asm", ROM0 +; else +; SECTION "Print Hexadecimal functions", ROM0[$355B] +; endc PrintHexBytes: ; 3597 (0:3597) ; Print c hex bytes located at de to hl @@ -43,4 +43,4 @@ GetHexDigit: ; 35b2 (0:35b2) ret .hexDigitTable: - db "０１２３４５６７８９ＡＢＣＤＥＦ" + db "０１２３４５６７８９ＡＢＣＤＥＦ"
\ No newline at end of file diff --git a/home/print_num.asm b/home/print_num.asm index 3ae1c10..2a0f36f 100644 --- a/home/print_num.asm +++ b/home/print_num.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Number Printing Functions", ROM0[$3460] -else -SECTION "Number Printing Functions", ROM0[$3424] -endc +; if DEBUG +SECTION "home/print_num.asm", ROM0 +; else +; SECTION "Number Printing Functions", ROM0[$3424] +; endc PrintNumber:: ; 3460 (0:3460) ; function to print a number @@ -249,4 +249,4 @@ PrintNumber:: ; 3460 (0:3460) ret z ; don't advance if leading digit is zero .inc inc hl - ret + ret
\ No newline at end of file diff --git a/home/print_text.asm b/home/print_text.asm index 0a17688..61cc9e1 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -1,10 +1,10 @@ include "constants.asm" -if DEBUG -SECTION "Print Letter Delay", ROM0[$33a3] -else -SECTION "Print Letter Delay", ROM0[$3367] -endc +; if DEBUG +SECTION "home/print_text.asm", ROM0 +; else +; SECTION "Print Letter Delay", ROM0[$3367] +; endc PrintLetterDelay:: ; 33a3 (0:33a3) ld a, [wce5f] @@ -67,4 +67,4 @@ CopyDataUntil:: ; 33e3 ld a, l cp c jr nz, .asm_33e3 - ret + ret
\ No newline at end of file diff --git a/home/random.asm b/home/random.asm index 5ca7c78..7c833b5 100644 --- a/home/random.asm +++ b/home/random.asm @@ -1,10 +1,10 @@ include "constants.asm" -if DEBUG -SECTION "Random Number Generation", ROM0 [$3270] -else -SECTION "Random Number Generation", ROM0 [$3234] -endc +; if DEBUG +SECTION "home/random.asm", ROM0 +; else +; SECTION "Random Number Generation", ROM0 [$3234] +; endc Random:: ; A simple hardware-based random number generator (RNG). @@ -66,4 +66,4 @@ BattleRandom:: pop af call Bankswitch ld a, [wPredefHL + 1] - ret + ret
\ No newline at end of file diff --git a/home/rst.asm b/home/rst.asm index 884f5a9..7d087aa 100644 --- a/home/rst.asm +++ b/home/rst.asm @@ -1,27 +1,27 @@ ; rst vectors -SECTION "rst00", ROM0[$000] +SECTION "home/rst.asm@rst00", ROM0 rst $38 -SECTION "rst08", ROM0[$008] +SECTION "home/rst.asm@rst08", ROM0 rst $38 -SECTION "rst10", ROM0[$010] +SECTION "home/rst.asm@rst10", ROM0 rst $38 -SECTION "rst18", ROM0[$018] +SECTION "home/rst.asm@rst18", ROM0 rst $38 -SECTION "rst20", ROM0[$020] +SECTION "home/rst.asm@rst20", ROM0 rst $38 -SECTION "rst28", ROM0[$028] +SECTION "home/rst.asm@rst28", ROM0 rst $38 -SECTION "rst30", ROM0[$030] +SECTION "home/rst.asm@rst30", ROM0 rst $38 -SECTION "rst38", ROM0[$038] +SECTION "home/rst.asm@rst38", ROM0 if DEBUG && def(SILVER) rst $38 else diff --git a/home/rtc.asm b/home/rtc.asm index 6179278..651a7b6 100644 --- a/home/rtc.asm +++ b/home/rtc.asm @@ -1,10 +1,10 @@ include "constants.asm" -if DEBUG -SECTION "Time Of Day Palettes", ROM0 [$032B] -else -SECTION "Time Of Day Palettes", ROM0 [$02EF] -endc +; if DEBUG +SECTION "home/rtc.asm", ROM0 +; else +; SECTION "Time Of Day Palettes", ROM0 [$02EF] +; endc UpdateTimeOfDayPalettes: ; 32b (0:032b) ld a, [wVramState] @@ -16,5 +16,4 @@ TimeOfDayPals:: UpdateTimePals:: ; 33a callab _UpdateTimePals ; Func_8c335 - ret - + ret
\ No newline at end of file diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index 23e2f1a..0c86363 100644 --- a/home/scrolling_menu.asm +++ b/home/scrolling_menu.asm @@ -1,10 +1,10 @@ include "constants.asm" -if DEBUG -SECTION "Scrolling Menu", ROM0 [$3810] -else -SECTION "Scrolling Menu", ROM0 [$37D4] -endc +; if DEBUG +SECTION "home/scrolling_menu.asm", ROM0 +; else +; SECTION "Scrolling Menu", ROM0 [$37D4] +; endc Function3810:: ld e, [hl] @@ -90,4 +90,4 @@ asm_387d: ; 00:387d dec c jr z, Function3872 .asm_388e: ; 00:388e - ret + ret
\ No newline at end of file diff --git a/home/serial.asm b/home/serial.asm index d51e5a6..6d4568b 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Serial handler", ROM0[$602] +SECTION "home/serial.asm", ROM0 Serial:: push af @@ -344,4 +344,4 @@ Unreferenced_Function7e6:: ldh [hSerialReceive], a ld a, (1 << rSC_ON) ldh [rSC], a - ret + ret
\ No newline at end of file diff --git a/home/sram.asm b/home/sram.asm index 87f2335..da27c81 100644 --- a/home/sram.asm +++ b/home/sram.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "SRAM functions", ROM0[$32A7] -else -SECTION "SRAM functions", ROM0[$326B] -endc +; if DEBUG +SECTION "home/sram.asm", ROM0 +; else +; SECTION "SRAM functions", ROM0[$326B] +; endc OpenSRAM:: ; 32a7 push af @@ -22,4 +22,4 @@ CloseSRAM:: ; 32b7 ld [MBC3LatchClock], a ld [MBC3SRamEnable], a pop af - ret + ret
\ No newline at end of file diff --git a/home/tables.asm b/home/tables.asm index 02fc78a..e5d9c1e 100755 --- a/home/tables.asm +++ b/home/tables.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "FindItemInTable", ROM0[$35F8] +SECTION "home/tables.asm", ROM0 ; find value a from table hl with row length de ; returns carry and row index b if successful @@ -24,4 +24,4 @@ FindItemInTable: ; 00:35F8 .success scf - ret + ret
\ No newline at end of file diff --git a/home/talk_to_npc.asm b/home/talk_to_npc.asm index 69bee3e..ddc2fcd 100644 --- a/home/talk_to_npc.asm +++ b/home/talk_to_npc.asm @@ -1,25 +1,25 @@ include "constants.asm" -if DEBUG -SECTION "Unknown 3025", ROM0 [$3025] -else -SECTION "Unknown 3025", ROM0 [$2fe9] -endc +; if DEBUG +SECTION "home/talk_to_npc.asm", ROM0 +; else +; SECTION "Unknown 3025", ROM0 [$2fe9] +; endc MapDefaultText:: - ld hl, .Text + ld hl, GameplayText call OpenTextbox ret -.Text: ; 00:302c +GameplayText:: ; 00:302c text "ゲームフりーク！" done Function3036:: ; 3036 - ld hl, .Text + ld hl, EmptyText ret -.Text: ; 00:303a +EmptyText:: ; 00:303a db "@" CallMapTextSubroutine:: ; 00:303b @@ -358,4 +358,4 @@ SetFFInAccumulator:: ; 3240 dec a ret -; 3243 +; 3243
\ No newline at end of file diff --git a/home/text.asm b/home/text.asm index 48662e9..abca7ab 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Text Printing Functions", ROM0[$0e18] +SECTION "home/text.asm", ROM0 ClearBox:: ; 00:0e18 ; Fill a c*b box at hl with blank tiles. @@ -729,4 +729,4 @@ TextCommands:: ; 120c dw Text_PlaySound dw Text_PlaySound dw Text_PlaySound - dw Text_PlaySound + dw Text_PlaySound
\ No newline at end of file diff --git a/home/tilemap.asm b/home/tilemap.asm index 6d7ff38..6348671 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -1,10 +1,10 @@ include "constants.asm" -if DEBUG -SECTION "Tilemap Functions", ROM0 [$360B] -else -SECTION "Tilemap Functions", ROM0 [$35CF] -endc +; if DEBUG +SECTION "home/tilemap.asm", ROM0 +; else +; SECTION "Tilemap Functions", ROM0 [$35CF] +; endc Function360b:: call ClearSprites @@ -67,4 +67,4 @@ Function3657:: ; 00:3657 call LoadFont call UpdateSprites call EnableLCD - ret + ret
\ No newline at end of file diff --git a/home/tileset.asm b/home/tileset.asm index 4512728..4bf6a98 100644 --- a/home/tileset.asm +++ b/home/tileset.asm @@ -1,7 +1,7 @@ include "constants.asm" -SECTION "LoadTilesetGFX", ROM0[$2D26] +SECTION "home/tileset.asm", ROM0 LoadTilesetGFX:: ; 2d26 call GetMapEnvironment @@ -417,3 +417,27 @@ LoadTileset:: ; 2f48 pop bc pop hl ret + +ReloadFontAndTileset:: ; 2f6b (00:2f6b) + call DisableLCD + ldh a, [hROMBank] + push af + ld a, [wMapGroup] + ld b, a + ld a, [wMapId] + ld c, a + call SwitchToAnyMapBank + call LoadFontExtra + call LoadMapPart + call LoadTilesetGFX + pop af + call Bankswitch + + call EnableLCD + ret + +LoadTilesetGFX_LCDOff:: ; 2f8d (00:2f8d) + call DisableLCD + call LoadTilesetGFX + call EnableLCD + ret
\ No newline at end of file diff --git a/home/time.asm b/home/time.asm index d82235d..98f3827 100644 --- a/home/time.asm +++ b/home/time.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "RTC and Time Functions", ROM0 [$042B] +SECTION "home/time.asm", ROM0 LatchClock: ; 42b (0:042b) ld a, 0 @@ -135,4 +135,4 @@ Function0502:: ; 0502 res 6, a ld [MBC3RTC], a call CloseSRAM - ret + ret
\ No newline at end of file diff --git a/home/toolgear.asm b/home/toolgear.asm index 2dfdee7..dc79b5b 100644 --- a/home/toolgear.asm +++ b/home/toolgear.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Toolgear drawing functions", ROM0[$2018] +SECTION "home/toolgear.asm", ROM0 ; local charmap, global charmap won't apply ; see https://github.com/rednex/rgbds/issues/265#issuecomment-395229694 diff --git a/home/unknown.asm b/home/unknown.asm index 3962377..6e540f8 100644 --- a/home/unknown.asm +++ b/home/unknown.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Empty function", ROM0[$2F97] -else -SECTION "Empty function", ROM0[$2F5B] -endc +; if DEBUG +SECTION "home/unknown.asm@Empty function", ROM0 +; else +; SECTION "Empty function", ROM0[$2F5B] +; endc InexplicablyEmptyFunction:: ; 2f97 rept 16 @@ -18,7 +18,7 @@ endr ; 2. Give them proper names. ; 3. Move them to their own file(s). -SECTION "Unknown functions", ROM0[$1FF4] +SECTION "home/unknown.asm@Unknown functions", ROM0 _1FF4:: ; 1ff4 ld a, BANK(s0_a600) @@ -39,14 +39,14 @@ _2007:: ; 2007 call CloseSRAM ret -SECTION "Unknown_20f8", ROM0[$20F8] +SECTION "home/unknown.asm@Unknown_20f8", ROM0 Function20f8:: call Function1848 call Function18cc ret -SECTION "Unknown_094c", ROM0[$094C] +SECTION "home/unknown.asm@Unknown_094c", ROM0 Function094c:: ldh a, [hROMBank] @@ -57,4 +57,4 @@ Function094c:: pop af call Bankswitch - jp DebugMenu + jp DebugMenu
\ No newline at end of file diff --git a/home/unknown_388f.asm b/home/unknown_388f.asm index 1182506..85aa781 100644 --- a/home/unknown_388f.asm +++ b/home/unknown_388f.asm @@ -1,10 +1,10 @@ include "constants.asm" -if DEBUG -SECTION "Unknown 388F", ROM0 [$388F] -else -SECTION "Unknown 388F", ROM0 [$3853] -endc +; if DEBUG +SECTION "home/unknown_388f.asm", ROM0 +; else +; SECTION "Unknown 388F", ROM0 [$3853] +; endc Function388f:: @@ -98,4 +98,4 @@ Function3920:: .text: text "つぎは がんばるぞ！！" - done + done
\ No newline at end of file diff --git a/home/util.asm b/home/util.asm index ccc990a..f7ddc1f 100644 --- a/home/util.asm +++ b/home/util.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -if DEBUG -SECTION "Misc Utility Functions", ROM0[$33EF] -else -SECTION "Misc Utility Functions", ROM0[$33B3] -endc +; if DEBUG +SECTION "home/util.asm", ROM0 +; else +; SECTION "Misc Utility Functions", ROM0[$33B3] +; endc Function33ef:: ; hl = src @@ -118,4 +118,4 @@ Function3439:: ; 3439 ld a, [de] inc de ld [hli], a - ret + ret
\ No newline at end of file diff --git a/home/vblank.asm b/home/vblank.asm index 33bbd40..ea567ea 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "VBlank handler", ROM0[$150] +SECTION "home/vblank.asm", ROM0 VBlank:: ; 0150 push af @@ -297,4 +297,4 @@ VBlank3:: ; 2a0 (0:2a0) ld a, (1 << JOYPAD | 1 << SERIAL | 1 << TIMER | 1 << LCD_STAT | 1 << VBLANK) ldh [rIE], a ret -; 0x317 +; 0x317
\ No newline at end of file diff --git a/home/vcopy.asm b/home/vcopy.asm index 91c2395..b0ad6eb 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Copy Routines used by VBlank ISR", ROM0[$123a] +SECTION "home/vcopy.asm", ROM0 RedrawRowOrColumn:: ; 123a (0:123a) ; This function redraws a BG row of height 2 or a BG column of width 2. @@ -614,4 +614,4 @@ VBlankCopyFar:: ; 1558 (0:1558) ld h, a ld sp, hl ret -; 0x15b5 +; 0x15b5
\ No newline at end of file diff --git a/home/window.asm b/home/window.asm index 9e86453..178ad9b 100644 --- a/home/window.asm +++ b/home/window.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Window Functions", ROM0[$1fd4] +SECTION "home/window.asm", ROM0 RefreshScreen:: call ClearWindowData @@ -20,4 +20,4 @@ Function1fea:: call TextboxCleanup call ClearWindowData call InitToolgearBuffer - ret + ret
\ No newline at end of file @@ -1,4 +1,4 @@ -SECTION "HRAM", HRAM[$FF80] +SECTION "HRAM", HRAM hOAMDMA:: ; ff80 ds 10 @@ -231,4 +231,4 @@ hBattleTurn:: db ; fff2 hCurMapTextSubroutinePtr:: dw ; fff3 - ; TODO + ; TODO
\ No newline at end of file @@ -11,3 +11,4 @@ INCLUDE "macros/wram.asm" INCLUDE "macros/audio.asm" INCLUDE "macros/scripts.asm" INCLUDE "macros/queue.asm" +INCLUDE "macros/maps.asm" diff --git a/macros/maps.asm b/macros/maps.asm new file mode 100644 index 0000000..5c210c5 --- /dev/null +++ b/macros/maps.asm @@ -0,0 +1,108 @@ +map_id: MACRO +;\1: map id + db GROUP_\1, MAP_\1 +ENDM + +map_attributes: MACRO +;\1: map name +;\2: map id +;\3: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none +CURRENT_MAP_WIDTH = \2_WIDTH +CURRENT_MAP_HEIGHT = \2_HEIGHT +\1_MapAttributes:: + db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH + dw \1_Blocks + dw \1TextPointers + dw \1ScriptLoader + dw \1_MapEvents + db \3 +ENDM + +; Connections go in order: north, south, west, east +connection: MACRO +;\1: direction +;\2: map name +;\3: map id +;\4: final y offset for east/west, x offset for north/south +;\5: map data y offset for east/west, x offset for north/south +;\6: strip length +if "\1" == "north" + map_id \3 + dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5 + dw wOverworldMapBlocks + \4 + 3 + db \6 + db \3_WIDTH + db \3_HEIGHT * 2 - 1 + db (\4 - \5) * -2 + dw wOverworldMapBlocks + \3_HEIGHT * (\3_WIDTH + 6) + 1 +elif "\1" == "south" + map_id \3 + dw \2_Blocks + \5 + dw wOverworldMapBlocks + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3 + db \6 + db \3_WIDTH + db 0 + db (\4 - \5) * -2 + dw wOverworldMapBlocks + \3_WIDTH + 7 +elif "\1" == "west" + map_id \3 + dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3 + dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3) + db \6 + db \3_WIDTH + db (\4 - \5) * -2 + db \3_WIDTH * 2 - 1 + dw wOverworldMapBlocks + \3_WIDTH * 2 + 6 +elif "\1" == "east" + map_id \3 + dw \2_Blocks + (\3_WIDTH * \5) + dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3 + db \6 + db \3_WIDTH + db (\4 - \5) * -2 + db 0 + dw wOverworldMapBlocks + \3_WIDTH + 7 +endc +ENDM + +map: MACRO +;\1: map name: for the MapAttributes pointer (see data/maps/attributes.asm) +;\2: tileset: a TILESET_* constant +;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON +;\4: location: from constants/landmark_constants.asm + db BANK(\1_MapAttributes), \2, \3 + dw \1_MapAttributes + db \4 + db 0, 0 ; ??? +ENDM + +warp_event: MACRO + db \2, \1 ; y, x + db \3 ; index + map_id \4 + dw \5 ; unused wOverworldMap offset +ENDM + +bg_event: MACRO + db \2, \1 ; y, x + db \3 ; function (unused?) + db \4 ; text index +ENDM + +object_event: MACRO + db \3 ; sprite + db \2 + 4, \1 + 4 ; x, y + db \4 ; movement function + dn \5, \6 ; radius + db \7, \8 ; hour limits? + shift + db \8 ; object type function + shift + db \8, \9 ; unknown 1, 2 + shift + db \9 ; sight range + shift + db \9 ; unknown 3 + shift + db \9 ; unknown 4 +ENDM
\ No newline at end of file diff --git a/maps/Baadon.asm b/maps/Baadon.asm new file mode 100644 index 0000000..875349f --- /dev/null +++ b/maps/Baadon.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Baadon.asm", ROMX + +BaadonScriptLoader:: ; d89f7 (36:49f7) + ret + + db "@"
\ No newline at end of file diff --git a/maps/BaadonHouse1.asm b/maps/BaadonHouse1.asm new file mode 100644 index 0000000..d72d5d8 --- /dev/null +++ b/maps/BaadonHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonHouse1.asm", ROMX + +BaadonHouse1ScriptLoader:: ; 9cade (27:4ade) + ret + +BaadonHouse1TextPointers:: ; 9cadf (27:4adf) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BaadonHouse2.asm b/maps/BaadonHouse2.asm new file mode 100644 index 0000000..57ad4bf --- /dev/null +++ b/maps/BaadonHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonHouse2.asm", ROMX + +BaadonHouse2ScriptLoader:: ; 9cb81 (27:4b81) + ret + +BaadonHouse2TextPointers:: ; 9cb82 (27:4b82) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BaadonLeague1F.asm b/maps/BaadonLeague1F.asm new file mode 100644 index 0000000..49a7f8a --- /dev/null +++ b/maps/BaadonLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonLeague1F.asm", ROMX + +BaadonLeague1FScriptLoader:: ; 9cc22 (27:4c22) + ret + +BaadonLeague1FTextPointers:: ; 9cc23 (27:4c23) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BaadonLeague2F.asm b/maps/BaadonLeague2F.asm new file mode 100644 index 0000000..0fe866b --- /dev/null +++ b/maps/BaadonLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonLeague2F.asm", ROMX + +BaadonLeague2FScriptLoader:: ; 9ccc2 (27:4cc2) + ret + +BaadonLeague2FTextPointers:: ; 9ccc3 (27:4cc3) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BaadonMart.asm b/maps/BaadonMart.asm new file mode 100644 index 0000000..39808c8 --- /dev/null +++ b/maps/BaadonMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonMart.asm", ROMX + +BaadonMartScriptLoader:: ; 9c988 (27:4988) + ret + +BaadonMartTextPointers:: ; 9c989 (27:4989) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BaadonPokecenter1F.asm b/maps/BaadonPokecenter1F.asm new file mode 100644 index 0000000..be3b377 --- /dev/null +++ b/maps/BaadonPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonPokecenter1F.asm", ROMX + +BaadonPokecenter1FScriptLoader:: ; 9ca0f (27:4a0f) + ret + +BaadonPokecenter1FTextPointers:: ; 9ca10 (27:4a10) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BaadonPokecenter2F.asm b/maps/BaadonPokecenter2F.asm new file mode 100644 index 0000000..7e3a0b2 --- /dev/null +++ b/maps/BaadonPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonPokecenter2F.asm", ROMX + +BaadonPokecenter2FScriptLoader:: ; 9ca88 (27:4a88) + ret + +BaadonPokecenter2FTextPointers:: ; 9ca89 (27:4a89) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BaadonRoute1.asm b/maps/BaadonRoute1.asm new file mode 100644 index 0000000..43a1a39 --- /dev/null +++ b/maps/BaadonRoute1.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonRoute1.asm", ROMX + +BaadonRoute1ScriptLoader:: ; da601 (36:6601) + ret + + db "@"
\ No newline at end of file diff --git a/maps/BaadonRoute2.asm b/maps/BaadonRoute2.asm new file mode 100644 index 0000000..d9adb7a --- /dev/null +++ b/maps/BaadonRoute2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonRoute2.asm", ROMX + +BaadonRoute2ScriptLoader:: ; da7ed (36:67ed) + ret + + db "@"
\ No newline at end of file diff --git a/maps/BaadonRoute3.asm b/maps/BaadonRoute3.asm new file mode 100644 index 0000000..728790e --- /dev/null +++ b/maps/BaadonRoute3.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonRoute3.asm", ROMX + +BaadonRoute3ScriptLoader:: ; da8d9 (36:68d9) + ret + + db "@"
\ No newline at end of file diff --git a/maps/BaadonRouteGateNewtype.asm b/maps/BaadonRouteGateNewtype.asm new file mode 100644 index 0000000..99ac2bb --- /dev/null +++ b/maps/BaadonRouteGateNewtype.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonRouteGateNewtype.asm", ROMX + +BaadonRouteGateNewtypeScriptLoader:: ; 9cd78 (27:4d78) + ret + +BaadonRouteGateNewtypeTextPointers:: ; 9cd79 (27:4d79) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BaadonRouteGateWest.asm b/maps/BaadonRouteGateWest.asm new file mode 100644 index 0000000..6f739c0 --- /dev/null +++ b/maps/BaadonRouteGateWest.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonRouteGateWest.asm", ROMX + +BaadonRouteGateWestScriptLoader:: ; 9cd1d (27:4d1d) + ret + +BaadonRouteGateWestTextPointers:: ; 9cd1e (27:4d1e) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BaadonWallpaperHouse.asm b/maps/BaadonWallpaperHouse.asm new file mode 100644 index 0000000..359170e --- /dev/null +++ b/maps/BaadonWallpaperHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BaadonWallpaperHouse.asm", ROMX + +BaadonWallpaperHouseScriptLoader:: ; 9cb27 (27:4b27) + ret + +BaadonWallpaperHouseTextPointers:: ; 9cb28 (27:4b28) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullForest.asm b/maps/BullForest.asm new file mode 100644 index 0000000..45b9084 --- /dev/null +++ b/maps/BullForest.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullForest.asm", ROMX + +BullForestScriptLoader:: ; d8f26 (36:4f26) + ret + + db "@"
\ No newline at end of file diff --git a/maps/BullForestRoute1.asm b/maps/BullForestRoute1.asm new file mode 100644 index 0000000..1839665 --- /dev/null +++ b/maps/BullForestRoute1.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullForestRoute1.asm", ROMX + +BullForestRoute1ScriptLoader:: ; dad8d (36:6d8d) + ret + + db "@"
\ No newline at end of file diff --git a/maps/BullForestRoute1House.asm b/maps/BullForestRoute1House.asm new file mode 100644 index 0000000..ce5a06d --- /dev/null +++ b/maps/BullForestRoute1House.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullForestRoute1House.asm", ROMX + +BullForestRoute1HouseScriptLoader:: ; 9d804 (27:5804) + ret + +BullForestRoute1HouseTextPointers:: ; 9d805 (27:5805) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullForestRoute2.asm b/maps/BullForestRoute2.asm new file mode 100644 index 0000000..a09ae99 --- /dev/null +++ b/maps/BullForestRoute2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullForestRoute2.asm", ROMX + +BullForestRoute2ScriptLoader:: ; db019 (36:7019) + ret + + db "@"
\ No newline at end of file diff --git a/maps/BullForestRoute3.asm b/maps/BullForestRoute3.asm new file mode 100644 index 0000000..65b6d6c --- /dev/null +++ b/maps/BullForestRoute3.asm @@ -0,0 +1,10 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullForestRoute3.asm", ROMX + +BullForestRoute3ScriptLoader:: ; db666 (36:7666) + ret + + db "@" + + ret
\ No newline at end of file diff --git a/maps/BullForestRouteGateStand.asm b/maps/BullForestRouteGateStand.asm new file mode 100644 index 0000000..217a7f2 --- /dev/null +++ b/maps/BullForestRouteGateStand.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullForestRouteGateStand.asm", ROMX + +BullForestRouteGateStandScriptLoader:: ; 9d85f (27:585f) + ret + +BullForestRouteGateStandTextPointers:: ; 9d860 (27:5860) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullHouse1.asm b/maps/BullHouse1.asm new file mode 100644 index 0000000..695a9ba --- /dev/null +++ b/maps/BullHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullHouse1.asm", ROMX + +BullHouse1ScriptLoader:: ; 9d935 (27:5935) + ret + +BullHouse1TextPointers:: ; 9d936 (27:5936) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullHouse2.asm b/maps/BullHouse2.asm new file mode 100644 index 0000000..2557d9d --- /dev/null +++ b/maps/BullHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullHouse2.asm", ROMX + +BullHouse2ScriptLoader:: ; 9d98f (27:598f) + ret + +BullHouse2TextPointers:: ; 9d990 (27:5990) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullHouse3.asm b/maps/BullHouse3.asm new file mode 100644 index 0000000..bee8ee7 --- /dev/null +++ b/maps/BullHouse3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullHouse3.asm", ROMX + +BullHouse3ScriptLoader:: ; 9d9e9 (27:59e9) + ret + +BullHouse3TextPointers:: ; 9d9ea (27:59ea) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullHouse4.asm b/maps/BullHouse4.asm new file mode 100644 index 0000000..60492f0 --- /dev/null +++ b/maps/BullHouse4.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullHouse4.asm", ROMX + +BullHouse4ScriptLoader:: ; 9dc84 (27:5c84) + ret + +BullHouse4TextPointers:: ; 9dc85 (27:5c85) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullLeague1F.asm b/maps/BullLeague1F.asm new file mode 100644 index 0000000..235f1cc --- /dev/null +++ b/maps/BullLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullLeague1F.asm", ROMX + +BullLeague1FScriptLoader:: ; 9db97 (27:5b97) + ret + +BullLeague1FTextPointers:: ; 9db98 (27:5b98) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullLeague2F.asm b/maps/BullLeague2F.asm new file mode 100644 index 0000000..c8e8702 --- /dev/null +++ b/maps/BullLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullLeague2F.asm", ROMX + +BullLeague2FScriptLoader:: ; 9dc37 (27:5c37) + ret + +BullLeague2FTextPointers:: ; 9dc38 (27:5c38) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullMart.asm b/maps/BullMart.asm new file mode 100644 index 0000000..f2b64c5 --- /dev/null +++ b/maps/BullMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullMart.asm", ROMX + +BullMartScriptLoader:: ; 9d8df (27:58df) + ret + +BullMartTextPointers:: ; 9d8e0 (27:58e0) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullPokecenter1F.asm b/maps/BullPokecenter1F.asm new file mode 100644 index 0000000..50f4b3b --- /dev/null +++ b/maps/BullPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullPokecenter1F.asm", ROMX + +BullPokecenter1FScriptLoader:: ; 9da7d (27:5a7d) + ret + +BullPokecenter1FTextPointers:: ; 9da7e (27:5a7e) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/BullPokecenter2F.asm b/maps/BullPokecenter2F.asm new file mode 100644 index 0000000..5491efd --- /dev/null +++ b/maps/BullPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/BullPokecenter2F.asm", ROMX + +BullPokecenter2FScriptLoader:: ; 9daf6 (27:5af6) + ret + +BullPokecenter2FTextPointers:: ; 9daf7 (27:5af7) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/CaveMinecarts1.asm b/maps/CaveMinecarts1.asm new file mode 100644 index 0000000..f38d60b --- /dev/null +++ b/maps/CaveMinecarts1.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/CaveMinecarts1.asm", ROMX + +CaveMinecarts1ScriptLoader:: ; bc817 (2f:4817) + ret + +CaveMinecarts1TextPointers:: ; bc818 (2f:4818) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/CaveMinecarts2.asm b/maps/CaveMinecarts2.asm new file mode 100644 index 0000000..2533cb0 --- /dev/null +++ b/maps/CaveMinecarts2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/CaveMinecarts2.asm", ROMX + +CaveMinecarts2ScriptLoader:: ; bc9a2 (2f:49a2) + ret + +CaveMinecarts2TextPointers:: ; bc9a3 (2f:49a3) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/CaveMinecarts3.asm b/maps/CaveMinecarts3.asm new file mode 100644 index 0000000..1461a07 --- /dev/null +++ b/maps/CaveMinecarts3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/CaveMinecarts3.asm", ROMX + +CaveMinecarts3ScriptLoader:: ; bcb2d (2f:4b2d) + ret + +CaveMinecarts3TextPointers:: ; bcb2e (2f:4b2e) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/CaveMinecarts4.asm b/maps/CaveMinecarts4.asm new file mode 100644 index 0000000..3917fe5 --- /dev/null +++ b/maps/CaveMinecarts4.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/CaveMinecarts4.asm", ROMX + +CaveMinecarts4ScriptLoader:: ; bccb8 (2f:4cb8) + ret + +CaveMinecarts4TextPointers:: ; bccb9 (2f:4cb9) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/CaveMinecarts5.asm b/maps/CaveMinecarts5.asm new file mode 100644 index 0000000..6db1e5a --- /dev/null +++ b/maps/CaveMinecarts5.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/CaveMinecarts5.asm", ROMX + +CaveMinecarts5ScriptLoader:: ; bce43 (2f:4e43) + ret + +CaveMinecarts5TextPointers:: ; bce44 (2f:4e44) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/CaveMinecarts6.asm b/maps/CaveMinecarts6.asm new file mode 100644 index 0000000..018174b --- /dev/null +++ b/maps/CaveMinecarts6.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/CaveMinecarts6.asm", ROMX + +CaveMinecarts6ScriptLoader:: ; bcf1a (2f:4f1a) + ret + +CaveMinecarts6TextPointers:: ; bcf1b (2f:4f1b) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/CaveMinecarts7.asm b/maps/CaveMinecarts7.asm new file mode 100644 index 0000000..3e7df0e --- /dev/null +++ b/maps/CaveMinecarts7.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/CaveMinecarts7.asm", ROMX + +CaveMinecarts7ScriptLoader:: ; bcff1 (2f:4ff1) + ret + +CaveMinecarts7TextPointers:: ; bcff2 (2f:4ff2) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/Fonto.asm b/maps/Fonto.asm new file mode 100644 index 0000000..0cc5364 --- /dev/null +++ b/maps/Fonto.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Fonto.asm", ROMX + +FontoScriptLoader:: ; d88f1 (36:48f1) + ret + + db "@"
\ No newline at end of file diff --git a/maps/FontoHouse.asm b/maps/FontoHouse.asm new file mode 100644 index 0000000..7e46147 --- /dev/null +++ b/maps/FontoHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoHouse.asm", ROMX + +FontoHouseScriptLoader:: ; 9c794 (27:4794) + ret + +FontoHouseTextPointers:: ; 9c795 (27:4795) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/FontoLab.asm b/maps/FontoLab.asm new file mode 100644 index 0000000..ca2145b --- /dev/null +++ b/maps/FontoLab.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoLab.asm", ROMX + +FontoLabScriptLoader:: ; 9c908 (27:4908) + ret + +FontoLabTextPointers:: ; 9c909 (27:4909) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/FontoMart.asm b/maps/FontoMart.asm new file mode 100644 index 0000000..071a43c --- /dev/null +++ b/maps/FontoMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoMart.asm", ROMX + +FontoMartScriptLoader:: ; 9c73a (27:473a) + ret + +FontoMartTextPointers:: ; 9c73b (27:473b) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/FontoPokecenter1F.asm b/maps/FontoPokecenter1F.asm new file mode 100644 index 0000000..58603bc --- /dev/null +++ b/maps/FontoPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoPokecenter1F.asm", ROMX + +FontoPokecenter1FScriptLoader:: ; 9c828 (27:4828) + ret + +FontoPokecenter1FTextPointers:: ; 9c829 (27:4829) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/FontoPokecenter2F.asm b/maps/FontoPokecenter2F.asm new file mode 100644 index 0000000..9206ea1 --- /dev/null +++ b/maps/FontoPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoPokecenter2F.asm", ROMX + +FontoPokecenter2FScriptLoader:: ; 9c8a1 (27:48a1) + ret + +FontoPokecenter2FTextPointers:: ; 9c8a2 (27:48a2) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/FontoRocketHouse.asm b/maps/FontoRocketHouse.asm new file mode 100644 index 0000000..7b61408 --- /dev/null +++ b/maps/FontoRocketHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoRocketHouse.asm", ROMX + +FontoRocketHouseScriptLoader:: ; 9c6ba (27:46ba) + ret + +FontoRocketHouseTextPointers:: ; 9c6bb (27:46bb) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/FontoRoute1.asm b/maps/FontoRoute1.asm new file mode 100644 index 0000000..c4c83a4 --- /dev/null +++ b/maps/FontoRoute1.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoRoute1.asm", ROMX + +FontoRoute1ScriptLoader:: ; da081 (36:6081) + ret + + db "@"
\ No newline at end of file diff --git a/maps/FontoRoute2.asm b/maps/FontoRoute2.asm new file mode 100644 index 0000000..f05f478 --- /dev/null +++ b/maps/FontoRoute2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoRoute2.asm", ROMX + +FontoRoute2ScriptLoader:: ; da2c4 (36:62c4) + ret + + db "@"
\ No newline at end of file diff --git a/maps/FontoRoute3.asm b/maps/FontoRoute3.asm new file mode 100644 index 0000000..501d4ca --- /dev/null +++ b/maps/FontoRoute3.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoRoute3.asm", ROMX + +FontoRoute3ScriptLoader:: ; da4bb (36:64bb) + ret + + db "@"
\ No newline at end of file diff --git a/maps/FontoRoute4.asm b/maps/FontoRoute4.asm new file mode 100644 index 0000000..0dfbb45 --- /dev/null +++ b/maps/FontoRoute4.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoRoute4.asm", ROMX + +FontoRoute4ScriptLoader:: ; da3b0 (36:63b0) + ret + + db "@"
\ No newline at end of file diff --git a/maps/FontoRoute5.asm b/maps/FontoRoute5.asm new file mode 100644 index 0000000..27c5207 --- /dev/null +++ b/maps/FontoRoute5.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoRoute5.asm", ROMX + +FontoRoute5ScriptLoader:: ; db52e (36:752e) + ret + + db "@"
\ No newline at end of file diff --git a/maps/FontoRoute6.asm b/maps/FontoRoute6.asm new file mode 100644 index 0000000..2b872c0 --- /dev/null +++ b/maps/FontoRoute6.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoRoute6.asm", ROMX + +FontoRoute6ScriptLoader:: ; da1e6 (36:61e6) + ret + + db "@"
\ No newline at end of file diff --git a/maps/FontoRouteGate1.asm b/maps/FontoRouteGate1.asm new file mode 100644 index 0000000..0a60eec --- /dev/null +++ b/maps/FontoRouteGate1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoRouteGate1.asm", ROMX + +FontoRouteGate1ScriptLoader:: ; 9c577 (27:4577) + ret + +FontoRouteGate1TextPointers:: ; 9c578 (27:4578) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/FontoRouteGate2.asm b/maps/FontoRouteGate2.asm new file mode 100644 index 0000000..244056f --- /dev/null +++ b/maps/FontoRouteGate2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoRouteGate2.asm", ROMX + +FontoRouteGate2ScriptLoader:: ; 9c5d2 (27:45d2) + ret + +FontoRouteGate2TextPointers:: ; 9c5d3 (27:45d3) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/FontoRouteGate3.asm b/maps/FontoRouteGate3.asm new file mode 100644 index 0000000..fd3b5b1 --- /dev/null +++ b/maps/FontoRouteGate3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/FontoRouteGate3.asm", ROMX + +FontoRouteGate3ScriptLoader:: ; 9c62d (27:462d) + ret + +FontoRouteGate3TextPointers:: ; 9c62e (27:462e) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Haiteku.asm b/maps/Haiteku.asm new file mode 100644 index 0000000..94dce79 --- /dev/null +++ b/maps/Haiteku.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Haiteku.asm", ROMX + +HaitekuScriptLoader:: ; d87f6 (36:47f6) + ret + + db "@"
\ No newline at end of file diff --git a/maps/HaitekuAquarium1F.asm b/maps/HaitekuAquarium1F.asm new file mode 100644 index 0000000..7d9fa3e --- /dev/null +++ b/maps/HaitekuAquarium1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuAquarium1F.asm", ROMX + +HaitekuAquarium1FScriptLoader:: ; 9c4b0 (27:44b0) + ret + +HaitekuAquarium1FTextPointers:: ; 9c4b1 (27:44b1) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuAquarium2F.asm b/maps/HaitekuAquarium2F.asm new file mode 100644 index 0000000..d50c44a --- /dev/null +++ b/maps/HaitekuAquarium2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuAquarium2F.asm", ROMX + +HaitekuAquarium2FScriptLoader:: ; 9c51c (27:451c) + ret + +HaitekuAquarium2FTextPointers:: ; 9c51d (27:451d) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuHouse1.asm b/maps/HaitekuHouse1.asm new file mode 100644 index 0000000..5838884 --- /dev/null +++ b/maps/HaitekuHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuHouse1.asm", ROMX + +HaitekuHouse1ScriptLoader:: ; 9c368 (27:4368) + ret + +HaitekuHouse1TextPointers:: ; 9c369 (27:4369) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuHouse2.asm b/maps/HaitekuHouse2.asm new file mode 100644 index 0000000..34fdf10 --- /dev/null +++ b/maps/HaitekuHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuHouse2.asm", ROMX + +HaitekuHouse2ScriptLoader:: ; 9c3c2 (27:43c2) + ret + +HaitekuHouse2TextPointers:: ; 9c3c3 (27:43c3) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuImposterOakHouse.asm b/maps/HaitekuImposterOakHouse.asm new file mode 100644 index 0000000..0018455 --- /dev/null +++ b/maps/HaitekuImposterOakHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuImposterOakHouse.asm", ROMX + +HaitekuImposterOakHouseScriptLoader:: ; 9c429 (27:4429) + ret + +HaitekuImposterOakHouseTextPointers:: ; 9c42a (27:442a) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuLeague1F.asm b/maps/HaitekuLeague1F.asm new file mode 100644 index 0000000..72b4353 --- /dev/null +++ b/maps/HaitekuLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuLeague1F.asm", ROMX + +HaitekuLeague1FScriptLoader:: ; 9c1ee (27:41ee) + ret + +HaitekuLeague1FTextPointers:: ; 9c1ef (27:41ef) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuLeague2F.asm b/maps/HaitekuLeague2F.asm new file mode 100644 index 0000000..bf2b496 --- /dev/null +++ b/maps/HaitekuLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuLeague2F.asm", ROMX + +HaitekuLeague2FScriptLoader:: ; 9c28e (27:428e) + ret + +HaitekuLeague2FTextPointers:: ; 9c28f (27:428f) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuMart.asm b/maps/HaitekuMart.asm new file mode 100644 index 0000000..2fa5689 --- /dev/null +++ b/maps/HaitekuMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuMart.asm", ROMX + +HaitekuMartScriptLoader:: ; 9c30e (27:430e) + ret + +HaitekuMartTextPointers:: ; 9c30f (27:430f) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuPokecenter1F.asm b/maps/HaitekuPokecenter1F.asm new file mode 100644 index 0000000..d8b5e48 --- /dev/null +++ b/maps/HaitekuPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuPokecenter1F.asm", ROMX + +HaitekuPokecenter1FScriptLoader:: ; 9c0d4 (27:40d4) + ret + +HaitekuPokecenter1FTextPointers:: ; 9c0d5 (27:40d5) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuPokecenter2F.asm b/maps/HaitekuPokecenter2F.asm new file mode 100644 index 0000000..b6c298a --- /dev/null +++ b/maps/HaitekuPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuPokecenter2F.asm", ROMX + +HaitekuPokecenter2FScriptLoader:: ; 9c14d (27:414d) + ret + +HaitekuPokecenter2FTextPointers:: ; 9c14e (27:414e) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuWestRoute.asm b/maps/HaitekuWestRoute.asm new file mode 100644 index 0000000..5bafbea --- /dev/null +++ b/maps/HaitekuWestRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuWestRoute.asm", ROMX + +HaitekuWestRouteScriptLoader:: ; d9dcf (36:5dcf) + ret + + db "@"
\ No newline at end of file diff --git a/maps/HaitekuWestRouteGate.asm b/maps/HaitekuWestRouteGate.asm new file mode 100644 index 0000000..8d0c045 --- /dev/null +++ b/maps/HaitekuWestRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuWestRouteGate.asm", ROMX + +HaitekuWestRouteGateScriptLoader:: ; 9c040 (27:4040) + ret + +HaitekuWestRouteGateTextPointers:: ; 9c041 (27:4041) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/HaitekuWestRouteOcean.asm b/maps/HaitekuWestRouteOcean.asm new file mode 100644 index 0000000..26d09d8 --- /dev/null +++ b/maps/HaitekuWestRouteOcean.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/HaitekuWestRouteOcean.asm", ROMX + +HaitekuWestRouteOceanScriptLoader:: ; d9f15 (36:5f15) + ret + + db "@"
\ No newline at end of file diff --git a/maps/Kanto.asm b/maps/Kanto.asm new file mode 100644 index 0000000..97162f1 --- /dev/null +++ b/maps/Kanto.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Kanto.asm", ROMX + +KantoScriptLoader:: ; d95f1 (36:55f1) + ret + + db "@"
\ No newline at end of file diff --git a/maps/KantoCeladonElevator.asm b/maps/KantoCeladonElevator.asm new file mode 100644 index 0000000..1ff5df9 --- /dev/null +++ b/maps/KantoCeladonElevator.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoCeladonElevator.asm", ROMX + +KantoCeladonElevatorScriptLoader:: ; 9e764 (27:6764) + ret + +KantoCeladonElevatorTextPointers:: ; 9e765 (27:6765) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoCeladonMart1F.asm b/maps/KantoCeladonMart1F.asm new file mode 100644 index 0000000..cb5e4bc --- /dev/null +++ b/maps/KantoCeladonMart1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoCeladonMart1F.asm", ROMX + +KantoCeladonMart1FScriptLoader:: ; 9e52c (27:652c) + ret + +KantoCeladonMart1FTextPointers:: ; 9e52d (27:652d) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoCeladonMart2F.asm b/maps/KantoCeladonMart2F.asm new file mode 100644 index 0000000..8014c6e --- /dev/null +++ b/maps/KantoCeladonMart2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoCeladonMart2F.asm", ROMX + +KantoCeladonMart2FScriptLoader:: ; 9e5a6 (27:65a6) + ret + +KantoCeladonMart2FTextPointers:: ; 9e5a7 (27:65a7) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoCeladonMart3F.asm b/maps/KantoCeladonMart3F.asm new file mode 100644 index 0000000..547d83c --- /dev/null +++ b/maps/KantoCeladonMart3F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoCeladonMart3F.asm", ROMX + +KantoCeladonMart3FScriptLoader:: ; 9e620 (27:6620) + ret + +KantoCeladonMart3FTextPointers:: ; 9e621 (27:6621) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoCeladonMart4F.asm b/maps/KantoCeladonMart4F.asm new file mode 100644 index 0000000..c983925 --- /dev/null +++ b/maps/KantoCeladonMart4F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoCeladonMart4F.asm", ROMX + +KantoCeladonMart4FScriptLoader:: ; 9e6a7 (27:66a7) + ret + +KantoCeladonMart4FTextPointers:: ; 9e6a8 (27:66a8) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoCeladonMart5F.asm b/maps/KantoCeladonMart5F.asm new file mode 100644 index 0000000..785b404 --- /dev/null +++ b/maps/KantoCeladonMart5F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoCeladonMart5F.asm", ROMX + +KantoCeladonMart5FScriptLoader:: ; 9e727 (27:6727) + ret + +KantoCeladonMart5FTextPointers:: ; 9e728 (27:6728) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoCeruleanHouse.asm b/maps/KantoCeruleanHouse.asm new file mode 100644 index 0000000..51a7c7a --- /dev/null +++ b/maps/KantoCeruleanHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoCeruleanHouse.asm", ROMX + +KantoCeruleanHouseScriptLoader:: ; 9e203 (27:6203) + ret + +KantoCeruleanHouseTextPointers:: ; 9e204 (27:6204) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoDiner.asm b/maps/KantoDiner.asm new file mode 100644 index 0000000..e78d1b7 --- /dev/null +++ b/maps/KantoDiner.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoDiner.asm", ROMX + +KantoDinerScriptLoader:: ; 9ed36 (27:6d36) + ret + +KantoDinerTextPointers:: ; 9ed37 (27:6d37) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoEastRoute.asm b/maps/KantoEastRoute.asm new file mode 100644 index 0000000..0e6762a --- /dev/null +++ b/maps/KantoEastRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoEastRoute.asm", ROMX + +KantoEastRouteScriptLoader:: ; db24b (36:724b) + ret + + db "@"
\ No newline at end of file diff --git a/maps/KantoEldersHouse.asm b/maps/KantoEldersHouse.asm new file mode 100644 index 0000000..9d7f09e --- /dev/null +++ b/maps/KantoEldersHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoEldersHouse.asm", ROMX + +KantoEldersHouseScriptLoader:: ; 9f0ca (27:70ca) + ret + +KantoEldersHouseTextPointers:: ; 9f0cb (27:70cb) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoFishingGuru.asm b/maps/KantoFishingGuru.asm new file mode 100644 index 0000000..8ada185 --- /dev/null +++ b/maps/KantoFishingGuru.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoFishingGuru.asm", ROMX + +KantoFishingGuruScriptLoader:: ; 9f2bb (27:72bb) + ret + +KantoFishingGuruTextPointers:: ; 9f2bc (27:72bc) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoGameCorner.asm b/maps/KantoGameCorner.asm new file mode 100644 index 0000000..a76440e --- /dev/null +++ b/maps/KantoGameCorner.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoGameCorner.asm", ROMX + +KantoGameCornerScriptLoader:: ; 9ec3a (27:6c3a) + ret + +KantoGameCornerTextPointers:: ; 9ec3b (27:6c3b) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoGameCornerPrizes.asm b/maps/KantoGameCornerPrizes.asm new file mode 100644 index 0000000..33ac1e2 --- /dev/null +++ b/maps/KantoGameCornerPrizes.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoGameCornerPrizes.asm", ROMX + +KantoGameCornerPrizesScriptLoader:: ; 9ece9 (27:6ce9) + ret + +KantoGameCornerPrizesTextPointers:: ; 9ecea (27:6cea) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoGamefreakHQ1.asm b/maps/KantoGamefreakHQ1.asm new file mode 100644 index 0000000..6eb0867 --- /dev/null +++ b/maps/KantoGamefreakHQ1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoGamefreakHQ1.asm", ROMX + +KantoGamefreakHQ1ScriptLoader:: ; 9e87e (27:687e) + ret + +KantoGamefreakHQ1TextPointers:: ; 9e87f (27:687f) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoGamefreakHQ2.asm b/maps/KantoGamefreakHQ2.asm new file mode 100644 index 0000000..014abfa --- /dev/null +++ b/maps/KantoGamefreakHQ2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoGamefreakHQ2.asm", ROMX + +KantoGamefreakHQ2ScriptLoader:: ; 9e8ea (27:68ea) + ret + +KantoGamefreakHQ2TextPointers:: ; 9e8eb (27:68eb) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoGamefreakHQ3.asm b/maps/KantoGamefreakHQ3.asm new file mode 100644 index 0000000..8843d57 --- /dev/null +++ b/maps/KantoGamefreakHQ3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoGamefreakHQ3.asm", ROMX + +KantoGamefreakHQ3ScriptLoader:: ; 9e970 (27:6970) + ret + +KantoGamefreakHQ3TextPointers:: ; 9e971 (27:6971) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoGamefreakHQ4.asm b/maps/KantoGamefreakHQ4.asm new file mode 100644 index 0000000..3dcf380 --- /dev/null +++ b/maps/KantoGamefreakHQ4.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoGamefreakHQ4.asm", ROMX + +KantoGamefreakHQ4ScriptLoader:: ; 9e9c8 (27:69c8) + ret + +KantoGamefreakHQ4TextPointers:: ; 9e9c9 (27:69c9) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoGamefreakHQ5.asm b/maps/KantoGamefreakHQ5.asm new file mode 100644 index 0000000..75f2d9f --- /dev/null +++ b/maps/KantoGamefreakHQ5.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoGamefreakHQ5.asm", ROMX + +KantoGamefreakHQ5ScriptLoader:: ; 9ea11 (27:6a11) + ret + +KantoGamefreakHQ5TextPointers:: ; 9ea12 (27:6a12) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoGreensHouse1F.asm b/maps/KantoGreensHouse1F.asm new file mode 100644 index 0000000..bea48b0 --- /dev/null +++ b/maps/KantoGreensHouse1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoGreensHouse1F.asm", ROMX + +KantoGreensHouse1FScriptLoader:: ; 9f021 (27:7021) + ret + +KantoGreensHouse1FTextPointers:: ; 9f022 (27:7022) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoGreensHouse2F.asm b/maps/KantoGreensHouse2F.asm new file mode 100644 index 0000000..ffb8222 --- /dev/null +++ b/maps/KantoGreensHouse2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoGreensHouse2F.asm", ROMX + +KantoGreensHouse2FScriptLoader:: ; 9f063 (27:7063) + ret + +KantoGreensHouse2FTextPointers:: ; 9f064 (27:7064) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoHospital.asm b/maps/KantoHospital.asm new file mode 100644 index 0000000..f191b25 --- /dev/null +++ b/maps/KantoHospital.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoHospital.asm", ROMX + +KantoHospitalScriptLoader:: ; 9ee50 (27:6e50) + ret + +KantoHospitalTextPointers:: ; 9ee51 (27:6e51) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoLavenderHouse.asm b/maps/KantoLavenderHouse.asm new file mode 100644 index 0000000..36d8530 --- /dev/null +++ b/maps/KantoLavenderHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoLavenderHouse.asm", ROMX + +KantoLavenderHouseScriptLoader:: ; 9e4b8 (27:64b8) + ret + +KantoLavenderHouseTextPointers:: ; 9e4b9 (27:64b9) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoLeague1F.asm b/maps/KantoLeague1F.asm new file mode 100644 index 0000000..e9fc39c --- /dev/null +++ b/maps/KantoLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoLeague1F.asm", ROMX + +KantoLeague1FScriptLoader:: ; 9e3b1 (27:63b1) + ret + +KantoLeague1FTextPointers:: ; 9e3b2 (27:63b2) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoLeague21F.asm b/maps/KantoLeague21F.asm new file mode 100644 index 0000000..6381c5a --- /dev/null +++ b/maps/KantoLeague21F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoLeague21F.asm", ROMX + +KantoLeague21FScriptLoader:: ; 9f1c1 (27:71c1) + ret + +KantoLeague21FTextPointers:: ; 9f1c2 (27:71c2) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoLeague22F.asm b/maps/KantoLeague22F.asm new file mode 100644 index 0000000..c2ee20d --- /dev/null +++ b/maps/KantoLeague22F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoLeague22F.asm", ROMX + +KantoLeague22FScriptLoader:: ; 9f261 (27:7261) + ret + +KantoLeague22FTextPointers:: ; 9f262 (27:7262) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoLeague2F.asm b/maps/KantoLeague2F.asm new file mode 100644 index 0000000..f94acee --- /dev/null +++ b/maps/KantoLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoLeague2F.asm", ROMX + +KantoLeague2FScriptLoader:: ; 9e451 (27:6451) + ret + +KantoLeague2FTextPointers:: ; 9e452 (27:6452) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoMart.asm b/maps/KantoMart.asm new file mode 100644 index 0000000..9dfc5de --- /dev/null +++ b/maps/KantoMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoMart.asm", ROMX + +KantoMartScriptLoader:: ; 9e7e4 (27:67e4) + ret + +KantoMartTextPointers:: ; 9e7e5 (27:67e5) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoOaksLab.asm b/maps/KantoOaksLab.asm new file mode 100644 index 0000000..eff0846 --- /dev/null +++ b/maps/KantoOaksLab.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoOaksLab.asm", ROMX + +KantoOaksLabScriptLoader:: ; 9f120 (27:7120) + ret + +KantoOaksLabTextPointers:: ; 9f121 (27:7121) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoPokecenter1F.asm b/maps/KantoPokecenter1F.asm new file mode 100644 index 0000000..64ddb8a --- /dev/null +++ b/maps/KantoPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoPokecenter1F.asm", ROMX + +KantoPokecenter1FScriptLoader:: ; 9e297 (27:6297) + ret + +KantoPokecenter1FTextPointers:: ; 9e298 (27:6298) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoPokecenter21F.asm b/maps/KantoPokecenter21F.asm new file mode 100644 index 0000000..45e6bfb --- /dev/null +++ b/maps/KantoPokecenter21F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoPokecenter21F.asm", ROMX + +KantoPokecenter21FScriptLoader:: ; 9eee4 (27:6ee4) + ret + +KantoPokecenter21FTextPointers:: ; 9eee5 (27:6ee5) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoPokecenter22F.asm b/maps/KantoPokecenter22F.asm new file mode 100644 index 0000000..daafb43 --- /dev/null +++ b/maps/KantoPokecenter22F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoPokecenter22F.asm", ROMX + +KantoPokecenter22FScriptLoader:: ; 9ef5d (27:6f5d) + ret + +KantoPokecenter22FTextPointers:: ; 9ef5e (27:6f5e) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoPokecenter2F.asm b/maps/KantoPokecenter2F.asm new file mode 100644 index 0000000..8760c8e --- /dev/null +++ b/maps/KantoPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoPokecenter2F.asm", ROMX + +KantoPokecenter2FScriptLoader:: ; 9e310 (27:6310) + ret + +KantoPokecenter2FTextPointers:: ; 9e311 (27:6311) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoRedsHouse.asm b/maps/KantoRedsHouse.asm new file mode 100644 index 0000000..c77805e --- /dev/null +++ b/maps/KantoRedsHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoRedsHouse.asm", ROMX + +KantoRedsHouseScriptLoader:: ; 9efc4 (27:6fc4) + ret + +KantoRedsHouseTextPointers:: ; 9efc5 (27:6fc5) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoSchool.asm b/maps/KantoSchool.asm new file mode 100644 index 0000000..0bf379b --- /dev/null +++ b/maps/KantoSchool.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoSchool.asm", ROMX + +KantoSchoolScriptLoader:: ; 9edd0 (27:6dd0) + ret + +KantoSchoolTextPointers:: ; 9edd1 (27:6dd1) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoSilphCo.asm b/maps/KantoSilphCo.asm new file mode 100644 index 0000000..f960843 --- /dev/null +++ b/maps/KantoSilphCo.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoSilphCo.asm", ROMX + +KantoSilphCoScriptLoader:: ; 9eac4 (27:6ac4) + ret + +KantoSilphCoTextPointers:: ; 9eac5 (27:6ac5) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoUnusedArea.asm b/maps/KantoUnusedArea.asm new file mode 100644 index 0000000..9faca02 --- /dev/null +++ b/maps/KantoUnusedArea.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoUnusedArea.asm", ROMX + +KantoUnusedAreaScriptLoader:: ; 9ec75 (27:6c75) + ret + +KantoUnusedAreaTextPointers:: ; 9ec76 (27:6c76) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/KantoViridianHouse.asm b/maps/KantoViridianHouse.asm new file mode 100644 index 0000000..3c9c0d5 --- /dev/null +++ b/maps/KantoViridianHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/KantoViridianHouse.asm", ROMX + +KantoViridianHouseScriptLoader:: ; 9eb2b (27:6b2b) + ret + +KantoViridianHouseTextPointers:: ; 9eb2c (27:6b2c) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Map13.asm b/maps/Map13.asm deleted file mode 100644 index b69dc4b..0000000 --- a/maps/Map13.asm +++ /dev/null @@ -1,26 +0,0 @@ -include "constants.asm" - -SECTION "Map 13 Script", ROMX[$6078], BANK[$34] - -Map13ScriptLoader:: ; 6078 - ld hl, Map13ScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -Map13ScriptPointers: ; 6082 - dw Map13Script - dw Map13NPCIDs - -Map13NPCIDs: ; 6086 - db $FF - -Map13TextPointers: ; 6087 - dw MapDefaultText - dw MapDefaultText - -Map13Script: ; 608B - ld hl, Map13NPCIDs - ld de, Map13TextPointers - call CallMapTextSubroutine - ret
\ No newline at end of file diff --git a/maps/MtFuji.asm b/maps/MtFuji.asm new file mode 100644 index 0000000..312df28 --- /dev/null +++ b/maps/MtFuji.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/MtFuji.asm", ROMX + +MtFujiScriptLoader:: ; d96ed (36:56ed) + ret + + db "@"
\ No newline at end of file diff --git a/maps/MtFujiRoute.asm b/maps/MtFujiRoute.asm new file mode 100644 index 0000000..7f13c5b --- /dev/null +++ b/maps/MtFujiRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/MtFujiRoute.asm", ROMX + +MtFujiRouteScriptLoader:: ; db442 (36:7442) + ret + + db "@"
\ No newline at end of file diff --git a/maps/Newtype.asm b/maps/Newtype.asm new file mode 100644 index 0000000..9600cd2 --- /dev/null +++ b/maps/Newtype.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Newtype.asm", ROMX + +NewtypeScriptLoader:: ; d8c38 (36:4c38) + ret + + db "@"
\ No newline at end of file diff --git a/maps/NewtypeDiner.asm b/maps/NewtypeDiner.asm new file mode 100644 index 0000000..4e1f4fc --- /dev/null +++ b/maps/NewtypeDiner.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeDiner.asm", ROMX + +NewtypeDinerScriptLoader:: ; 9d211 (27:5211) + ret + +NewtypeDinerTextPointers:: ; 9d212 (27:5212) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypeDojo.asm b/maps/NewtypeDojo.asm new file mode 100644 index 0000000..3b7430f --- /dev/null +++ b/maps/NewtypeDojo.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeDojo.asm", ROMX + +NewtypeDojoScriptLoader:: ; 9d13a (27:513a) + ret + +NewtypeDojoTextPointers:: ; 9d13b (27:513b) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypeHouse1.asm b/maps/NewtypeHouse1.asm new file mode 100644 index 0000000..e077f54 --- /dev/null +++ b/maps/NewtypeHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeHouse1.asm", ROMX + +NewtypeHouse1ScriptLoader:: ; 9d194 (27:5194) + ret + +NewtypeHouse1TextPointers:: ; 9d195 (27:5195) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypeHouse2.asm b/maps/NewtypeHouse2.asm new file mode 100644 index 0000000..c6d4264 --- /dev/null +++ b/maps/NewtypeHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeHouse2.asm", ROMX + +NewtypeHouse2ScriptLoader:: ; 9d26b (27:526b) + ret + +NewtypeHouse2TextPointers:: ; 9d26c (27:526c) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypeHouse3.asm b/maps/NewtypeHouse3.asm new file mode 100644 index 0000000..684df8e --- /dev/null +++ b/maps/NewtypeHouse3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeHouse3.asm", ROMX + +NewtypeHouse3ScriptLoader:: ; 9d2c5 (27:52c5) + ret + +NewtypeHouse3TextPointers:: ; 9d2c6 (27:52c6) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypeLeague1F.asm b/maps/NewtypeLeague1F.asm new file mode 100644 index 0000000..1995a9e --- /dev/null +++ b/maps/NewtypeLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeLeague1F.asm", ROMX + +NewtypeLeague1FScriptLoader:: ; 9cf26 (27:4f26) + ret + +NewtypeLeague1FTextPointers:: ; 9cf27 (27:4f27) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypeLeague2F.asm b/maps/NewtypeLeague2F.asm new file mode 100644 index 0000000..5319734 --- /dev/null +++ b/maps/NewtypeLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeLeague2F.asm", ROMX + +NewtypeLeague2FScriptLoader:: ; 9cfc6 (27:4fc6) + ret + +NewtypeLeague2FTextPointers:: ; 9cfc7 (27:4fc7) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypeMart.asm b/maps/NewtypeMart.asm new file mode 100644 index 0000000..ba0a8aa --- /dev/null +++ b/maps/NewtypeMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeMart.asm", ROMX + +NewtypeMartScriptLoader:: ; 9d0a0 (27:50a0) + ret + +NewtypeMartTextPointers:: ; 9d0a1 (27:50a1) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypePokecenter1F.asm b/maps/NewtypePokecenter1F.asm new file mode 100644 index 0000000..bb5328e --- /dev/null +++ b/maps/NewtypePokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypePokecenter1F.asm", ROMX + +NewtypePokecenter1FScriptLoader:: ; 9ce0c (27:4e0c) + ret + +NewtypePokecenter1FTextPointers:: ; 9ce0d (27:4e0d) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypePokecenter2F.asm b/maps/NewtypePokecenter2F.asm new file mode 100644 index 0000000..8603cfe --- /dev/null +++ b/maps/NewtypePokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypePokecenter2F.asm", ROMX + +NewtypePokecenter2FScriptLoader:: ; 9ce85 (27:4e85) + ret + +NewtypePokecenter2FTextPointers:: ; 9ce86 (27:4e86) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypeRoute.asm b/maps/NewtypeRoute.asm new file mode 100644 index 0000000..b27bdfa --- /dev/null +++ b/maps/NewtypeRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeRoute.asm", ROMX + +NewtypeRouteScriptLoader:: ; daa6c (36:6a6c) + ret + + db "@"
\ No newline at end of file diff --git a/maps/NewtypeRouteGate.asm b/maps/NewtypeRouteGate.asm new file mode 100644 index 0000000..2ec213f --- /dev/null +++ b/maps/NewtypeRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeRouteGate.asm", ROMX + +NewtypeRouteGateScriptLoader:: ; 9d406 (27:5406) + ret + +NewtypeRouteGateTextPointers:: ; 9d407 (27:5407) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NewtypeSailorHouse.asm b/maps/NewtypeSailorHouse.asm new file mode 100644 index 0000000..c7fb57d --- /dev/null +++ b/maps/NewtypeSailorHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NewtypeSailorHouse.asm", ROMX + +NewtypeSailorHouseScriptLoader:: ; 9d020 (27:5020) + ret + +NewtypeSailorHouseTextPointers:: ; 9d021 (27:5021) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/North.asm b/maps/North.asm new file mode 100644 index 0000000..75f9812 --- /dev/null +++ b/maps/North.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/North.asm", ROMX + +NorthScriptLoader:: ; d99dd (36:59dd) + ret + + db "@"
\ No newline at end of file diff --git a/maps/NorthHouse1.asm b/maps/NorthHouse1.asm new file mode 100644 index 0000000..a5821be --- /dev/null +++ b/maps/NorthHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NorthHouse1.asm", ROMX + +NorthHouse1ScriptLoader:: ; 9f556 (27:7556) + ret + +NorthHouse1TextPointers:: ; 9f557 (27:7557) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NorthHouse2.asm b/maps/NorthHouse2.asm new file mode 100644 index 0000000..67024eb --- /dev/null +++ b/maps/NorthHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NorthHouse2.asm", ROMX + +NorthHouse2ScriptLoader:: ; 9f630 (27:7630) + ret + +NorthHouse2TextPointers:: ; 9f631 (27:7631) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NorthMart.asm b/maps/NorthMart.asm new file mode 100644 index 0000000..7c82805 --- /dev/null +++ b/maps/NorthMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NorthMart.asm", ROMX + +NorthMartScriptLoader:: ; 9f5d6 (27:75d6) + ret + +NorthMartTextPointers:: ; 9f5d7 (27:75d7) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NorthPokecenter1F.asm b/maps/NorthPokecenter1F.asm new file mode 100644 index 0000000..eebd9f1 --- /dev/null +++ b/maps/NorthPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NorthPokecenter1F.asm", ROMX + +NorthPokecenter1FScriptLoader:: ; 9f6c4 (27:76c4) + ret + +NorthPokecenter1FTextPointers:: ; 9f6c5 (27:76c5) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/NorthPokecenter2F.asm b/maps/NorthPokecenter2F.asm new file mode 100644 index 0000000..1c2ba65 --- /dev/null +++ b/maps/NorthPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/NorthPokecenter2F.asm", ROMX + +NorthPokecenter2FScriptLoader:: ; 9f73d (27:773d) + ret + +NorthPokecenter2FTextPointers:: ; 9f73e (27:773e) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Office1.asm b/maps/Office1.asm new file mode 100644 index 0000000..d472bcd --- /dev/null +++ b/maps/Office1.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/Office1.asm", ROMX + +Office1ScriptLoader:: ; bd06e (2f:506e) + ret + +Office1TextPointers:: ; bd06f (2f:506f) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/Office2.asm b/maps/Office2.asm new file mode 100644 index 0000000..3ee4b7c --- /dev/null +++ b/maps/Office2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/Office2.asm", ROMX + +Office2ScriptLoader:: ; bd19f (2f:519f) + ret + +Office2TextPointers:: ; bd1a0 (2f:51a0) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/Office3.asm b/maps/Office3.asm new file mode 100644 index 0000000..c2bc639 --- /dev/null +++ b/maps/Office3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/Office3.asm", ROMX + +Office3ScriptLoader:: ; bd276 (2f:5276) + ret + +Office3TextPointers:: ; bd277 (2f:5277) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/OldCity.asm b/maps/OldCity.asm new file mode 100644 index 0000000..c28f200 --- /dev/null +++ b/maps/OldCity.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCity.asm", ROMX + +OldCityScriptLoader:: ; d8370 (36:4370) + ret + + db "@"
\ No newline at end of file diff --git a/maps/OldCityBillsHouse.asm b/maps/OldCityBillsHouse.asm new file mode 100644 index 0000000..93f0e6a --- /dev/null +++ b/maps/OldCityBillsHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityBillsHouse.asm", ROMX + +OldCityBillsHouseScriptLoader:: ; 9454f (25:454f) + ret + +OldCityBillsHouseTextPointers:: ; 94550 (25:4550) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityGym.asm b/maps/OldCityGym.asm new file mode 100644 index 0000000..2cb5ed8 --- /dev/null +++ b/maps/OldCityGym.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityGym.asm", ROMX + +OldCityGymScriptLoader:: ; 9426e (25:426e) + ret + +OldCityGymTextPointers:: ; 9426f (25:426f) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityHouse.asm b/maps/OldCityHouse.asm new file mode 100644 index 0000000..a395eb5 --- /dev/null +++ b/maps/OldCityHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityHouse.asm", ROMX + +OldCityHouseScriptLoader:: ; 94653 (25:4653) + ret + +OldCityHouseTextPointers:: ; 94654 (25:4654) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityKurtsHouse.asm b/maps/OldCityKurtsHouse.asm new file mode 100644 index 0000000..4665e70 --- /dev/null +++ b/maps/OldCityKurtsHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityKurtsHouse.asm", ROMX + +OldCityKurtsHouseScriptLoader:: ; 94a0b (25:4a0b) + ret + +OldCityKurtsHouseTextPointers:: ; 94a0c (25:4a0c) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityMart.asm b/maps/OldCityMart.asm new file mode 100644 index 0000000..395668d --- /dev/null +++ b/maps/OldCityMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityMart.asm", ROMX + +OldCityMartScriptLoader:: ; 945d3 (25:45d3) + ret + +OldCityMartTextPointers:: ; 945d4 (25:45d4) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityMuseum.asm b/maps/OldCityMuseum.asm new file mode 100644 index 0000000..d6f7dfa --- /dev/null +++ b/maps/OldCityMuseum.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityMuseum.asm", ROMX + +OldCityMuseumScriptLoader:: ; 941b2 (25:41b2) + ret + +OldCityMuseumTextPointers:: ; 941b3 (25:41b3) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityPokecenter1F.asm b/maps/OldCityPokecenter1F.asm new file mode 100644 index 0000000..9659784 --- /dev/null +++ b/maps/OldCityPokecenter1F.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityPokecenter1F.asm", ROMX + +OldCityPokecenter1FScriptLoader:: ; 946eb (25:46eb) + ret + +OldCityPokecenter1FTextPointers:: ; 946ec (25:46ec) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/OldCitySchool.asm b/maps/OldCitySchool.asm new file mode 100644 index 0000000..94f1f45 --- /dev/null +++ b/maps/OldCitySchool.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCitySchool.asm", ROMX + +OldCitySchoolScriptLoader:: ; 94ac2 (25:4ac2) + ret + +OldCitySchoolTextPointers:: ; 94ac3 (25:4ac3) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityTower1F.asm b/maps/OldCityTower1F.asm new file mode 100644 index 0000000..34e181c --- /dev/null +++ b/maps/OldCityTower1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityTower1F.asm", ROMX + +OldCityTower1FScriptLoader:: ; 942fe (25:42fe) + ret + +OldCityTower1FTextPointers:: ; 942ff (25:42ff) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityTower2F.asm b/maps/OldCityTower2F.asm new file mode 100644 index 0000000..ec4b930 --- /dev/null +++ b/maps/OldCityTower2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityTower2F.asm", ROMX + +OldCityTower2FScriptLoader:: ; 94383 (25:4383) + ret + +OldCityTower2FTextPointers:: ; 94384 (25:4384) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityTower3F.asm b/maps/OldCityTower3F.asm new file mode 100644 index 0000000..485bc5a --- /dev/null +++ b/maps/OldCityTower3F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityTower3F.asm", ROMX + +OldCityTower3FScriptLoader:: ; 94408 (25:4408) + ret + +OldCityTower3FTextPointers:: ; 94409 (25:4409) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityTower4F.asm b/maps/OldCityTower4F.asm new file mode 100644 index 0000000..9bfabba --- /dev/null +++ b/maps/OldCityTower4F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityTower4F.asm", ROMX + +OldCityTower4FScriptLoader:: ; 9448d (25:448d) + ret + +OldCityTower4FTextPointers:: ; 9448e (25:448e) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/OldCityTower5F.asm b/maps/OldCityTower5F.asm new file mode 100644 index 0000000..a411e2e --- /dev/null +++ b/maps/OldCityTower5F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/OldCityTower5F.asm", ROMX + +OldCityTower5FScriptLoader:: ; 944e1 (25:44e1) + ret + +OldCityTower5FTextPointers:: ; 944e2 (25:44e2) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/PlayerHouse1F.asm b/maps/PlayerHouse1F.asm new file mode 100644 index 0000000..826edbf --- /dev/null +++ b/maps/PlayerHouse1F.asm @@ -0,0 +1,61 @@ +include "constants.asm" + +SECTION "maps/PlayerHouse1F.asm", ROMX + +PlayerHouse1FScriptLoader:: ; 409C + ld hl, PlayerHouse1FScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +PlayerHouse1FScriptPointers: ; 40A6 + dw PlayerHouse1FScript1 + dw PlayerHouse1FNPCIDs1 + dw PlayerHouse1FScript2 + dw PlayerHouse1FNPCIDs2 + +PlayerHouse1FNPCIDs1: ; 40AE + db $FF + +PlayerHouse1FNPCIDs2: ; 40AF + db 0 + db $FF + +PlayerHouse1FScript1: ; 40B1 + ld hl, PlayerHouse1FNPCIDs1 + ld de, PlayerHouse1FSignPointers + call CallMapTextSubroutine + ret + +PlayerHouse1FScript2: ; 40BB + ld hl, PlayerHouse1FNPCIDs2 + ld de, PlayerHouse1FSignPointers + call CallMapTextSubroutine + ret + +PlayerHouse1FSignPointers: ; 40C5 + dw Function38ab + dw Function38b4 + dw Function38a2 + dw Function38bd + dw Function3899 +PlayerHouse1FTextPointers:: + dw PlayerHouse1FNPCText1 + +PlayerHouse1FNPCText1: ; 40D1 + ld hl, PlayerHouse1FTextString1 + call OpenTextbox + ret + +PlayerHouse1FTextString1: ; 40D8 + text "おかあさん『えっ あなた" + line "オーキドはかせに" + cont "ポケモンずかんを つくってくれって" + cont "たのまれたの？" + + para "すごいじゃない！" + line "わたしも ポケモン きらいって" + cont "わけじゃないし がんばるのよ！" + done + +; 4132
\ No newline at end of file diff --git a/maps/PlayersHouse2F.asm b/maps/PlayerHouse2F.asm index e96a07b..e902d84 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayerHouse2F.asm @@ -1,47 +1,49 @@ include "constants.asm" -SECTION "Player's House 2F", ROMX[$418B], BANK[$34] +SECTION "maps/PlayerHouse2F.asm", ROMX -PlayersHouse2FScriptLoader:: ; 418B - ld hl, PlayersHouse2FScriptPointers +PlayerHouse2FScriptLoader:: ; 418B + ld hl, PlayerHouse2FScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -PlayersHouse2FScriptPointers: ; 4195 - dw PlayersHouse2FScript1 - dw PlayersHouse2FNPCIDs1 - dw PlayersHouse2FScript2 - dw PlayersHouse2FNPCIDs2 - dw PlayersHouse2FScript3 - dw PlayersHouse2FDollText +PlayerHouse2FScriptPointers: ; 4195 + dw PlayerHouse2FScript1 + dw PlayerHouse2FNPCIDs1 + dw PlayerHouse2FScript2 + dw PlayerHouse2FNPCIDs2 + +PlayerHouse2FTextPointers:: + dw PlayerHouse2FText1 + dw PlayerHouse2FDollText -PlayersHouse2FNPCIDs1: ; 41A1 +PlayerHouse2FNPCIDs1: ; 41A1 db 0 db 1 db $FF -PlayersHouse2FNPCIDs2: ; 41A4 +PlayerHouse2FNPCIDs2: ; 41A4 db 1 db $FF -PlayersHouse2FTextPointers: ; 41A6 +PlayerHouse2FSignPointers: ; 41A6 dw Function3899 - dw PlayersHouse2FRadioText - dw PlayersHouse2FComputerText + dw PlayerHouse2FRadioText + dw PlayerHouse2FComputerText dw Function3899 - dw PlayersHouse2FN64Text + dw PlayerHouse2FN64Text -PlayersHouse2FScript1: ; 41B0 - call PlayersHouse2PositionCheck +PlayerHouse2FScript1: ; 41B0 + call PlayerHouse2PositionCheck ret z - ld hl, PlayersHouse2FNPCIDs1 - ld de, PlayersHouse2FTextPointers + ld hl, PlayerHouse2FNPCIDs1 + ld de, PlayerHouse2FSignPointers call CallMapTextSubroutine ret nz ret -PlayersHouse2PositionCheck: ; 41BF +PlayerHouse2PositionCheck: ; 41BF ld hl, wd41a bit 0, [hl] ret nz @@ -56,13 +58,13 @@ PlayersHouse2PositionCheck: ; 41BF ld a, LEFT ld d, 0 call SetObjectFacing - ld hl, PlayersHouse2FTextString2 + ld hl, PlayerHouse2FTextString2 call OpenTextbox - call PlayersHouse2FMovePlayer + call PlayerHouse2FMovePlayer call ClearAccumulator ret -PlayersHouse2FMovePlayer: ; 41EA +PlayerHouse2FMovePlayer: ; 41EA ld a, 0 ld hl, Movement call LoadMovementDataPointer @@ -77,42 +79,42 @@ Movement: ; 41FD db $04 db $32 -PlayersHouse2FScript2: ; 4200 - ld hl, PlayersHouse2FNPCIDs2 - ld de, PlayersHouse2FTextPointers +PlayerHouse2FScript2: ; 4200 + ld hl, PlayerHouse2FNPCIDs2 + ld de, PlayerHouse2FSignPointers call CallMapTextSubroutine ret -PlayersHouse2FScript3: ; 420A +PlayerHouse2FText1: ; 420A ld hl, wd41a bit 3, [hl] jr nz, .jump - ld hl, PlayersHouse2FTextString1 + ld hl, PlayerHouse2FTextString1 call OpenTextbox ld hl, wd41a set 3, [hl] ld c, 3 call DelayFrames .jump - ld hl, PlayersHouse2FTextString2 + ld hl, PlayerHouse2FTextString2 call OpenTextbox ret -PlayersHouse2FDollText: ; 4228 - ld hl, PlayersHouse2FTextString3 +PlayerHouse2FDollText: ; 4228 + ld hl, PlayerHouse2FTextString3 call OpenTextbox ret -PlayersHouse2FRadioText: ; 422F - ld hl, PlayersHouse2FTextString9 +PlayerHouse2FRadioText: ; 422F + ld hl, PlayerHouse2FTextString9 call OpenTextbox ret -PlayersHouse2FComputerText: ; 4236 +PlayerHouse2FComputerText: ; 4236 ld hl, wd41a bit 0, [hl] jr nz, .jump - ld hl, PlayersHouse2FTextString5 + ld hl, PlayerHouse2FTextString5 call OpenTextbox ret @@ -123,27 +125,27 @@ PlayersHouse2FComputerText: ; 4236 call Function1fea ret -PlayersHouse2FCheckEmail: ; 4253 +PlayerHouse2FCheckEmail: ; 4253 call YesNoBox jr c, .jump2 ld hl, wd41a set 0, [hl] - ld hl, PlayersHouse2FTextString6 + ld hl, PlayerHouse2FTextString6 call PrintText ret .jump2 ; 4264 - ld hl, PlayersHouse2FTextString7 + ld hl, PlayerHouse2FTextString7 call PrintText ret -PlayersHouse2FN64Text: ; 426B - ld hl, PlayersHouse2FTextString4 +PlayerHouse2FN64Text: ; 426B + ld hl, PlayerHouse2FTextString4 call OpenTextbox ret -PlayersHouse2FTextString1: ; 4272 +PlayerHouse2FTextString1: ; 4272 text "ケン『おっ おまえの うでで" line "ひかりかがやく そのとけいは⋯⋯" cont "<PLAYER>も ついに" @@ -163,27 +165,27 @@ PlayersHouse2FTextString1: ; 4272 cont "きょうは むり だぜ！" done -PlayersHouse2FTextString2: ; 4332 +PlayerHouse2FTextString2: ; 4332 text "そうだ おまえの パソコンに" line "メールが とどいていたな" cont "でかけるんなら" cont "メールぐらい よんでおけよ" done -PlayersHouse2FTextString3: ; 4365 +PlayerHouse2FTextString3: ; 4365 text "クりスマスに カントーの" line "しんせきに プレゼント" cont "してもらった にんぎょうだ" done -PlayersHouse2FTextString4: ; 438D +PlayerHouse2FTextString4: ; 438D text "ニンテンドウ６４を してる！" cont "⋯⋯ ⋯⋯ さてと！" cont "そろそろ そとに あそびに" cont "でかけるか！" done -PlayersHouse2FTextString5: ; 43BD +PlayerHouse2FTextString5: ; 43BD text "<PLAYER>は" line "パソコンの スイッチを いれた！" @@ -194,11 +196,11 @@ PlayersHouse2FTextString5: ; 43BD db $08 ; 43F3 - call PlayersHouse2FCheckEmail + call PlayerHouse2FCheckEmail call Function3036 ret -PlayersHouse2FTextString6: ; 43FA +PlayerHouse2FTextString6: ; 43FA text "とつぜん メールを さしあげる" line "しつれいを おゆるしあれ" @@ -208,12 +210,12 @@ PlayersHouse2FTextString6: ; 43FA cont "ポケモンけんきゅうしゃ オーキド" done -PlayersHouse2FTextString7: ; 4456 +PlayerHouse2FTextString7: ; 4456 text "あとで" line "よもっと<⋯⋯>" done -PlayersHouse2FTextString8: ; 4461 (unused?) +PlayerHouse2FTextString8: ; 4461 (unused?) text "しんはつばい トレーナーギア！" line "ポケモントレーナーの ための" cont "さいせんたんの とけい です" @@ -231,7 +233,7 @@ PlayersHouse2FTextString8: ; 4461 (unused?) cont "シルフの ホームぺージだ" done -PlayersHouse2FTextString9: ; 44FE +PlayerHouse2FTextString9: ; 44FE text "<PLAYER>は" line "ラジオのスイッチを おした！" diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm deleted file mode 100644 index 5157d63..0000000 --- a/maps/PlayersHouse1F.asm +++ /dev/null @@ -1,60 +0,0 @@ -include "constants.asm" - -SECTION "Player's House 1F", ROMX[$409C], BANK[$34] - -PlayersHouse1FScriptLoader:: ; 409C - ld hl, PlayersHouse1FScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -PlayersHouse1FScriptPointers: ; 40A6 - dw PlayersHouse1FScript1 - dw PlayersHouse1FNPCIDs1 - dw PlayersHouse1FScript2 - dw PlayersHouse1FNPCIDs2 - -PlayersHouse1FNPCIDs1: ; 40AE - db $FF - -PlayersHouse1FNPCIDs2: ; 40AF - db 0 - db $FF - -PlayersHouse1FScript1: ; 40B1 - ld hl, PlayersHouse1FNPCIDs1 - ld de, PlayersHouse1FTextPointers - call CallMapTextSubroutine - ret - -PlayersHouse1FScript2: ; 40BB - ld hl, PlayersHouse1FNPCIDs2 - ld de, PlayersHouse1FTextPointers - call CallMapTextSubroutine - ret - -PlayersHouse1FTextPointers: ; 40C5 - dw Function38ab - dw Function38b4 - dw Function38a2 - dw Function38bd - dw Function3899 - dw PlayersHouse1FNPCText1 - -PlayersHouse1FNPCText1: ; 40D1 - ld hl, PlayersHouse1FTextString1 - call OpenTextbox - ret - -PlayersHouse1FTextString1: ; 40D8 - text "おかあさん『えっ あなた" - line "オーキドはかせに" - cont "ポケモンずかんを つくってくれって" - cont "たのまれたの？" - - para "すごいじゃない！" - line "わたしも ポケモン きらいって" - cont "わけじゃないし がんばるのよ！" - done - -; 4132
\ No newline at end of file diff --git a/maps/PowerPlant1.asm b/maps/PowerPlant1.asm new file mode 100644 index 0000000..24dc193 --- /dev/null +++ b/maps/PowerPlant1.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/PowerPlant1.asm", ROMX + +PowerPlant1ScriptLoader:: ; bc06a (2f:406a) + ret + +PowerPlant1TextPointers:: ; bc06b (2f:406b) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/PowerPlant2.asm b/maps/PowerPlant2.asm new file mode 100644 index 0000000..680332f --- /dev/null +++ b/maps/PowerPlant2.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/PowerPlant2.asm", ROMX + +PowerPlant2ScriptLoader:: ; bc0e7 (2f:40e7) + ret + +PowerPlant2TextPointers:: ; bc0e8 (2f:40e8) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/PowerPlant3.asm b/maps/PowerPlant3.asm new file mode 100644 index 0000000..07972ac --- /dev/null +++ b/maps/PowerPlant3.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/PowerPlant3.asm", ROMX + +PowerPlant3ScriptLoader:: ; bc218 (2f:4218) + ret + +PowerPlant3TextPointers:: ; bc219 (2f:4219) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/PowerPlant4.asm b/maps/PowerPlant4.asm new file mode 100644 index 0000000..ffa1f6d --- /dev/null +++ b/maps/PowerPlant4.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/PowerPlant4.asm", ROMX + +PowerPlant4ScriptLoader:: ; bc349 (2f:4349) + ret + +PowerPlant4TextPointers:: ; bc34a (2f:434a) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/Prince.asm b/maps/Prince.asm new file mode 100644 index 0000000..6327843 --- /dev/null +++ b/maps/Prince.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Prince.asm", ROMX + +PrinceScriptLoader:: ; d9675 (36:5675) + ret + + db "@"
\ No newline at end of file diff --git a/maps/PrinceRoute.asm b/maps/PrinceRoute.asm new file mode 100644 index 0000000..b4376a4 --- /dev/null +++ b/maps/PrinceRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/PrinceRoute.asm", ROMX + +PrinceRouteScriptLoader:: ; db3e6 (36:73e6) + ret + + db "@"
\ No newline at end of file diff --git a/maps/Route15.asm b/maps/Route15.asm new file mode 100644 index 0000000..7d282a1 --- /dev/null +++ b/maps/Route15.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Route15.asm", ROMX + +Route15ScriptLoader:: ; da9bb (36:69bb) + ret + + db "@"
\ No newline at end of file diff --git a/maps/Route15Pokecenter1F.asm b/maps/Route15Pokecenter1F.asm new file mode 100644 index 0000000..148ec09 --- /dev/null +++ b/maps/Route15Pokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/Route15Pokecenter1F.asm", ROMX + +Route15Pokecenter1FScriptLoader:: ; 9d359 (27:5359) + ret + +Route15Pokecenter1FTextPointers:: ; 9d35a (27:535a) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Route15Pokecenter2F.asm b/maps/Route15Pokecenter2F.asm new file mode 100644 index 0000000..003d2bd --- /dev/null +++ b/maps/Route15Pokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/Route15Pokecenter2F.asm", ROMX + +Route15Pokecenter2FScriptLoader:: ; 9d3ab (27:53ab) + ret + +Route15Pokecenter2FTextPointers:: ; 9d3ac (27:53ac) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Route18.asm b/maps/Route18.asm new file mode 100644 index 0000000..5e3ffed --- /dev/null +++ b/maps/Route18.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Route18.asm", ROMX + +Route18ScriptLoader:: ; dac6d (36:6c6d) + ret + + db "@"
\ No newline at end of file diff --git a/maps/Route18Pokecenter1F.asm b/maps/Route18Pokecenter1F.asm new file mode 100644 index 0000000..ea1e376 --- /dev/null +++ b/maps/Route18Pokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/Route18Pokecenter1F.asm", ROMX + +Route18Pokecenter1FScriptLoader:: ; 9d49a (27:549a) + ret + +Route18Pokecenter1FTextPointers:: ; 9d49b (27:549b) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Route18Pokecenter2F.asm b/maps/Route18Pokecenter2F.asm new file mode 100644 index 0000000..04b99f0 --- /dev/null +++ b/maps/Route18Pokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/Route18Pokecenter2F.asm", ROMX + +Route18Pokecenter2FScriptLoader:: ; 9d4ec (27:54ec) + ret + +Route18Pokecenter2FTextPointers:: ; 9d4ed (27:54ed) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Route1Gate1F.asm b/maps/Route1Gate1F.asm index 4772da7..ef48c4c 100644 --- a/maps/Route1Gate1F.asm +++ b/maps/Route1Gate1F.asm @@ -1,8 +1,8 @@ include "constants.asm" -SECTION "Route 1 Gate 1F", ROMX[$4061], BANK[$26] +SECTION "maps/Route1Gate1F.asm", ROMX -Route1Gate1FScriptLoader: ;4061 +Route1Gate1FScriptLoader:: ;4061 ld hl, Route1Gate1FScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -17,14 +17,15 @@ Route1Gate1FNPCIDs: ; 406F db $01 db $FF -Route1Gate1FTextPointers: +Route1Gate1FSignPointers: ; 4072 dw MapDefaultText ;no signs +Route1Gate1FTextPointers:: ; 4074 dw Route1Gate1FText1 dw Route1Gate1FText2 Route1Gate1FScript: ; 4078 ld hl, Route1Gate1FNPCIDs - ld de, Route1Gate1FTextPointers + ld de, Route1Gate1FSignPointers call CallMapTextSubroutine ret @@ -51,5 +52,4 @@ Route1Gate1FText2String: ; 40AC para "いってみたこと ある？" done -;ends at 40D9 - +;ends at 40D9
\ No newline at end of file diff --git a/maps/Route1Gate2F.asm b/maps/Route1Gate2F.asm index 0ab81a8..805e7c0 100644 --- a/maps/Route1Gate2F.asm +++ b/maps/Route1Gate2F.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Route 1 Gate 2F", ROMX[$411F], BANK[$26] +SECTION "maps/Route1Gate2F.asm", ROMX Route1Gate2FScriptLoader:: ; 411F ld hl, Route1Gate2FScriptPointers @@ -16,16 +16,17 @@ Route1Gate2FNPCIDs: ; 412D db 0 db 1 db $FF - -Route1Gate2FTextPointers: ; 4130 + +Route1Gate2FSignPointers: ; 4130 dw Route1Gate2FTextSign1 dw Route1Gate2FTextSign2 +Route1Gate2FTextPointers:: ; 4134 dw Route1Gate2FTextNPC1 dw Route1Gate2FTextNPC2 Route1Gate2FScript:: ; 4138 ld hl, Route1Gate2FNPCIDs - ld de, Route1Gate2FTextPointers + ld de, Route1Gate2FSignPointers call CallMapTextSubroutine ret diff --git a/maps/Route1P1.asm b/maps/Route1P1.asm index d67ffd9..62ed0cd 100644 --- a/maps/Route1P1.asm +++ b/maps/Route1P1.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Route 1 East", ROMX[$7B98], BANK[$36] +SECTION "maps/Route1P1.asm", ROMX Route1P1ScriptLoader:: ; 7B98 ld hl, Route1P1ScriptPointers @@ -17,15 +17,17 @@ Route1P1NPCIDs: ; 7BA6 db 1 db $FF -Route1P1TextPointers: ;7BA9 +Route1P1SignPointers: ; 7BA9 dw Route1P1TextSign1 dw Route1P1TextSign2 + +Route1P1TextPointers:: dw Route1P1TextNPC1 dw Route1P1TextNPC2 Route1P1Script:: ; 7BB1 ld hl, Route1P1NPCIDs - ld de, Route1P1TextPointers + ld de, Route1P1SignPointers call CallMapTextSubroutine ret diff --git a/maps/Route1P2.asm b/maps/Route1P2.asm index 9fa72ec..ae7e399 100644 --- a/maps/Route1P2.asm +++ b/maps/Route1P2.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Route 1 West", ROMX[$7C68], BANK[$36] +SECTION "maps/Route1P2.asm", ROMX Route1P2ScriptLoader:: ; 7C67 ld hl, Route1P2ScriptPointers @@ -17,8 +17,10 @@ Route1P2NPCIDs: ; 7C76 db $01 db $FF -Route1P2TextPointers: +Route1P2SignPointers: dw Route1P2TextSign1 + +Route1P2TextPointers:: dw Route1P2Text1 dw Route1P2Text2 @@ -38,7 +40,7 @@ Route1P2Script:: ; 7C7F jr .endDemo .skipCheck ld hl, Route1P2NPCIDs ;data - ld de, Route1P2TextPointers ;start of textld pointers? + ld de, Route1P2SignPointers ;start of textld pointers? call CallMapTextSubroutine ret diff --git a/maps/Route2.asm b/maps/Route2.asm new file mode 100644 index 0000000..8a0d5a7 --- /dev/null +++ b/maps/Route2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Route2.asm", ROMX + +Route2ScriptLoader:: ; d9cc4 (36:5cc4) + ret + + db "@"
\ No newline at end of file diff --git a/maps/Route2Gate1F.asm b/maps/Route2Gate1F.asm new file mode 100644 index 0000000..8436610 --- /dev/null +++ b/maps/Route2Gate1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/Route2Gate1F.asm", ROMX + +Route2Gate1FScriptLoader:: ; 94061 (25:4061) + ret + +Route2Gate1FTextPointers:: ; 94062 (25:4062) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Route2Gate2F.asm b/maps/Route2Gate2F.asm new file mode 100644 index 0000000..dc8b50d --- /dev/null +++ b/maps/Route2Gate2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/Route2Gate2F.asm", ROMX + +Route2Gate2FScriptLoader:: ; 940c1 (25:40c1) + ret + +Route2Gate2FTextPointers:: ; 940c2 (25:40c2) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Route2House.asm b/maps/Route2House.asm new file mode 100644 index 0000000..f132774 --- /dev/null +++ b/maps/Route2House.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/Route2House.asm", ROMX + +Route2HouseScriptLoader:: ; 9412f (25:412f) + ret + +Route2HouseTextPointers:: ; 94130 (25:4130) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/RouteSilentEast.asm b/maps/RouteSilentEast.asm new file mode 100644 index 0000000..5891e63 --- /dev/null +++ b/maps/RouteSilentEast.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/RouteSilentEast.asm", ROMX + +RouteSilentEastScriptLoader:: ; db38a (36:738a) + ret + + db "@"
\ No newline at end of file diff --git a/maps/RouteSilentEastGate.asm b/maps/RouteSilentEastGate.asm new file mode 100644 index 0000000..ec687a8 --- /dev/null +++ b/maps/RouteSilentEastGate.asm @@ -0,0 +1,9 @@ +INCLUDE "constants.asm" + +SECTION "maps/RouteSilentEastGate.asm", ROMX + +RouteSilentEastGateScriptLoader:: ; d0040 (34:4040) + ret + +RouteSilentEastGateTextPointers:: ; d0041 (34:4041) + db "@"
\ No newline at end of file diff --git a/maps/RuinsOfAlphEntrance.asm b/maps/RuinsOfAlphEntrance.asm new file mode 100644 index 0000000..d295c26 --- /dev/null +++ b/maps/RuinsOfAlphEntrance.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/RuinsOfAlphEntrance.asm", ROMX + +RuinsOfAlphEntranceScriptLoader:: ; bc3c6 (2f:43c6) + ret + +RuinsOfAlphEntranceTextPointers:: ; bc3c7 (2f:43c7) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/RuinsOfAlphMain.asm b/maps/RuinsOfAlphMain.asm new file mode 100644 index 0000000..bb96c6f --- /dev/null +++ b/maps/RuinsOfAlphMain.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/RuinsOfAlphMain.asm", ROMX + +RuinsOfAlphMainScriptLoader:: ; bc68c (2f:468c) + ret + +RuinsOfAlphMainTextPointers:: ; bc68d (2f:468d) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/SilentHills.asm b/maps/SilentHill.asm index ed7639c..922503d 100644 --- a/maps/SilentHills.asm +++ b/maps/SilentHill.asm @@ -1,59 +1,59 @@ include "constants.asm" -SECTION "Silent Hills Script", ROMX[$7669], BANK[$36] +SECTION "maps/SilentHill.asm", ROMX -SilentHillsScriptLoader:: ; 7669 - ld hl, SilentHillsScriptPointers1 +SilentHillScriptLoader:: ; 7669 + ld hl, SilentHillScriptPointers1 call RunMapScript call WriteBackMapScriptNumber ret -SilentHillsNPCIDs1: ; 7673 +SilentHillNPCIDs1: ; 7673 db 0 db 2 db 3 db $FF -SilentHillsNPCIDs2: ; 7677 +SilentHillNPCIDs2: ; 7677 db 2 db 3 db $FF -SilentHillsNPCIDs3: ; 767A +SilentHillNPCIDs3: ; 767A db 1 db 2 db 3 db $FF -SilentHillsScriptPointers1: ; 767E - dw SilentHillsScript1 - dw SilentHillsNPCIDs1 +SilentHillScriptPointers1: ; 767E + dw SilentHillScript1 + dw SilentHillNPCIDs1 -SilentHillsScriptPointers2: ; 7682 - dw SilentHillsScript2 - dw SilentHillsNPCIDs1 +SilentHillScriptPointers2: ; 7682 + dw SilentHillScript2 + dw SilentHillNPCIDs1 -SilentHillsScriptPointers3: ; 7686 - dw SilentHillsScript3 - dw SilentHillsNPCIDs1 +SilentHillScriptPointers3: ; 7686 + dw SilentHillScript3 + dw SilentHillNPCIDs1 -SilentHillsScriptPointers4: ; 768A - dw SilentHillsScript4 - dw SilentHillsNPCIDs2 +SilentHillScriptPointers4: ; 768A + dw SilentHillScript4 + dw SilentHillNPCIDs2 -SilentHillsScriptPointers5: ; 768E - dw SilentHillsScript5 - dw SilentHillsNPCIDs3 +SilentHillScriptPointers5: ; 768E + dw SilentHillScript5 + dw SilentHillNPCIDs3 -SilentHillsScriptPointers6: ; 7692 - dw SilentHillsScript6 - dw SilentHillsNPCIDs2 +SilentHillScriptPointers6: ; 7692 + dw SilentHillScript6 + dw SilentHillNPCIDs2 -SilentHillsScriptPointers7: ; 7696 - dw SilentHillsScript7 - dw SilentHillsNPCIDs2 +SilentHillScriptPointers7: ; 7696 + dw SilentHillScript7 + dw SilentHillNPCIDs2 -SilentHillsScript1: ; 769A +SilentHillScript1: ; 769A ld a, [wYCoord] cp 5 ret nz @@ -65,7 +65,7 @@ SilentHillsScript1: ; 769A ld a, 02 call Function17f9 ld a, 02 - ld hl, SilentHillsMovement1 + ld hl, SilentHillMovement1 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -75,7 +75,7 @@ SilentHillsScript1: ; 769A call WriteIntod637 ret -SilentHillsMovement1: ; 76C8 +SilentHillMovement1: ; 76C8 db $0D db $0D db $0D @@ -84,18 +84,18 @@ SilentHillsMovement1: ; 76C8 db $02 db $32 -SilentHillsScript2: ; 76CF +SilentHillScript2: ; 76CF ld a, 0 ld d, RIGHT call SetObjectFacing - ld hl, SilentHillsTextRival1 + ld hl, SilentHillTextRival1 call OpenTextbox - ld hl, SilentHillsTextRival2 + ld hl, SilentHillTextRival2 call OpenTextbox ld hl, wJoypadFlags set 4, [hl] ld a, 2 - ld hl, SilentHillsMovement2 + ld hl, SilentHillMovement2 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -105,17 +105,17 @@ SilentHillsScript2: ; 76CF ld [wMapScriptNumber], a ret -SilentHillsMovement2: ; 76FF +SilentHillMovement2: ; 76FF db $00, $04, $08, $0C, $0C, $0C, $33 -SilentHillsScript3: ;7706 +SilentHillScript3: ;7706 call Function1848 ld a, 3 ld [wMapScriptNumber], a call InitUnknownBuffercc9e ret -SilentHillsScript4: ; 7712 +SilentHillScript4: ; 7712 ld a, [wXCoord] cp 0 jr nz, .bigjump @@ -126,7 +126,7 @@ SilentHillsScript4: ; 7712 jr nz, .bigjump .jump call Function776a - ld hl, SilentHillsTextNorthExit + ld hl, SilentHillTextNorthExit call OpenTextbox ld hl, wJoypadFlags set 4, [hl] @@ -137,10 +137,10 @@ SilentHillsScript4: ; 7712 ld a, [wYCoord] cp 9 jr z, .jump2 - ld hl, SilentHillsMovement3 + ld hl, SilentHillMovement3 jr .skip .jump2 - ld hl, SilentHillsMovement4 + ld hl, SilentHillMovement4 .skip ld a, 03 call LoadMovementDataPointer @@ -153,8 +153,8 @@ SilentHillsScript4: ; 7712 ret .bigjump - ld hl, SilentHillsNPCIDs2 - ld de, SilentHillsTextPointers + ld hl, SilentHillNPCIDs2 + ld de, SilentHillSignPointers call CallMapTextSubroutine ret @@ -166,17 +166,17 @@ Function776a: ; 776A ld [hl], a ret -SilentHillsMovement3: ; 7776 +SilentHillMovement3: ; 7776 db $0A, $0A, $0A, $09, $0A, $06, $02, $32 -SilentHillsMovement4: ; 777E +SilentHillMovement4: ; 777E db $0A, $0A, $0A, $0A, $06, $02, $32 -SilentHillsScript5: ; 7785 +SilentHillScript5: ; 7785 ld a, 0 ld d, RIGHT call SetObjectFacing - ld hl, SilentHillsTextPokemonInGrassString + ld hl, SilentHillTextPokemonInGrassString call OpenTextbox ld hl, wJoypadFlags set 4, [hl] @@ -190,10 +190,10 @@ SilentHillsScript5: ; 7785 ld a, [wYCoord] cp 9 jr z, .jump - ld hl, SilentHillsMovement5 + ld hl, SilentHillMovement5 jr .skip .jump - ld hl, SilentHillsMovement6 + ld hl, SilentHillMovement6 .skip ld a, 3 call LoadMovementDataPointer @@ -205,15 +205,15 @@ SilentHillsScript5: ; 7785 ld [wMapScriptNumber], a ret -SilentHillsMovement5: ; 77CC +SilentHillMovement5: ; 77CC db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33 -SilentHillsMovement6: ; 77E0 +SilentHillMovement6: ; 77E0 db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33 -SilentHillsScript6: ; 77F3 - ld hl, SilentHillsNPCIDs2 - ld de, SilentHillsTextPointers +SilentHillScript6: ; 77F3 + ld hl, SilentHillNPCIDs2 + ld de, SilentHillSignPointers call CallMapTextSubroutine ld hl, wd41b bit 2, [hl] @@ -224,11 +224,11 @@ SilentHillsScript6: ; 77F3 ld [wMapScriptNumber], a ret -SilentHillsScript7: ; 780D +SilentHillScript7: ; 780D call CheckLabDoor ret z - ld hl, SilentHillsNPCIDs2 - ld de, SilentHillsTextPointers + ld hl, SilentHillNPCIDs2 + ld de, SilentHillSignPointers call CallMapTextSubroutine ret @@ -251,7 +251,7 @@ CheckLabDoor: ; 781B call SetObjectFacing ld hl, wJoypadFlags set 6, [hl] - ld hl, SilentHillsTextString1 + ld hl, SilentHillTextString1 call OpenTextbox call LabClosed call ClearAccumulator @@ -259,7 +259,7 @@ CheckLabDoor: ; 781B LabClosed: ; 784C ld a, 0 - ld hl, SilentHillsMovement7 + ld hl, SilentHillMovement7 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -267,64 +267,64 @@ LabClosed: ; 784C call WriteIntod637 ret -SilentHillsTextString1: ; 785F +SilentHillTextString1: ; 785F text "あれ？ カギが かかっている" done -SilentHillsMovement7: ; 786F +SilentHillMovement7: ; 786F db $04, $32 -SilentHillsTextPointers: ; 7871 - dw SilentHillsPlayerHouseText +SilentHillSignPointers:: ; 7871 + dw SilentHillPlayerHouseText dw Function38c6 - dw SilentHillsSignText1 - dw SilentHillsLabText - dw SilentHillsRivalHouseText + dw SilentHillSignText1 + dw SilentHillLabText + dw SilentHillRivalHouseText -SilentHillsLabText: ; 787B - ld hl, SilentHillsTextString2 +SilentHillLabText: ; 787B + ld hl, SilentHillTextString2 call OpenTextbox ret -SilentHillsTextString2: ; 7882 +SilentHillTextString2: ; 7882 text "にゅうきょしゃ ぼしゅうちゅう！" done -SilentHillsSignText1: ; 7894 - ld hl, SilentHillsTextString3 +SilentHillSignText1: ; 7894 + ld hl, SilentHillTextString3 call OpenTextbox ret -SilentHillsTextString3: ; 789B +SilentHillTextString3: ; 789B text "ここは サイレント ヒル" line "しずかな おか" done -SilentHillsPlayerHouseText: ; 78B1 - ld hl, SilentHillsTextString4 +SilentHillPlayerHouseText: ; 78B1 + ld hl, SilentHillTextString4 call OpenTextbox ret -SilentHillsTextString4: ; 78B8 +SilentHillTextString4: ; 78B8 text "ここは <PLAYER> のいえ" done -SilentHillsRivalHouseText: ; 78C3 - ld hl, SilentHillsTextString5 +SilentHillRivalHouseText: ; 78C3 + ld hl, SilentHillTextString5 call OpenTextbox ret -SilentHillsTextString5: ; 78CA +SilentHillTextString5: ; 78CA text "ここは <RIVAL> のいえ" done -; 78D5 - dw SilentHillsTextRival1 ; west - dw SilentHillsTextNorthExit ; north - dw SilentHillsTextBackpack ; npc1 - dw SilentHillsTextPokemonHate ; npc2 +SilentHillTextPointers:: ; 78d5 + dw SilentHillTextRival1 ; west + dw SilentHillTextNorthExit ; north + dw SilentHillTextBackpack ; npc1 + dw SilentHillTextPokemonHate ; npc2 -SilentHillsTextRival1: ; 78DD +SilentHillTextRival1: ; 78DD text "<RIVAL>『よう ちょっと おまえに" cont "じまん したいことが" cont "あってきたんだよ" @@ -364,7 +364,7 @@ MomNameMenuHeaderUnused: ; 7989 db "ママ@" db "かあちゃん@" -SilentHillsTextRival2: ; 79AC - BYTE OFF +SilentHillTextRival2: ; 79AC - BYTE OFF text "<RIVAL>『えー かっこわりい！" line "そんな こどもっぽい" cont "よびかた してるなんて" @@ -377,12 +377,12 @@ SilentHillsTextRival2: ; 79AC - BYTE OFF cont "いくことに するぜ！" done -SilentHillsTextNorthExit: ; 7A14 +SilentHillTextNorthExit: ; 7A14 text "ちょいまち！" line "まってよ！ まてっ てば！" done -SilentHillsTextPokemonInGrassString: ; 7A2A +SilentHillTextPokemonInGrassString: ; 7A2A text "きみは まったく" line "なんにも しらないんだね！" cont "くさむらでは" @@ -397,22 +397,22 @@ SilentHillsTextPokemonInGrassString: ; 7A2A cont "ぼくに ついて きて！" done -SilentHillsTextBackpack: ; 7A99 - ld hl, SilentHillsTextBackpackString +SilentHillTextBackpack: ; 7A99 + ld hl, SilentHillTextBackpackString call OpenTextbox ret -SilentHillsTextBackpackString: ; 7AA0 +SilentHillTextBackpackString: ; 7AA0 text "あなたの りュック かっこいいわよ" line "どこで てに いれたの？" done -SilentHillsTextPokemonHate: ; 7AC0 - ld hl, SilentHillsTextPokemonHateString +SilentHillTextPokemonHate: ; 7AC0 + ld hl, SilentHillTextPokemonHateString call OpenTextbox ret -SilentHillsTextPokemonHateString: ; 7AC7 +SilentHillTextPokemonHateString: ; 7AC7 text "よのなかに ポケモンが きらいな" line "ひとは いるのかな？" done diff --git a/maps/SilentHouse.asm b/maps/SilentHillHouse.asm index 70a6649..8a48ef3 100644 --- a/maps/SilentHouse.asm +++ b/maps/SilentHillHouse.asm @@ -1,61 +1,61 @@ include "constants.asm" -SECTION "Silent Hills House", ROMX[$4839], BANK[$34] +SECTION "maps/SilentHillHouse.asm", ROMX -SilentHouseScriptLoader:: ; 4839 - ld hl, SilentHouseScriptPointers +SilentHillHouseScriptLoader:: ; 4839 + ld hl, SilentHillHouseScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -SilentHouseScriptPointers: ; 4843 - dw SilentHouseScript1 - dw SilentHouseNPCIDs1 - dw SilentHouseScript2 - dw SilentHouseNPCIDs2 - dw SilentHouseScript3 - dw SilentHouseNPCIDs1 - -SilentHouseScript1: ; 484F - ld hl, SilentHouseNPCIDs1 - ld de, SilentHouseTextPointers1 +SilentHillHouseScriptPointers: ; 4843 + dw SilentHillHouseScript1 + dw SilentHillHouseNPCIDs1 + dw SilentHillHouseScript2 + dw SilentHillHouseNPCIDs2 + dw SilentHillHouseScript3 + dw SilentHillHouseNPCIDs1 + +SilentHillHouseScript1: ; 484F + ld hl, SilentHillHouseNPCIDs1 + ld de, SilentHillHouseTextPointers2 call CallMapTextSubroutine ret -SilentHouseScript2: ; 4859 - ld hl, SilentHouseNPCIDs2 - ld de, SilentHouseTextPointers1 +SilentHillHouseScript2: ; 4859 + ld hl, SilentHillHouseNPCIDs2 + ld de, SilentHillHouseTextPointers2 call CallMapTextSubroutine ret -SilentHouseScript3: ; 4863 - ld hl, SilentHouseNPCIDs1 - ld de, SilentHouseTextPointers1 +SilentHillHouseScript3: ; 4863 + ld hl, SilentHillHouseNPCIDs1 + ld de, SilentHillHouseTextPointers2 call CallMapTextSubroutine ret -SilentHouseNPCIDs1: +SilentHillHouseNPCIDs1: db 0 db $FF -SilentHouseNPCIDs2: +SilentHillHouseNPCIDs2: db 0 db 1 db $FF -SilentHouseTextPointers1:: ; 4872 - dw SilentHouseNPCText1 +SilentHillHouseTextPointers2:: ; 4872 + dw SilentHillHouseNPCText1 dw Function38bd dw Function3899 dw Function38b4 dw Function38ab dw Function38cf -SilentHouseNPCText1: ; 487E +SilentHillHouseNPCText1: ; 487E ld hl, wd41a bit 6, [hl] jr nz, .jump - ld hl, SilentHouseTextString1 + ld hl, SilentHillHouseTextString1 call OpenTextbox ret @@ -66,28 +66,28 @@ SilentHouseNPCText1: ; 487E call Function1fea ret -SilentHouseTextString1: ; 489B +SilentHillHouseTextString1: ; 489B text "おや？ <RIVAL>あてに メールが" line "とどいている ようだ" cont "よんでみる？@" db $08 -SilentHouseNPCText2: ; 48BD (unused due to typo in the text pointers?) +SilentHillHouseNPCText2: ; 48BD (unused due to typo in the text pointers?) call YesNoBox jr c, .jump ld hl, wd41a set 6, [hl] - ld hl, SilentHouseTextString2 + ld hl, SilentHillHouseTextString2 call PrintText call Function3036 ret .jump - ld hl, SilentHouseTextString3 + ld hl, SilentHillHouseTextString3 call PrintText call Function3036 ret -SilentHouseTextString2: ; 48DB +SilentHillHouseTextString2: ; 48DB text "とつぜん メールを さしあげる" line "しつれいを おゆるしあれ" @@ -97,43 +97,43 @@ SilentHouseTextString2: ; 48DB cont "ポケモンけんきゅうしゃ オーキド" done -SilentHouseTextString3: ; 4937 +SilentHillHouseTextString3: ; 4937 text "ひとのメールは" line "みちゃ いけないよな<⋯⋯>" done -SilentHouseTextPointers2:: ; 494C - dw SilentHouseNPCText3 - dw SilentHouseNPCText4 +SilentHillHouseTextPointers:: ; 494C + dw SilentHillHouseNPCText3 + dw SilentHillHouseNPCText4 -SilentHouseNPCText3: ; 4950 - ld hl, SilentHouseTextString4 +SilentHillHouseNPCText3: ; 4950 + ld hl, SilentHillHouseTextString4 call OpenTextbox ret -SilentHouseTextString4: ; 4957 +SilentHillHouseTextString4: ; 4957 text "このまえ かわったいろの" line "ポッポを みかけたわ" done -SilentHouseNPCText4: ; 4970 +SilentHillHouseNPCText4: ; 4970 ld hl, wd41e bit 2, [hl] jr nz, .jump ld hl, wd41e set 2, [hl] - ld hl, SilentHouseTextString5 + ld hl, SilentHillHouseTextString5 call OpenTextbox call WaitBGMap - ld hl, SilentHouseTextString6 + ld hl, SilentHillHouseTextString6 jr .skip .jump - ld hl, SilentHouseTextString7 + ld hl, SilentHillHouseTextString7 .skip call OpenTextbox ret -SilentHouseTextString5: ; 4991 +SilentHillHouseTextString5: ; 4991 text "ケン『ななな" line "なんだ <PLAYER> じゃないか！" @@ -151,7 +151,7 @@ SilentHouseTextString5: ; 4991 cont "よし これで マップが みれるぞ！" done -SilentHouseTextString6: ; 4A29 +SilentHillHouseTextString6: ; 4A29 text "もし オールドにいくなら" line "マサキって やつに あうといい" @@ -161,7 +161,7 @@ SilentHouseTextString6: ; 4A29 cont "てだすけを してくれるぜ" done -SilentHouseTextString7: ; 4A76 +SilentHillHouseTextString7: ; 4A76 text "ケン『<PLAYER>" line "オーキドはかせに みこまれて" cont "ポケモンずかんを つくるんだって？" diff --git a/maps/SilentLabP2.asm b/maps/SilentHillLabBack.asm index 54aab8f..7947dd4 100644 --- a/maps/SilentLabP2.asm +++ b/maps/SilentHillLabBack.asm @@ -1,52 +1,52 @@ include "constants.asm" -SECTION "Silent Lab P2 Script", ROMX[$5C69], BANK[$34] +SECTION "maps/SilentHillLabBack.asm", ROMX -SilentLabP2ScriptLoader:: ; 5C69 - ld hl, SilentLabP2ScriptPointers +SilentHillLabBackScriptLoader:: ; 5C69 + ld hl, SilentHillLabBackScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -SilentLabP2ScriptPointers: ; 5C73 - dw SilentLabP2Script1 - dw SilentLabP2NPCIDs1 - dw SilentLabP2Script2 - dw SilentLabP2NPCIDs1 - dw SilentLabP2Script3 - dw SilentLabP2NPCIDs1 - dw SilentLabP2RivalChoosePokemon - dw SilentLabP2NPCIDs1 - dw SilentLabP2Script5 - dw SilentLabP2NPCIDs1 - dw SilentLabP2Script6 - dw SilentLabP2NPCIDs1 - dw SilentLabP2Script7 - dw SilentLabP2NPCIDs1 - -SilentLabP2NPCIDs1: ; 5C8F +SilentHillLabBackScriptPointers: ; 5C73 + 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: ; 5C8F db 00, 01, 02, 03, 04, $FF -SilentLabP2NPCIDs2: ; 5C95 +SilentHillLabBackNPCIDs2: ; 5C95 db 00, 01, 04, $FF -SilentLabP2NPCIDs3: ; 5C99 +SilentHillLabBackNPCIDs3: ; 5C99 db 00, 01, 02, $FF -SilentLabP2NPCIDs4: ; 5C9D +SilentHillLabBackNPCIDs4: ; 5C9D db 00, 01, 03, $FF -SilentLabP2TextPointers1: ; 5CA1 - dw SilentLabP2Text1 - dw SilentLabP2Func3 - dw SilentLabP2Func4 - dw SilentLabP2Func4 - dw SilentLabP2Func4 +SilentHillLabBackTextPointers:: ; 5CA1 + dw SilentHillLabBackText1 + dw SilentHillLabBackFunc3 + dw SilentHillLabBackFunc4 + dw SilentHillLabBackFunc4 + dw SilentHillLabBackFunc4 -SilentLabP2Script1: ; 5CAB +SilentHillLabBackScript1: ; 5CAB ld hl, wJoypadFlags set 4, [hl] ld a, 0 call Function17f9 ld a, 0 - ld hl, SilentLabP2Movement1 + ld hl, SilentHillLabBackMovement1 call LoadMovementDataPointer ld hl, wd41b set 1, [hl] @@ -58,38 +58,38 @@ SilentLabP2Script1: ; 5CAB call WriteIntod637 ret -SilentLabP2Movement1: ; 5CD2 +SilentHillLabBackMovement1: ; 5CD2 db 09, 09, 05, $32 -SilentLabP2Script2: ; 5CD6 +SilentHillLabBackScript2: ; 5CD6 ld hl, wc5ed set 6, [hl] call Function20f8 ld a, 3 ld d, UP call SetObjectFacing - ld hl, SilentLabP2TextString1 + ld hl, SilentHillLabBackTextString1 call OpenTextbox - ld hl, SilentLabP2TextString10 + ld hl, SilentHillLabBackTextString10 call OpenTextbox - ld hl, SilentLabP2TextString2 + ld hl, SilentHillLabBackTextString2 call OpenTextbox ld a, 2 ld [wMapScriptNumber], a ret -SilentLabP2Script3: ; 5CFD - ld hl, SilentLabP2NPCIDs1 - ld de, SilentLabP2TextPointers2 +SilentHillLabBackScript3: ; 5CFD + ld hl, SilentHillLabBackNPCIDs1 + ld de, SilentHillLabBackTextPointers2 call CallMapTextSubroutine ret -SilentLabP2RivalChoosePokemon: ; 5D07 +SilentHillLabBackRivalChoosePokemon: ; 5D07 ld hl, wJoypadFlags set 4, [hl] ld a, 3 call Function17f9 - ld hl, SilentLabP2MovementPointers + ld hl, SilentHillLabBackMovementPointers ld a, [wChosenStarter] ld d, 0 ld e, a @@ -108,27 +108,27 @@ SilentLabP2RivalChoosePokemon: ; 5D07 call WriteIntod637 ret -SilentLabP2MovementPointers: ; 5D34 - dw SilentLabP2Movement2+1 - dw SilentLabP2Movement2 - dw SilentLabP2Movement2+2 +SilentHillLabBackMovementPointers: ; 5D34 + dw SilentHillLabBackMovement2+1 + dw SilentHillLabBackMovement2 + dw SilentHillLabBackMovement2+2 -SilentLabP2Movement2: ; 5D3A +SilentHillLabBackMovement2: ; 5D3A db $0B, $0B, $0B, $0B, $05, $32 -SilentLabP2Script5: ; 5D40 - ld hl, SilentLabP2TextString12 +SilentHillLabBackScript5: ; 5D40 + ld hl, SilentHillLabBackTextString12 call OpenTextbox ld a, [wd266] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, SilentLabP2TextString13 + ld hl, SilentHillLabBackTextString13 call OpenTextbox ld a, 5 ld [wMapScriptNumber], a ret -SilentLabP2Script6: ; 5D5B +SilentHillLabBackScript6: ; 5D5B call Function20f8 ld hl, wc5ed res 6, [hl] @@ -136,23 +136,23 @@ SilentLabP2Script6: ; 5D5B ld[wMapScriptNumber], a ret -SilentLabP2Script7: ; 5D69 - ld hl, SilentLabP2NPCIDs1 - ld de, SilentLabP2TextPointers2 +SilentHillLabBackScript7: ; 5D69 + ld hl, SilentHillLabBackNPCIDs1 + ld de, SilentHillLabBackTextPointers2 call CallMapTextSubroutine ret -SilentLabP2Text1: ; 5D73 +SilentHillLabBackText1: ; 5D73 ld hl, wd41b bit 2, [hl] - ld hl, SilentLabP2TextString3 + ld hl, SilentHillLabBackTextString3 jr z, .skip - ld hl, SilentLabP2TextString9 + ld hl, SilentHillLabBackTextString9 .skip call OpenTextbox ret -SilentLabP2TextString1: ; 5D84 +SilentHillLabBackTextString1: ; 5D84 text "オーキド『ほれ そこに ３びき" cont "ポケモンが いる じゃろう！" cont "ほっほ！" @@ -162,18 +162,18 @@ SilentLabP2TextString1: ; 5D84 cont "⋯⋯ さあ えらべ！" done -SilentLabP2TextString2: ; 5DCD +SilentHillLabBackTextString2: ; 5DCD text "オーキド『まあ" line "あわてるな <RIVAL>！" cont "おまえも すきなものを とれ！" done -SilentLabP2TextString3: ; 5DEF +SilentHillLabBackTextString3: ; 5DEF text "オーキド『さあ <PLAYER>" line "どの ポケモンに するかね？" done -SilentLabP2TextString4: ; 5E1C +SilentHillLabBackTextString4: ; 5E1C text "オーキド『ほう！ ほのおのポケモン" line "@" ld bc, wStringBuffer1 @@ -183,7 +183,7 @@ SilentLabP2TextString4: ; 5E1C call Function3036 ret -SilentLabP2TextString5: ; 5E32 +SilentHillLabBackTextString5: ; 5E32 text "オーキド『ふむ みずのポケモン" line "@" ld bc, wStringBuffer1 @@ -193,7 +193,7 @@ SilentLabP2TextString5: ; 5E32 call Function3036 ret -SilentLabP2TextString6: ; 5E6E +SilentHillLabBackTextString6: ; 5E6E text "オーキド『おお！ くさのポケモン" line "@" ld bc, wStringBuffer1 @@ -214,7 +214,7 @@ ConfirmPokemonSelection: ; 5E85 ld [wd29a], a ld a, 1 ld [wd2a0], a - ld hl, SilentLabP2TextString8 + ld hl, SilentHillLabBackTextString8 call PrintText ld hl, wJoypadFlags set 5, [hl] @@ -229,16 +229,16 @@ ConfirmPokemonSelection: ; 5E85 ld [wMapScriptNumber], a ret .bigJump ; 5EC6 - ld hl, SilentLabP2TextString7 + ld hl, SilentHillLabBackTextString7 call PrintText ret -SilentLabP2TextString7: ; 5ECD +SilentHillLabBackTextString7: ; 5ECD text "では" line "どれに するのじゃ？" done -SilentLabP2TextString8: ; 5EDC +SilentHillLabBackTextString8: ; 5EDC text "オーキド『この ポケモンは" line "ほんとに げんきが いいぞ！" @@ -247,53 +247,53 @@ SilentLabP2TextString8: ; 5EDC ld bc, wStringBuffer1 text "を もらった！<PROMPT>" -SilentLabP2TextString9: ; 5F14 +SilentHillLabBackTextString9: ; 5F14 text "オーキド『そうじゃ！" line "やせいの ポケモンが でて きても" cont "そいつを たたかわせて いけば" cont "となりまちへ いける！" done -SilentLabP2Func3: ; 5F4E +SilentHillLabBackFunc3: ; 5F4E ld hl, wd41b bit 2, [hl] - ld hl, SilentLabP2TextString11 + ld hl, SilentHillLabBackTextString11 jr z, .skip - ld hl, SilentLabP2TextString14 + ld hl, SilentHillLabBackTextString14 .skip call OpenTextbox ret -SilentLabP2TextString10: ; 5F5F +SilentHillLabBackTextString10: ; 5F5F text "<RIVAL>『あッ！ おれにも！" line "じいさん おれにもくれよう！" done -SilentLabP2TextString11: ; 5F7B +SilentHillLabBackTextString11: ; 5F7B text "<RIVAL>『いいぜ <PLAYER>！" line "さきに えらんで！" cont "おれは こころが ひろいからな" done -SilentLabP2TextString12: ; 5F9F +SilentHillLabBackTextString12: ; 5F9F text "<RIVAL>『じゃ おれは これ！" done -SilentLabP2TextString13: ; 5FAD +SilentHillLabBackTextString13: ; 5FAD text "<RIVAL>は オーキドから" line "@" ld bc, wStringBuffer1 text "を もらった！" done -SilentLabP2TextString14: ; 5FC5 +SilentHillLabBackTextString14: ; 5FC5 text "<RIVAL>『<PLAYER>の#" line "いいなあ！" cont "でも おれのポケモンも" cont "ちょっと いいだろ？" done -SilentLabP2Func4: ; 5FE9 +SilentHillLabBackFunc4: ; 5FE9 ld hl, wd41b bit 2, [hl] jr nz, .bigjump @@ -302,7 +302,7 @@ SilentLabP2Func4: ; 5FE9 ld [wChosenStarter], a ld d, 0 ld e, a - ld hl, SilentLabP2StarterData + ld hl, SilentHillLabBackStarterData add hl, de add hl, de add hl, de @@ -328,11 +328,11 @@ SilentLabP2Func4: ; 5FE9 ld [wd266], a ret .bigjump - ld hl, SilentLabP2TextString15 + ld hl, SilentHillLabBackTextString15 call OpenTextbox ret -SilentLabP2StarterData: ; 6031 +SilentHillLabBackStarterData: ; 6031 db DEX_HONOGUMA dw $5E09 db DEX_KURUSU @@ -345,12 +345,12 @@ SilentLabP2StarterData: ; 6031 dw $5E5C db DEX_HONOGUMA -SilentLabP2TextString15: ; 603D +SilentHillLabBackTextString15: ; 603D text "オーキド『これ！" line "よくばっちゃ いかん！" done -SilentLabP2TextPointers2: ; 6053 +SilentHillLabBackTextPointers2: ; 6053 dw Function3899 dw Function3899 dw Function3899 diff --git a/maps/SilentLabP1.asm b/maps/SilentHillLabFront.asm index eb4cd57..0ab5266 100644 --- a/maps/SilentLabP1.asm +++ b/maps/SilentHillLabFront.asm @@ -1,95 +1,95 @@ include "constants.asm" -SECTION "Silent Lab P1", ROMX[$4BBC], BANK[$34] +SECTION "maps/SilentHillLabFront.asm", ROMX -SilentLabP1ScriptLoader:: ; 4BBC - ld hl, SilentLabP1ScriptPointers +SilentHillLabFrontScriptLoader:: ; 4BBC + ld hl, SilentHillLabFrontScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -SilentLabP1ScriptPointers: ; 4BC6 - dw SilentLabP1Script1 - dw SilentLabP1NPCIDs1 +SilentHillLabFrontScriptPointers: ; 4BC6 + dw SilentHillLabFrontScript1 + dw SilentHillLabFrontNPCIDs1 - dw SilentLabP1Script2 - dw SilentLabP1NPCIDs2 + dw SilentHillLabFrontScript2 + dw SilentHillLabFrontNPCIDs2 - dw SilentLabP1Script3 - dw SilentLabP1NPCIDs2 + dw SilentHillLabFrontScript3 + dw SilentHillLabFrontNPCIDs2 - dw SilentLabP1Script4 - dw SilentLabP1NPCIDs2 + dw SilentHillLabFrontScript4 + dw SilentHillLabFrontNPCIDs2 - dw SilentLabP1Conversation1 - dw SilentLabP1NPCIDs2 + dw SilentHillLabFrontConversation1 + dw SilentHillLabFrontNPCIDs2 - dw SilentLabP1Script6 - dw SilentLabP1NPCIDs3 + dw SilentHillLabFrontScript6 + dw SilentHillLabFrontNPCIDs3 - dw SilentLabP1Script7 - dw SilentLabP1NPCIDs4 + dw SilentHillLabFrontScript7 + dw SilentHillLabFrontNPCIDs4 - dw SilentLabP1Script8 - dw SilentLabP1NPCIDs5 + dw SilentHillLabFrontScript8 + dw SilentHillLabFrontNPCIDs5 - dw SilentLabP1Script9 - dw SilentLabP1NPCIDs5 + dw SilentHillLabFrontScript9 + dw SilentHillLabFrontNPCIDs5 - dw SilentLabP1Script10 - dw SilentLabP1NPCIDs5 + dw SilentHillLabFrontScript10 + dw SilentHillLabFrontNPCIDs5 - dw SilentLabP1Script11 - dw SilentLabP1NPCIDs5 + dw SilentHillLabFrontScript11 + dw SilentHillLabFrontNPCIDs5 - dw SilentLabP1Script12 - dw SilentLabP1NPCIDs6 + dw SilentHillLabFrontScript12 + dw SilentHillLabFrontNPCIDs6 - dw SilentLabP1Script13 - dw SilentLabP1NPCIDs6 + dw SilentHillLabFrontScript13 + dw SilentHillLabFrontNPCIDs6 - dw SilentLabP1Script14 - dw SilentLabP1NPCIDs6 + dw SilentHillLabFrontScript14 + dw SilentHillLabFrontNPCIDs6 - dw SilentLabP1Script15 - dw SilentLabP1NPCIDs7 + dw SilentHillLabFrontScript15 + dw SilentHillLabFrontNPCIDs7 - dw SilentLabP1Script16 - dw SilentLabP1NPCIDs7 + dw SilentHillLabFrontScript16 + dw SilentHillLabFrontNPCIDs7 - dw SilentLabP1Script17 - dw SilentLabP1NPCIDs7 + dw SilentHillLabFrontScript17 + dw SilentHillLabFrontNPCIDs7 - dw SilentLabP1Script18 - dw SilentLabP1NPCIDs7 + dw SilentHillLabFrontScript18 + dw SilentHillLabFrontNPCIDs7 - dw SilentLabP1Script19 - dw SilentLabP1NPCIDs9 + dw SilentHillLabFrontScript19 + dw SilentHillLabFrontNPCIDs9 -SilentLabP1NPCIDs1: ; 4C12 +SilentHillLabFrontNPCIDs1: ; 4C12 db $02 db $09 db $0A db $FF -SilentLabP1NPCIDs2: ; 4C16 +SilentHillLabFrontNPCIDs2: ; 4C16 db $00 db $02 db $04 db $09 db $0A db $FF -SilentLabP1NPCIDs3: ; 4C1C +SilentHillLabFrontNPCIDs3: ; 4C1C db $02 db $04 db $09 db $0A db $FF -SilentLabP1NPCIDs4: ; 4C21 +SilentHillLabFrontNPCIDs4: ; 4C21 db $04 db $09 db $0A db $FF -SilentLabP1NPCIDs5: ; 4C25 +SilentHillLabFrontNPCIDs5: ; 4C25 db $01 db $03 db $05 @@ -99,7 +99,7 @@ SilentLabP1NPCIDs5: ; 4C25 db $09 db $0A db $FF -SilentLabP1NPCIDs6: ; 4C2E +SilentHillLabFrontNPCIDs6: ; 4C2E db $01 db $03 db $05 @@ -107,14 +107,14 @@ SilentLabP1NPCIDs6: ; 4C2E db $07 db $08 db $FF -SilentLabP1NPCIDs7: ; 4C35 +SilentHillLabFrontNPCIDs7: ; 4C35 db $00 db $05 db $06 db $07 db $08 db $FF -SilentLabP1NPCIDs8: ; 4C3B (unused?) +SilentHillLabFrontNPCIDs8: ; 4C3B (unused?) db $00 db $03 db $05 @@ -124,34 +124,34 @@ SilentLabP1NPCIDs8: ; 4C3B (unused?) db $09 db $0A db $FF -SilentLabP1NPCIDs9: ; 4C44 +SilentHillLabFrontNPCIDs9: ; 4C44 db $00 db $07 db $08 db $FF -SilentLabP1TextPointers1:: ; 4C48 - dw SilentLabP1Text4 - dw SilentLabP1Text7 - dw SilentLabP1Text10 - dw SilentLabP1Text11 - dw SilentLabP1TextString20 - dw SilentLabP1Text12 - dw SilentLabP1Text13 - dw SilentLabP1Text14 - dw SilentLabP1Text15 - dw SilentLabP1Text16 - dw SilentLabP1Text16 - -SilentLabP1Script1: ; 4C5E - call SilentLabP1MoveDown +SilentHillLabFrontTextPointers:: ; 4C48 + dw SilentHillLabFrontText4 + dw SilentHillLabFrontText7 + dw SilentHillLabFrontText10 + dw SilentHillLabFrontText11 + dw SilentHillLabFrontTextString20 + dw SilentHillLabFrontText12 + dw SilentHillLabFrontText13 + dw SilentHillLabFrontText14 + dw SilentHillLabFrontText15 + dw SilentHillLabFrontText16 + dw SilentHillLabFrontText16 + +SilentHillLabFrontScript1: ; 4C5E + call SilentHillLabFrontMoveDown ret z - ld hl, SilentLabP1NPCIDs1 - ld de, SilentLabP1TextPointers2 + ld hl, SilentHillLabFrontNPCIDs1 + ld de, SilentHillLabFrontTextPointers2 call CallMapTextSubroutine ret -SilentLabP1MoveDown: ; 4C6C +SilentHillLabFrontMoveDown: ; 4C6C ld a, [wXCoord] cp 4 ret nz @@ -161,13 +161,13 @@ SilentLabP1MoveDown: ; 4C6C ldh a, [hJoyState] bit 6, a jp z, SetFFInAccumulator - call SilentLabP1Text3 + call SilentHillLabFrontText3 ld hl, wJoypadFlags set 4, [hl] ld a, 0 call Function17f9 ld a, 0 - ld hl, SilentLabP1Movement1 + ld hl, SilentHillLabFrontMovement1 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -176,15 +176,15 @@ SilentLabP1MoveDown: ; 4C6C call ClearAccumulator ret -SilentLabP1Movement1: ; 4CA2 +SilentHillLabFrontMovement1: ; 4CA2 db $06, $32 -SilentLabP1Script2: ; 4CA4 +SilentHillLabFrontScript2: ; 4CA4 ld a, 2 ld [wMapScriptNumber], a ret -SilentLabP1Script3: ; 4CAA +SilentHillLabFrontScript3: ; 4CAA ld a, 6 call Function17f9 ld a, 0 @@ -192,7 +192,7 @@ SilentLabP1Script3: ; 4CAA ld b, 6 ld c, 0 call StartFollow - ld hl, SilentLabP1Movement2 + ld hl, SilentHillLabFrontMovement2 ld a, 6 call LoadMovementDataPointer ld hl, wc5ed @@ -203,47 +203,47 @@ SilentLabP1Script3: ; 4CAA call WriteIntod637 ret -SilentLabP1Movement2: ; 4CD3 +SilentHillLabFrontMovement2: ; 4CD3 db 09, 09, 09, 09, 09, 09, 09, 09, 09, 05, 07, 01, $32 -SilentLabP1Script4: ; 4CE0 +SilentHillLabFrontScript4: ; 4CE0 call Function1828 ld a, 4 ld [wMapScriptNumber], a ret -SilentLabP1Conversation1: ; 4CE9 +SilentHillLabFrontConversation1: ; 4CE9 ld a, 4 ld d, RIGHT call SetObjectFacing - ld hl, SilentLabP1TextString20 + ld hl, SilentHillLabFrontTextString20 call OpenTextbox - ld hl, SilentLabP1TextString4 + ld hl, SilentHillLabFrontTextString4 call OpenTextbox ld a, 4 ld d, UP call SetObjectFacing - ld hl, SilentLabP1TextString28 + ld hl, SilentHillLabFrontTextString28 call OpenTextbox - ld hl, SilentLabP1TextString5 + ld hl, SilentHillLabFrontTextString5 call OpenTextbox ld a, 4 ld d, RIGHT call SetObjectFacing - ld hl, SilentLabP1TextString29 + ld hl, SilentHillLabFrontTextString29 call OpenTextbox - ld hl, SilentLabP1TextString7 + ld hl, SilentHillLabFrontTextString7 call OpenTextbox - call SilentLabP1Script5 + call SilentHillLabFrontScript5 ret -SilentLabP1Script5: ; 4D26 +SilentHillLabFrontScript5: ; 4D26 ld hl, wJoypadFlags set 4, [hl] ld a, 2 call Function17f9 ld a, 2 - ld hl, SilentLabP1Movement3 + ld hl, SilentHillLabFrontMovement3 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -253,16 +253,16 @@ SilentLabP1Script5: ; 4D26 call WriteIntod637 ret -SilentLabP1Movement3: ; 4D48 +SilentHillLabFrontMovement3: ; 4D48 db 9, 5, $33 -SilentLabP1Script6: ; 4D4B +SilentHillLabFrontScript6: ; 4D4B ld hl, wJoypadFlags set 4, [hl] ld a, 4 call Function17f9 ld a, 4 - ld hl, SilentLabP1Movement4 + ld hl, SilentHillLabFrontMovement4 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -272,16 +272,16 @@ SilentLabP1Script6: ; 4D4B call WriteIntod637 ret -SilentLabP1Movement4: ; 4D6D +SilentHillLabFrontMovement4: ; 4D6D db $0D, $0D, $0F, $0D, $0D, $33 -SilentLabP1Script7: ; 4D73 +SilentHillLabFrontScript7: ; 4D73 ld hl, wJoypadFlags set 4, [hl] ld a, 0 call Function17f9 ld a, 0 - ld hl, SilentLabP1Movement5 + ld hl, SilentHillLabFrontMovement5 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -291,10 +291,10 @@ SilentLabP1Script7: ; 4D73 call WriteIntod637 ret -SilentLabP1Movement5: ; 4D95 +SilentHillLabFrontMovement5: ; 4D95 db 09, 09, 09, 05, $32 -SilentLabP1Script8: ; 4D9A +SilentHillLabFrontScript8: ; 4D9A ld a, 3 call Function1989 ld a, 5 @@ -304,7 +304,7 @@ SilentLabP1Script8: ; 4D9A ld a, 0 call Function17f9 ld a, 0 - ld hl, SilentLabP1Movement6 + ld hl, SilentHillLabFrontMovement6 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -314,10 +314,10 @@ SilentLabP1Script8: ; 4D9A call WriteIntod637 ret -SilentLabP1Movement6: ; 4DC6 +SilentHillLabFrontMovement6: ; 4DC6 db 8, 8, 8, $0A, 6, $32 -SilentLabP1Script9: ; 4DCC +SilentHillLabFrontScript9: ; 4DCC ld hl, wJoypadFlags set 4, [hl] ld a, 5 @@ -325,7 +325,7 @@ SilentLabP1Script9: ; 4DCC ld a, 5 call Function197e ld a, 5 - ld hl, SilentLabP1Movement7 + ld hl, SilentHillLabFrontMovement7 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -335,14 +335,14 @@ SilentLabP1Script9: ; 4DCC call WriteIntod637 ret -SilentLabP1Movement7: ; 4DF3 +SilentHillLabFrontMovement7: ; 4DF3 db $08, $08, $08, $08, $0A, $06, $32 -SilentLabP1Script10: ; 4DFA +SilentHillLabFrontScript10: ; 4DFA ld a, 5 ld d, RIGHT call SetObjectFacing - ld hl, SilentLabP1TextString21 + ld hl, SilentHillLabFrontTextString21 call OpenTextbox ld hl, wJoypadFlags set 4, [hl] @@ -357,7 +357,7 @@ SilentLabP1Script10: ; 4DFA ld a, 3 call Function197e ld a, 3 - ld hl, SilentLabP1Movement8 + ld hl, SilentHillLabFrontMovement8 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -367,21 +367,21 @@ SilentLabP1Script10: ; 4DFA call WriteIntod637 ret -SilentLabP1Movement8: ; 4E3C +SilentHillLabFrontMovement8: ; 4E3C db $08, $04, $32 -SilentLabP1Script11: ; 4E3F - ld hl, SilentLabP1TextString8 +SilentHillLabFrontScript11: ; 4E3F + ld hl, SilentHillLabFrontTextString8 call OpenTextbox - ld hl, SilentLabP1TextString9 + ld hl, SilentHillLabFrontTextString9 call OpenTextbox ld a, $0B call Function1617 ld a, $0C call Function1617 - ld hl, SilentLabP1TextString10 + ld hl, SilentHillLabFrontTextString10 call OpenTextbox - ld hl, SilentLabP1TextString15 + ld hl, SilentHillLabFrontTextString15 call OpenTextbox ld hl, wd41c set 4, [hl] @@ -391,27 +391,27 @@ SilentLabP1Script11: ; 4E3F call InitUnknownBuffercc9e ret -SilentLabP1Script12: ; 4E72 - call SilentLabP1MoveDown +SilentHillLabFrontScript12: ; 4E72 + call SilentHillLabFrontMoveDown ret z - call SilentLabP1RivalMovePokemon + call SilentHillLabFrontRivalMovePokemon ret z - ld hl, SilentLabP1NPCIDs6 - ld de, SilentLabP1TextPointers2 + ld hl, SilentHillLabFrontNPCIDs6 + ld de, SilentHillLabFrontTextPointers2 call CallMapTextSubroutine ret -SilentLabP1RivalMovePokemon: ; 4E84 +SilentHillLabFrontRivalMovePokemon: ; 4E84 ld a, [wYCoord] cp 8 ret nz - ld hl, SilentLabP1Movement9 + ld hl, SilentHillLabFrontMovement9 ld a, [wXCoord] cp 3 jr z, .jump cp 4 ret nz - ld hl, SilentLabP1Movement10 + ld hl, SilentHillLabFrontMovement10 .jump push hl ld hl, wJoypadFlags @@ -430,14 +430,14 @@ SilentLabP1RivalMovePokemon: ; 4E84 call ClearAccumulator ret -SilentLabP1Movement9: ; 4EDE +SilentHillLabFrontMovement9: ; 4EDE db $08, $0B, $0B, $08, $08, $04, $32 -SilentLabP1Movement10: ; 4EC5 +SilentHillLabFrontMovement10: ; 4EC5 db $08, $0B, $08, $08, $04, $32 -SilentLabP1Script13: ; 4ECB - ld hl, SilentLabP1TextString17 +SilentHillLabFrontScript13: ; 4ECB + ld hl, SilentHillLabFrontTextString17 call OpenTextbox call GetLabPokemon ld hl, wc5ed @@ -474,12 +474,12 @@ LabPokemon: ; 4EFF db DEX_HONOGUMA db 3 -SilentLabP1Script14: ; 4F05 - ld hl, SilentLabP1TextString19 +SilentHillLabFrontScript14: ; 4F05 + ld hl, SilentHillLabFrontTextString19 ld a, [wcd5d] and a jr nz, .skip - ld hl, SilentLabP1TextString18 + ld hl, SilentHillLabFrontTextString18 .skip call OpenTextbox ld hl, wJoypadFlags @@ -487,7 +487,7 @@ SilentLabP1Script14: ; 4F05 ld a, 5 call Function17f9 ld a, 5 - ld hl, SilentLabP1Movement11 + ld hl, SilentHillLabFrontMovement11 call LoadMovementDataPointer ld hl, wc5ed set 7, [hl] @@ -497,27 +497,27 @@ SilentLabP1Script14: ; 4F05 call WriteIntod637 ret -SilentLabP1Movement11: ; 4F36 +SilentHillLabFrontMovement11: ; 4F36 db $04, $08, $08, $08, $33 -SilentLabP1Script15: ; 4F3B +SilentHillLabFrontScript15: ; 4F3B call Function20f8 ld a, $0F ld [wMapScriptNumber], a call InitUnknownBuffercc9e ret -SilentLabP1Script16: ; 4F47 - call SilentLabP1MoveDown +SilentHillLabFrontScript16: ; 4F47 + call SilentHillLabFrontMoveDown ret z - call SilentLabP1MoveRivalLeave + call SilentHillLabFrontMoveRivalLeave ret z - ld hl, SilentLabP1NPCIDs7 - ld de, SilentLabP1TextPointers2 + ld hl, SilentHillLabFrontNPCIDs7 + ld de, SilentHillLabFrontTextPointers2 call CallMapTextSubroutine ret -SilentLabP1MoveRivalLeave: ; 4F59 +SilentHillLabFrontMoveRivalLeave: ; 4F59 ld a, [wYCoord] cp $0B ret nz @@ -549,8 +549,8 @@ SilentLabP1MoveRivalLeave: ; 4F59 Movememt12:; 4F93 db $07, $07, $07, $05, $32 -SilentLabP1Script17: ; 4F98 - ld hl, SilentLabP1TextString23 +SilentHillLabFrontScript17: ; 4F98 + ld hl, SilentHillLabFrontTextString23 call OpenTextbox ld hl, wd41d set 2, [hl] @@ -565,25 +565,25 @@ SilentLabP1Script17: ; 4F98 ld [wMapScriptNumber], a ret -SilentLabP1Script18: ; 4FBC - call SilentLabP1MoveDown +SilentHillLabFrontScript18: ; 4FBC + call SilentHillLabFrontMoveDown ret z - ld hl, SilentLabP1NPCIDs7 - ld de, SilentLabP1TextPointers2 + ld hl, SilentHillLabFrontNPCIDs7 + ld de, SilentHillLabFrontTextPointers2 call CallMapTextSubroutine ret -SilentLabP1Script19: ; 4FCA - call SilentLabP1MoveDown +SilentHillLabFrontScript19: ; 4FCA + call SilentHillLabFrontMoveDown ret z - ld hl, SilentLabP1NPCIDs9 - ld de, SilentLabP1TextPointers2 + ld hl, SilentHillLabFrontNPCIDs9 + ld de, SilentHillLabFrontTextPointers2 call CallMapTextSubroutine ret -SilentLabP1TextPointers2: ; 4FD8 - dw SilentLabP1Text1 - dw SilentLabP1Text2 +SilentHillLabFrontTextPointers2: ; 4FD8 + dw SilentHillLabFrontText1 + dw SilentHillLabFrontText2 dw Function3899 dw Function3899 dw Function3899 @@ -596,14 +596,14 @@ SilentLabP1TextPointers2: ; 4FD8 dw Function3899 dw Function3899 dw Function3899 - dw SilentLabP1Text3 + dw SilentHillLabFrontText3 -SilentLabP1Text1: ; 4FF6 - ld hl, SilentLabP1TextString1 +SilentHillLabFrontText1: ; 4FF6 + ld hl, SilentHillLabFrontTextString1 call OpenTextbox ret -SilentLabP1TextString1: ; 4FFD +SilentHillLabFrontTextString1: ; 4FFD text "パソコンを みると" line "なんと メールが きていた！" @@ -626,52 +626,52 @@ SilentLabP1TextString1: ; 4FFD cont "<⋯⋯> <⋯⋯> <⋯⋯>じょしゅより" done -SilentLabP1Text2: ; 50B3 +SilentHillLabFrontText2: ; 50B3 ld hl, wd39d bit 0, [hl] set 0, [hl] jr z, .jump res 0, [hl] - ld hl, SilentLabP1TextString2A + ld hl, SilentHillLabFrontTextString2A jr .skip .jump - ld hl, SilentLabP1TextString2B + ld hl, SilentHillLabFrontTextString2B .skip call OpenTextbox ret -SilentLabP1TextString2A: ; 50CA +SilentHillLabFrontTextString2A: ; 50CA text "スタート ボタンを プシュ！" line "おすと メニューが ひらくなり" done -SilentLabP1TextString2B: ; 50EA +SilentHillLabFrontTextString2B: ; 50EA text "セーブするには # レポート" line "こまめに かくと いいなり" done -SilentLabP1Text3: ; 5108 - ld hl, SilentLabP1TextString3 +SilentHillLabFrontText3: ; 5108 + ld hl, SilentHillLabFrontTextString3 call OpenTextbox ret -SilentLabP1TextString3: ; 510F +SilentHillLabFrontTextString3: ; 510F text "カギが かかっている" done -SilentLabP1Text4: ; 511B +SilentHillLabFrontText4: ; 511B ld a, [wMapScriptNumber] cp $0E - jp nc, SilentLabP1Text7 - ld hl, SilentLabP1TextString4 + jp nc, SilentHillLabFrontText7 + ld hl, SilentHillLabFrontTextString4 call OpenTextbox ret -SilentLabP1TextString4: ; 512A +SilentHillLabFrontTextString4: ; 512A text "オーキド『ごくろうさん！" done -SilentLabP1TextString5: ; 5138 +SilentHillLabFrontTextString5: ; 5138 text "オーキド『そうとも！" line "わしが オーキドじゃ！" cont "じじいで わるかったな！" @@ -683,23 +683,23 @@ SilentLabP1TextString5: ; 5138 line "きいては くれんか？@" db $08 -SilentLabP1Text6: ; 5192 +SilentHillLabFrontText6: ; 5192 call YesNoBox jr c, .jump .loop - ld hl, SilentLabP1TextString6A + ld hl, SilentHillLabFrontTextString6A call PrintText call Function3036 ret .jump - ld hl, SilentLabP1TextString6B + ld hl, SilentHillLabFrontTextString6B call PrintText call YesNoBox jr c, .jump jr .loop -SilentLabP1TextString6A: ; 51AE +SilentHillLabFrontTextString6A: ; 51AE text "オーキド『いまから １ねんまえ" line "わしは カントーで" cont "きみたちの ような しょうねんに" @@ -740,7 +740,7 @@ SilentLabP1TextString6A: ; 51AE cont "ちからを かして くれんか！" done -SilentLabP1TextString6B: ; 5332 +SilentHillLabFrontTextString6B: ; 5332 text "オーキド『そうか<⋯⋯>" line "わしに ひとを みるめが" cont "なかったと いうことじゃな<⋯⋯>" @@ -753,36 +753,36 @@ SilentLabP1TextString6B: ; 5332 cont "わしの はなしを きいてくれるな？" done -SilentLabP1TextString7: ; 538D +SilentHillLabFrontTextString7: ; 538D text "オーキド『ふたりとも！" line "ちょっと わしに ついてこい！" done -SilentLabP1Text7: ; 53AA +SilentHillLabFrontText7: ; 53AA ld a, [wMapScriptNumber] cp $12 jr z, .jump - ld hl, SilentLabP1TextString11A + ld hl, SilentHillLabFrontTextString11A call OpenTextbox ret .jump - ld hl, SilentLabP1TextString11B + ld hl, SilentHillLabFrontTextString11B call OpenTextbox ret -SilentLabP1TextString8: ; 53BF +SilentHillLabFrontTextString8: ; 53BF text "オーキド『<PLAYER>！<RIVAL>！" line "このずかんを" cont "おまえたちに あずける！" done -SilentLabP1TextString9: ; 53DE +SilentHillLabFrontTextString9: ; 53DE text "<PLAYER>は オーキドから" line "#ずかんを もらった！" done -SilentLabP1TextString10: ; 53F5 +SilentHillLabFrontTextString10: ; 53F5 text "オーキド『この せかいの すべての" line "#を きろくした" cont "かんぺきな ずかんを つくること！" @@ -804,13 +804,13 @@ SilentLabP1TextString10: ; 53F5 cont "いだいな しごとじゃー！" done -SilentLabP1TextString11A: ; 54C3 +SilentHillLabFrontTextString11A: ; 54C3 text "オーキド『せかい じゅうの" line "#たちが" cont "<PLAYER>を まって おるぞー" done -SilentLabP1TextString11B: ; 54E3 +SilentHillLabFrontTextString11B: ; 54E3 text "オーキド『おう！ <PLAYER>" line "どうだ？" cont "わしの あげた #は<⋯⋯>？" @@ -827,12 +827,12 @@ SilentLabP1TextString11B: ; 54E3 line "きに なるからな" done -SilentLabP1Text8: ; 5560 - ld hl, SilentLabP1TextString12 +SilentHillLabFrontText8: ; 5560 + ld hl, SilentHillLabFrontTextString12 call OpenTextbox ret -SilentLabP1TextString12: ; 5567 +SilentHillLabFrontTextString12: ; 5567 text "オーキド『よく きたな！" line "#ずかんの" cont "ちょうしは どうかな？" @@ -841,12 +841,12 @@ SilentLabP1TextString12: ; 5567 cont "みて あげようか！" done -SilentLabP1Text9: ; 559A - ld hl, SilentLabP1TextString13 +SilentHillLabFrontText9: ; 559A + ld hl, SilentHillLabFrontTextString13 call OpenTextbox ret -SilentLabP1TextString13: ; 55A1 +SilentHillLabFrontTextString13: ; 55A1 text "オーキド『<⋯⋯> おっほんッ！" line "よくやったな <PLAYER>！" @@ -865,12 +865,12 @@ SilentLabP1TextString13: ; 55A1 cont "<RIVAL>『ギクッ！" done -SilentLabP1Text10: ; 561A - ld hl, SilentLabP1TextString14 +SilentHillLabFrontText10: ; 561A + ld hl, SilentHillLabFrontTextString14 call OpenTextbox ret -SilentLabP1TextString14: ; 5621 +SilentHillLabFrontTextString14: ; 5621 text "<RIVAL>『なんだ" line "<PLAYER>じゃないか！" cont "おれも ここが" @@ -878,23 +878,23 @@ SilentLabP1TextString14: ; 5621 cont "だれも いないみたいだな<⋯⋯>" done -SilentLabP1Text11: ; 5658 - ld hl, SilentLabP1TextString16 +SilentHillLabFrontText11: ; 5658 + ld hl, SilentHillLabFrontTextString16 call OpenTextbox ret -SilentLabP1TextString15: ; 565F +SilentHillLabFrontTextString15: ; 565F text "<RIVAL>『よっしゃあ！" line "じいさん！ おれにまかせな！" done -SilentLabP1TextString16: ; 5678 +SilentHillLabFrontTextString16: ; 5678 text "<RIVAL>『おれが えらんだ" line "#のほうが つよそうだぜ！" cont "こっちに したかったんじゃないの？" done -SilentLabP1TextString17: ; 56A4 +SilentHillLabFrontTextString17: ; 56A4 text "<RIVAL>『<PLAYER>！" line "せっかく じいさんに" cont "# もらったんだから" @@ -902,12 +902,12 @@ SilentLabP1TextString17: ; 56A4 cont "たたかわせて みようぜ！" done -SilentLabP1TextString18: ; 56D4 +SilentHillLabFrontTextString18: ; 56D4 text "<RIVAL>『くっそー！" line "こんどは ぜったい まけないぞ！" done -SilentLabP1TextString19: ; 56EE +SilentHillLabFrontTextString19: ; 56EE text "<RIVAL>『よーし！" line "ほかの #と たたかわせて" cont "もっと もっと つよくしよう！" @@ -915,12 +915,12 @@ SilentLabP1TextString19: ; 56EE para "そんじゃ ばいばい！" done -SilentLabP1TextString20: ; 571F +SilentHillLabFrontTextString20: ; 571F text "じいちゃん！" line "つれてきたよー！" done -SilentLabP1TextString21: ; 5730 +SilentHillLabFrontTextString21: ; 5730 text "ぼくは かつて" line "#トレーナーの ちょうてんを" cont "めざしたことが あるんだ" @@ -944,23 +944,23 @@ SilentLabP1TextString21: ; 5730 cont "とても ハイテクな ずかん だよ！" done -SilentLabP1Text12: ; 5814 - ld hl, SilentLabP1TextString22 +SilentHillLabFrontText12: ; 5814 + ld hl, SilentHillLabFrontTextString22 call OpenTextbox ret -SilentLabP1TextString22: ; 581B +SilentHillLabFrontTextString22: ; 581B text "ぼくも むかし やったけど" line "なかなか たいへんだよ<⋯⋯>" cont "がんばってね！" done -SilentLabP1Text13: ; 583F - ld hl, SilentLabP1TextString24 +SilentHillLabFrontText13: ; 583F + ld hl, SilentHillLabFrontTextString24 call OpenTextbox ret -SilentLabP1TextString23: ; 5846 +SilentHillLabFrontTextString23: ; 5846 text "ナナミ『さっき あなたを " line "つれてきた わかい おとこのこ<⋯⋯>" cont "あれは わたしの おとうとなの" @@ -1008,17 +1008,17 @@ SilentLabP1TextString23: ; 5846 line "いのっているわ" done -SilentLabP1TextString24: ; 5A23 +SilentHillLabFrontTextString24: ; 5A23 text "<⋯⋯>あなたの かつやく" line "いのってるわ" done -SilentLabP1Text14: ; 5A36 - ld hl, SilentLabP1TextString25 +SilentHillLabFrontText14: ; 5A36 + ld hl, SilentHillLabFrontTextString25 call OpenTextbox ret -SilentLabP1TextString25: ; 5A3D +SilentHillLabFrontTextString25: ; 5A3D text "わたしは" line "はかせの じょしゅ です" @@ -1030,12 +1030,12 @@ SilentLabP1TextString25: ; 5A3D cont "なるような きがします" done -SilentLabP1Text15: ; 5A90 - ld hl, SilentLabP1TextString26 +SilentHillLabFrontText15: ; 5A90 + ld hl, SilentHillLabFrontTextString26 call OpenTextbox ret -SilentLabP1TextString26: ; 5A97 +SilentHillLabFrontTextString26: ; 5A97 text "わたしは" line "はかせの じょしゅ です" @@ -1047,22 +1047,22 @@ SilentLabP1TextString26: ; 5A97 cont "なるような きがします" done -SilentLabP1Text16: ; 5AEA - ld hl, SilentLabP1TextString27 +SilentHillLabFrontText16: ; 5AEA + ld hl, SilentHillLabFrontTextString27 call OpenTextbox ret -SilentLabP1TextString27: ; 5AF1 +SilentHillLabFrontTextString27: ; 5AF1 text "なんだろう？" line "でんし てちょう かな？" done -SilentLabP1Text17: ; 5B05 - ld hl, SilentLabP1TextString28 +SilentHillLabFrontText17: ; 5B05 + ld hl, SilentHillLabFrontTextString28 call OpenTextbox ret -SilentLabP1TextString28: ; 5B0D +SilentHillLabFrontTextString28: ; 5B0D text "<RIVAL>『あのメールを くれた" line "オーキドって こんな じじい<⋯⋯>" @@ -1071,18 +1071,18 @@ SilentLabP1TextString28: ; 5B0D cont "ほんもの はじめて みたよ！" done -SilentLabP1TextString29: ; 5B4F +SilentHillLabFrontTextString29: ; 5B4F text "<RIVAL>『<PLAYER>！" line "なんだか" cont "おもしろく なってきたな！" done -SilentLabP1Text18: ; 5B68 - ld hl, SilentLabP1TextString30 +SilentHillLabFrontText18: ; 5B68 + ld hl, SilentHillLabFrontTextString30 call OpenTextbox ret -SilentLabP1TextString30: ; 5B6F +SilentHillLabFrontTextString30: ; 5B6F text "わたしは" line "はかせの じょしゅ です" @@ -1091,12 +1091,12 @@ SilentLabP1TextString30: ; 5B6F cont "なるような きがします" done -SilentLabP1Text19: ; 5BA7 - ld hl, SilentLabP1TextString31 +SilentHillLabFrontText19: ; 5BA7 + ld hl, SilentHillLabFrontTextString31 call OpenTextbox ret -SilentLabP1TextString31: ; 5BAE +SilentHillLabFrontTextString31: ; 5BAE text "わたしは" line "はかせの じょしゅ です" diff --git a/maps/SilentHillPokecenter.asm b/maps/SilentHillPokecenter.asm new file mode 100644 index 0000000..9a9eca2 --- /dev/null +++ b/maps/SilentHillPokecenter.asm @@ -0,0 +1,113 @@ +include "constants.asm" + +SECTION "maps/SilentHillPokecenter.asm", ROMX + +SilentHillPokecenterScriptLoader:: ; 4682 + ld hl, SilentHillPokecenterScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +SilentHillPokecenterScriptPointers: ; 468C + dw SilentHillPokecenterScript + dw SilentHillPokecenterNPCIDs + +SilentHillPokecenterScript: ; 4690 + ld hl, SilentHillPokecenterNPCIDs + ld de, SilentHillPokecenterPCPointer + call CallMapTextSubroutine + ret + +; 469A + dw SilentHillPokecenterNPCIDs + +SilentHillPokecenterNPCIDs: ; 469C + db 0 + db 1 + db 2 + db 3 + db 4 + db $FF + +SilentHillPokecenterPCPointer: ; 46A2 + dw SilentHillPokecenterPCText + +SilentHillPokecenterPCText: ; 46A4 + ld hl, SilentHillPokecenterTextString1 + call OpenTextbox + ret + +SilentHillPokecenterTextString1: ; 46AB + text "げんざい ちょうせいちゅうです" + done + +SilentHillPokecenterTextPointers:: ; 46BC + dw SilentHillPokecenterNPCText1 + dw SilentHillPokecenterNPCText2 + dw SilentHillPokecenterNPCText3 + dw SilentHillPokecenterNPCText4 + dw SilentHillPokecenterNPCText5 + +SilentHillPokecenterNPCText1: ; 46C6 + ld hl, SilentHillPokecenterTextString2 + call OpenTextbox + ret + +SilentHillPokecenterTextString2: ; 46CD + text "もうしわけありませんが" + line "ただいま しゅうりちゅう でして" + + para "かいふくは できません" + + para "まちから でるときは" + line "じゅうぶんに おきをつけ ください" + done + +SilentHillPokecenterNPCText2: ; 4714 + ld hl, SilentHillPokecenterTextString3 + call OpenTextbox + ret + +SilentHillPokecenterTextString3: ; 471B + text "あそこに ある パソコンは" + line "トレーナー だったら" + cont "いつでも むりょうで" + cont "つかうことが できるよ" + cont "きが きいてるよな！" + done + +SilentHillPokecenterNPCText3: ; 4757 + ld hl, SilentHillPokecenterTextString4 + call OpenTextbox + ret + +SilentHillPokecenterTextString4: ; 475E + text "いま じゅんびちゅうの" + line "きかいは すごいらしいよ" + + para "なんでも ときを こえて" + line "ポケモンが こうかん できるって！" + + para "ほんとかな？" + done + +SilentHillPokecenterNPCText4: ; 479E + ld hl, SilentHillPokecenterTextString5 + call OpenTextbox + ret + +SilentHillPokecenterTextString5: ; 47A5 + text "こいつ へルガー" + line "いままでにない タイプの ポケモンさ" + done + +SilentHillPokecenterNPCText5: ; 47C2 + ld hl, SilentHillPokecenterTextString6 + call OpenTextbox + ret + +SilentHillPokecenterTextString6: ; 47C9 + text "へルガー『ぐるるうー" + done + +; 47D5
\ No newline at end of file diff --git a/maps/SilentPokecenter.asm b/maps/SilentPokecenter.asm deleted file mode 100644 index dc1a35a..0000000 --- a/maps/SilentPokecenter.asm +++ /dev/null @@ -1,113 +0,0 @@ -include "constants.asm" - -SECTION "Silent Hills Pokecenter", ROMX[$4682], BANK[$34] - -SilentPokecenterScriptLoader:: ; 4682 - ld hl, SilentPokecenterScriptPointers - call RunMapScript - call WriteBackMapScriptNumber - ret - -SilentPokecenterScriptPointers: ; 468C - dw SilentPokecenterScript - dw SilentPokecenterNPCIDs - -SilentPokecenterScript: ; 4690 - ld hl, SilentPokecenterNPCIDs - ld de, SilentPokecenterPCPointer - call CallMapTextSubroutine - ret - -; 469A - dw SilentPokecenterNPCIDs - -SilentPokecenterNPCIDs: ; 469C - db 0 - db 1 - db 2 - db 3 - db 4 - db $FF - -SilentPokecenterPCPointer: ; 46A2 - dw SilentPokecenterPCText - -SilentPokecenterPCText: ; 46A4 - ld hl, SilentPokecenterTextString1 - call OpenTextbox - ret - -SilentPokecenterTextString1: ; 46AB - text "げんざい ちょうせいちゅうです" - done - -SilentPokecenterTextPointers:: ; 46BC - dw SilentPokecenterNPCText1 - dw SilentPokecenterNPCText2 - dw SilentPokecenterNPCText3 - dw SilentPokecenterNPCText4 - dw SilentPokecenterNPCText5 - -SilentPokecenterNPCText1: ; 46C6 - ld hl, SilentPokecenterTextString2 - call OpenTextbox - ret - -SilentPokecenterTextString2: ; 46CD - text "もうしわけありませんが" - line "ただいま しゅうりちゅう でして" - - para "かいふくは できません" - - para "まちから でるときは" - line "じゅうぶんに おきをつけ ください" - done - -SilentPokecenterNPCText2: ; 4714 - ld hl, SilentPokecenterTextString3 - call OpenTextbox - ret - -SilentPokecenterTextString3: ; 471B - text "あそこに ある パソコンは" - line "トレーナー だったら" - cont "いつでも むりょうで" - cont "つかうことが できるよ" - cont "きが きいてるよな！" - done - -SilentPokecenterNPCText3: ; 4757 - ld hl, SilentPokecenterTextString4 - call OpenTextbox - ret - -SilentPokecenterTextString4: ; 475E - text "いま じゅんびちゅうの" - line "きかいは すごいらしいよ" - - para "なんでも ときを こえて" - line "ポケモンが こうかん できるって！" - - para "ほんとかな？" - done - -SilentPokecenterNPCText4: ; 479E - ld hl, SilentPokecenterTextString5 - call OpenTextbox - ret - -SilentPokecenterTextString5: ; 47A5 - text "こいつ へルガー" - line "いままでにない タイプの ポケモンさ" - done - -SilentPokecenterNPCText5: ; 47C2 - ld hl, SilentPokecenterTextString6 - call OpenTextbox - ret - -SilentPokecenterTextString6: ; 47C9 - text "へルガー『ぐるるうー" - done - -; 47D5
\ No newline at end of file diff --git a/maps/SlowpokeWellEntrance.asm b/maps/SlowpokeWellEntrance.asm new file mode 100644 index 0000000..c6bd3f7 --- /dev/null +++ b/maps/SlowpokeWellEntrance.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/SlowpokeWellEntrance.asm", ROMX + +SlowpokeWellEntranceScriptLoader:: ; bd2f3 (2f:52f3) + ret + +SlowpokeWellEntranceTextPointers:: ; bd2f4 (2f:52f4) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/SlowpokeWellMain.asm b/maps/SlowpokeWellMain.asm new file mode 100644 index 0000000..859cac5 --- /dev/null +++ b/maps/SlowpokeWellMain.asm @@ -0,0 +1,17 @@ +INCLUDE "constants.asm" + +SECTION "maps/SlowpokeWellMain.asm", ROMX + +SlowpokeWellMainScriptLoader:: ; bd3ca (2f:53ca) + ret + +SlowpokeWellMainTextPointers:: ; bd3cb (2f:53cb) + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText + dw GameplayText
\ No newline at end of file diff --git a/maps/South.asm b/maps/South.asm new file mode 100644 index 0000000..af8db57 --- /dev/null +++ b/maps/South.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/South.asm", ROMX + +SouthScriptLoader:: ; d9912 (36:5912) + ret + + db "@"
\ No newline at end of file diff --git a/maps/SouthHouse1.asm b/maps/SouthHouse1.asm new file mode 100644 index 0000000..2a5d112 --- /dev/null +++ b/maps/SouthHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SouthHouse1.asm", ROMX + +SouthHouse1ScriptLoader:: ; 9f315 (27:7315) + ret + +SouthHouse1TextPointers:: ; 9f316 (27:7316) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/SouthHouse2.asm b/maps/SouthHouse2.asm new file mode 100644 index 0000000..f8f669e --- /dev/null +++ b/maps/SouthHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SouthHouse2.asm", ROMX + +SouthHouse2ScriptLoader:: ; 9f4fc (27:74fc) + ret + +SouthHouse2TextPointers:: ; 9f4fd (27:74fd) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/SouthMart.asm b/maps/SouthMart.asm new file mode 100644 index 0000000..ea167a9 --- /dev/null +++ b/maps/SouthMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SouthMart.asm", ROMX + +SouthMartScriptLoader:: ; 9f4a2 (27:74a2) + ret + +SouthMartTextPointers:: ; 9f4a3 (27:74a3) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/SouthPokecenter1F.asm b/maps/SouthPokecenter1F.asm new file mode 100644 index 0000000..9e2df98 --- /dev/null +++ b/maps/SouthPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SouthPokecenter1F.asm", ROMX + +SouthPokecenter1FScriptLoader:: ; 9f3a9 (27:73a9) + ret + +SouthPokecenter1FTextPointers:: ; 9f3aa (27:73aa) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/SouthPokecenter2F.asm b/maps/SouthPokecenter2F.asm new file mode 100644 index 0000000..9f0cc9a --- /dev/null +++ b/maps/SouthPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SouthPokecenter2F.asm", ROMX + +SouthPokecenter2FScriptLoader:: ; 9f422 (27:7422) + ret + +SouthPokecenter2FTextPointers:: ; 9f423 (27:7423) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Stand.asm b/maps/Stand.asm new file mode 100644 index 0000000..ab225c4 --- /dev/null +++ b/maps/Stand.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Stand.asm", ROMX + +StandScriptLoader:: ; d919b (36:519b) + ret + + db "@"
\ No newline at end of file diff --git a/maps/StandHouse.asm b/maps/StandHouse.asm new file mode 100644 index 0000000..cf26e51 --- /dev/null +++ b/maps/StandHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandHouse.asm", ROMX + +StandHouseScriptLoader:: ; 9df9c (27:5f9c) + ret + +StandHouseTextPointers:: ; 9df9d (27:5f9d) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/StandLab.asm b/maps/StandLab.asm new file mode 100644 index 0000000..593453a --- /dev/null +++ b/maps/StandLab.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandLab.asm", ROMX + +StandLabScriptLoader:: ; 9dd35 (27:5d35) + ret + +StandLabTextPointers:: ; 9dd36 (27:5d36) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/StandLeague1F.asm b/maps/StandLeague1F.asm new file mode 100644 index 0000000..efecf8a --- /dev/null +++ b/maps/StandLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandLeague1F.asm", ROMX + +StandLeague1FScriptLoader:: ; 9e109 (27:6109) + ret + +StandLeague1FTextPointers:: ; 9e10a (27:610a) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/StandLeague2F.asm b/maps/StandLeague2F.asm new file mode 100644 index 0000000..9355508 --- /dev/null +++ b/maps/StandLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandLeague2F.asm", ROMX + +StandLeague2FScriptLoader:: ; 9e1a9 (27:61a9) + ret + +StandLeague2FTextPointers:: ; 9e1aa (27:61aa) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/StandMart.asm b/maps/StandMart.asm new file mode 100644 index 0000000..1037fe8 --- /dev/null +++ b/maps/StandMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandMart.asm", ROMX + +StandMartScriptLoader:: ; 9df42 (27:5f42) + ret + +StandMartTextPointers:: ; 9df43 (27:5f43) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/StandOffice.asm b/maps/StandOffice.asm new file mode 100644 index 0000000..4b40a6e --- /dev/null +++ b/maps/StandOffice.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandOffice.asm", ROMX + +StandOfficeScriptLoader:: ; 9dec2 (27:5ec2) + ret + +StandOfficeTextPointers:: ; 9dec3 (27:5ec3) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/StandPokecenter1F.asm b/maps/StandPokecenter1F.asm new file mode 100644 index 0000000..d4dfb35 --- /dev/null +++ b/maps/StandPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandPokecenter1F.asm", ROMX + +StandPokecenter1FScriptLoader:: ; 9ddc9 (27:5dc9) + ret + +StandPokecenter1FTextPointers:: ; 9ddca (27:5dca) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/StandPokecenter2F.asm b/maps/StandPokecenter2F.asm new file mode 100644 index 0000000..5dc3294 --- /dev/null +++ b/maps/StandPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandPokecenter2F.asm", ROMX + +StandPokecenter2FScriptLoader:: ; 9de42 (27:5e42) + ret + +StandPokecenter2FTextPointers:: ; 9de43 (27:5e43) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/StandRocketHouse1F.asm b/maps/StandRocketHouse1F.asm new file mode 100644 index 0000000..a9d54b8 --- /dev/null +++ b/maps/StandRocketHouse1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandRocketHouse1F.asm", ROMX + +StandRocketHouse1FScriptLoader:: ; 9e009 (27:6009) + ret + +StandRocketHouse1FTextPointers:: ; 9e00a (27:600a) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/StandRocketHouse2F.asm b/maps/StandRocketHouse2F.asm new file mode 100644 index 0000000..7ee1f7d --- /dev/null +++ b/maps/StandRocketHouse2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandRocketHouse2F.asm", ROMX + +StandRocketHouse2FScriptLoader:: ; 9e068 (27:6068) + ret + +StandRocketHouse2FTextPointers:: ; 9e069 (27:6069) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/StandRoute.asm b/maps/StandRoute.asm new file mode 100644 index 0000000..209631f --- /dev/null +++ b/maps/StandRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandRoute.asm", ROMX + +StandRouteScriptLoader:: ; db15f (36:715f) + ret + + db "@"
\ No newline at end of file diff --git a/maps/StandRouteGateKanto.asm b/maps/StandRouteGateKanto.asm new file mode 100644 index 0000000..de5fc05 --- /dev/null +++ b/maps/StandRouteGateKanto.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/StandRouteGateKanto.asm", ROMX + +StandRouteGateKantoScriptLoader:: ; 9dcdf (27:5cdf) + ret + +StandRouteGateKantoTextPointers:: ; 9dce0 (27:5ce0) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/Sugar.asm b/maps/Sugar.asm new file mode 100644 index 0000000..dee0c5a --- /dev/null +++ b/maps/Sugar.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/Sugar.asm", ROMX + +SugarScriptLoader:: ; d8d03 (36:4d03) + ret + + db "@"
\ No newline at end of file diff --git a/maps/SugarHouse.asm b/maps/SugarHouse.asm new file mode 100644 index 0000000..ccae047 --- /dev/null +++ b/maps/SugarHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SugarHouse.asm", ROMX + +SugarHouseScriptLoader:: ; 9d5c7 (27:55c7) + ret + +SugarHouseTextPointers:: ; 9d5c8 (27:55c8) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/SugarHouse2.asm b/maps/SugarHouse2.asm new file mode 100644 index 0000000..2dcdc13 --- /dev/null +++ b/maps/SugarHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SugarHouse2.asm", ROMX + +SugarHouse2ScriptLoader:: ; 9d61d (27:561d) + ret + +SugarHouse2TextPointers:: ; 9d61e (27:561e) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/SugarMart.asm b/maps/SugarMart.asm new file mode 100644 index 0000000..ce5b137 --- /dev/null +++ b/maps/SugarMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SugarMart.asm", ROMX + +SugarMartScriptLoader:: ; 9d69d (27:569d) + ret + +SugarMartTextPointers:: ; 9d69e (27:569e) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/SugarPokecenter1F.asm b/maps/SugarPokecenter1F.asm new file mode 100644 index 0000000..3ce8e76 --- /dev/null +++ b/maps/SugarPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SugarPokecenter1F.asm", ROMX + +SugarPokecenter1FScriptLoader:: ; 9d731 (27:5731) + ret + +SugarPokecenter1FTextPointers:: ; 9d732 (27:5732) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/SugarPokecenter2F.asm b/maps/SugarPokecenter2F.asm new file mode 100644 index 0000000..bd37728 --- /dev/null +++ b/maps/SugarPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SugarPokecenter2F.asm", ROMX + +SugarPokecenter2FScriptLoader:: ; 9d7aa (27:57aa) + ret + +SugarPokecenter2FTextPointers:: ; 9d7ab (27:57ab) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/SugarRoute.asm b/maps/SugarRoute.asm new file mode 100644 index 0000000..d227c8a --- /dev/null +++ b/maps/SugarRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/SugarRoute.asm", ROMX + +SugarRouteScriptLoader:: ; daed3 (36:6ed3) + ret + + db "@"
\ No newline at end of file diff --git a/maps/SugarRouteGate.asm b/maps/SugarRouteGate.asm new file mode 100644 index 0000000..53ef56c --- /dev/null +++ b/maps/SugarRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/SugarRouteGate.asm", ROMX + +SugarRouteGateScriptLoader:: ; 9d547 (27:5547) + ret + +SugarRouteGateTextPointers:: ; 9d548 (27:5548) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/UnusedMap13.asm b/maps/UnusedMap13.asm new file mode 100644 index 0000000..9046aef --- /dev/null +++ b/maps/UnusedMap13.asm @@ -0,0 +1,28 @@ +include "constants.asm" + +SECTION "maps/UnusedMap13.asm", ROMX + +UnusedMap13ScriptLoader:: ; 6078 + ld hl, UnusedMap13ScriptPointers + call RunMapScript + call WriteBackMapScriptNumber + ret + +UnusedMap13ScriptPointers: ; 6082 + dw UnusedMap13Script + dw UnusedMap13NPCIDs + +UnusedMap13NPCIDs: ; 6086 + db $FF + +UnusedMap13SignPointers: ; 6087 + dw MapDefaultText + +UnusedMap13TextPointers:: ; 6089 + dw MapDefaultText + +UnusedMap13Script: ; 608B + ld hl, UnusedMap13NPCIDs + ld de, UnusedMap13SignPointers + call CallMapTextSubroutine + ret
\ No newline at end of file diff --git a/maps/West.asm b/maps/West.asm new file mode 100644 index 0000000..531bf4a --- /dev/null +++ b/maps/West.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "maps/West.asm", ROMX + +WestScriptLoader:: ; d85d0 (36:45d0) + ret + + db "@"
\ No newline at end of file diff --git a/maps/WestGym.asm b/maps/WestGym.asm new file mode 100644 index 0000000..3c70852 --- /dev/null +++ b/maps/WestGym.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestGym.asm", ROMX + +WestGymScriptLoader:: ; 98bff (26:4bff) + ret + +WestGymTextPointers:: ; 98c00 (26:4c00) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestHouse1.asm b/maps/WestHouse1.asm new file mode 100644 index 0000000..c15bae2 --- /dev/null +++ b/maps/WestHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestHouse1.asm", ROMX + +WestHouse1ScriptLoader:: ; 98c83 (26:4c83) + ret + +WestHouse1TextPointers:: ; 98c84 (26:4c84) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestHouse2.asm b/maps/WestHouse2.asm new file mode 100644 index 0000000..2c91614 --- /dev/null +++ b/maps/WestHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestHouse2.asm", ROMX + +WestHouse2ScriptLoader:: ; 98d07 (26:4d07) + ret + +WestHouse2TextPointers:: ; 98d08 (26:4d08) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestMart1F.asm b/maps/WestMart1F.asm new file mode 100644 index 0000000..16e2f61 --- /dev/null +++ b/maps/WestMart1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestMart1F.asm", ROMX + +WestMart1FScriptLoader:: ; 98285 (26:4285) + ret + +WestMart1FTextPointers:: ; 98286 (26:4286) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestMart2F.asm b/maps/WestMart2F.asm new file mode 100644 index 0000000..006c266 --- /dev/null +++ b/maps/WestMart2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestMart2F.asm", ROMX + +WestMart2FScriptLoader:: ; 98359 (26:4359) + ret + +WestMart2FTextPointers:: ; 9835a (26:435a) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestMart3F.asm b/maps/WestMart3F.asm new file mode 100644 index 0000000..cb3dc5f --- /dev/null +++ b/maps/WestMart3F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestMart3F.asm", ROMX + +WestMart3FScriptLoader:: ; 98418 (26:4418) + ret + +WestMart3FTextPointers:: ; 98419 (26:4419) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestMart4F.asm b/maps/WestMart4F.asm new file mode 100644 index 0000000..9f4d66b --- /dev/null +++ b/maps/WestMart4F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestMart4F.asm", ROMX + +WestMart4FScriptLoader:: ; 984d7 (26:44d7) + ret + +WestMart4FTextPointers:: ; 984d8 (26:44d8) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestMart5F.asm b/maps/WestMart5F.asm new file mode 100644 index 0000000..1d178f8 --- /dev/null +++ b/maps/WestMart5F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestMart5F.asm", ROMX + +WestMart5FScriptLoader:: ; 98566 (26:4566) + ret + +WestMart5FTextPointers:: ; 98567 (26:4567) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestMart6F.asm b/maps/WestMart6F.asm new file mode 100644 index 0000000..ee8d61f --- /dev/null +++ b/maps/WestMart6F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestMart6F.asm", ROMX + +WestMart6FScriptLoader:: ; 985f3 (26:45f3) + ret + +WestMart6FTextPointers:: ; 985f4 (26:45f4) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestMartElevator.asm b/maps/WestMartElevator.asm new file mode 100644 index 0000000..2e633b9 --- /dev/null +++ b/maps/WestMartElevator.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestMartElevator.asm", ROMX + +WestMartElevatorScriptLoader:: ; 98630 (26:4630) + ret + +WestMartElevatorTextPointers:: ; 98631 (26:4631) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestPokecenter1F.asm b/maps/WestPokecenter1F.asm new file mode 100644 index 0000000..f8c9121 --- /dev/null +++ b/maps/WestPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestPokecenter1F.asm", ROMX + +WestPokecenter1FScriptLoader:: ; 98ac6 (26:4ac6) + ret + +WestPokecenter1FTextPointers:: ; 98ac7 (26:4ac7) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestPokecenter2F.asm b/maps/WestPokecenter2F.asm new file mode 100644 index 0000000..158a911 --- /dev/null +++ b/maps/WestPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestPokecenter2F.asm", ROMX + +WestPokecenter2FScriptLoader:: ; 98b43 (26:4b43) + ret + +WestPokecenter2FTextPointers:: ; 98b44 (26:4b44) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestRadioTower1F.asm b/maps/WestRadioTower1F.asm new file mode 100644 index 0000000..3ed1ef9 --- /dev/null +++ b/maps/WestRadioTower1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestRadioTower1F.asm", ROMX + +WestRadioTower1FScriptLoader:: ; 986af (26:46af) + ret + +WestRadioTower1FTextPointers:: ; 986b0 (26:46b0) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestRadioTower2F.asm b/maps/WestRadioTower2F.asm new file mode 100644 index 0000000..b507a25 --- /dev/null +++ b/maps/WestRadioTower2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestRadioTower2F.asm", ROMX + +WestRadioTower2FScriptLoader:: ; 98757 (26:4757) + ret + +WestRadioTower2FTextPointers:: ; 98758 (26:4758) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestRadioTower3F.asm b/maps/WestRadioTower3F.asm new file mode 100644 index 0000000..9e2e0b6 --- /dev/null +++ b/maps/WestRadioTower3F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestRadioTower3F.asm", ROMX + +WestRadioTower3FScriptLoader:: ; 9880c (26:480c) + ret + +WestRadioTower3FTextPointers:: ; 9880d (26:480d) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestRadioTower4F.asm b/maps/WestRadioTower4F.asm new file mode 100644 index 0000000..28c323a --- /dev/null +++ b/maps/WestRadioTower4F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestRadioTower4F.asm", ROMX + +WestRadioTower4FScriptLoader:: ; 988ce (26:48ce) + ret + +WestRadioTower4FTextPointers:: ; 988cf (26:48cf) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestRadioTower5F.asm b/maps/WestRadioTower5F.asm new file mode 100644 index 0000000..ac9df62 --- /dev/null +++ b/maps/WestRadioTower5F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestRadioTower5F.asm", ROMX + +WestRadioTower5FScriptLoader:: ; 98984 (26:4984) + ret + +WestRadioTower5FTextPointers:: ; 98985 (26:4985) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/WestRocketRaidedHouse.asm b/maps/WestRocketRaidedHouse.asm new file mode 100644 index 0000000..1b7c1e2 --- /dev/null +++ b/maps/WestRocketRaidedHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "maps/WestRocketRaidedHouse.asm", ROMX + +WestRocketRaidedHouseScriptLoader:: ; 98a2e (26:4a2e) + ret + +WestRocketRaidedHouseTextPointers:: ; 98a2f (26:4a2f) + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText
\ No newline at end of file diff --git a/maps/blk/Baadon.blk b/maps/blk/Baadon.blk new file mode 100644 index 0000000..eee9928 --- /dev/null +++ b/maps/blk/Baadon.blk @@ -0,0 +1 @@ +//_TUV__///TUV//XYZB/___
]^_ab_ DEF_/HIJ_/@AAAAB/
\ No newline at end of file diff --git a/maps/blk/BaadonHouse1.blk b/maps/blk/BaadonHouse1.blk new file mode 100644 index 0000000..71eb33c --- /dev/null +++ b/maps/blk/BaadonHouse1.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BaadonHouse2.blk b/maps/blk/BaadonHouse2.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/BaadonHouse2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BaadonLeague1F.blk b/maps/blk/BaadonLeague1F.blk new file mode 100644 index 0000000..b4060b3 --- /dev/null +++ b/maps/blk/BaadonLeague1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BaadonLeague2F.blk b/maps/blk/BaadonLeague2F.blk new file mode 100644 index 0000000..444e479 --- /dev/null +++ b/maps/blk/BaadonLeague2F.blk @@ -0,0 +1 @@ +=====@A<B@:===<<B@==;>==:@::A<;;:C;
\ No newline at end of file diff --git a/maps/blk/BaadonMart.blk b/maps/blk/BaadonMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/BaadonMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/BaadonPokecenter1F.blk b/maps/blk/BaadonPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/BaadonPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BaadonPokecenter2F.blk b/maps/blk/BaadonPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/BaadonPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/BaadonRoute1.blk b/maps/blk/BaadonRoute1.blk new file mode 100644 index 0000000..95f2f31 --- /dev/null +++ b/maps/blk/BaadonRoute1.blk @@ -0,0 +1 @@ +///></////AB@A////;;;;////;;;;.////66))////.))////%%;;////666;;////;;////*;;;;////*6666////////AAAAA//////////////////////999/////////////99/////;;;AA////;;;////////////////////////AAAPQR////TUV// k TUVk
\ No newline at end of file diff --git a/maps/blk/BaadonRoute2.blk b/maps/blk/BaadonRoute2.blk new file mode 100644 index 0000000..228c9f6 --- /dev/null +++ b/maps/blk/BaadonRoute2.blk @@ -0,0 +1 @@ +///////////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/>/////////////////////AB//////////////////////////////////////////////////////////////////////////9:////////////////////////////999999999999999999999999999999999999999999999999//////////////////////////////////////////////////
\ No newline at end of file diff --git a/maps/blk/BaadonRoute3.blk b/maps/blk/BaadonRoute3.blk new file mode 100644 index 0000000..3b98916 --- /dev/null +++ b/maps/blk/BaadonRoute3.blk @@ -0,0 +1 @@ +899999999:@------->*;;;*>//5;;;*>//;:99999//;>///////;>/////8&>/////(*;>/////vw;>/////z{;>/////z{;>/////z{;>/////z{;>/////z{;////z{APQRA///z{TUVz{TUV
\ No newline at end of file diff --git a/maps/blk/BaadonRouteGateNewtype.blk b/maps/blk/BaadonRouteGateNewtype.blk new file mode 100644 index 0000000..0ba6b01 --- /dev/null +++ b/maps/blk/BaadonRouteGateNewtype.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/BaadonRouteGateWest.blk b/maps/blk/BaadonRouteGateWest.blk new file mode 100644 index 0000000..0ba6b01 --- /dev/null +++ b/maps/blk/BaadonRouteGateWest.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/BaadonWallpaperHouse.blk b/maps/blk/BaadonWallpaperHouse.blk new file mode 100644 index 0000000..3cee918 --- /dev/null +++ b/maps/blk/BaadonWallpaperHouse.blk @@ -0,0 +1 @@ +%% $
\ No newline at end of file diff --git a/maps/blk/BullForest.blk b/maps/blk/BullForest.blk new file mode 100644 index 0000000..9ad1681 --- /dev/null +++ b/maps/blk/BullForest.blk @@ -0,0 +1 @@ +uyv{w///:99///////y}~{//AB/////////}~s~/////////// //>///////A >d/////AAABdd d///// /////// 89///////</////////
/////// r////// //////AAA A//A////////////////////////////////////////////////////////////////////////////////////
\ No newline at end of file diff --git a/maps/blk/BullForestRoute1.blk b/maps/blk/BullForestRoute1.blk new file mode 100644 index 0000000..8b071f7 --- /dev/null +++ b/maps/blk/BullForestRoute1.blk @@ -0,0 +1 @@ +!!!!!!!!!!!!!!!!!!!"/////!!MMMMMMMMMMMMMMMMMk/////!J!g c!!!![![!!!!!"/!J!"+ !!!!!_!!!!!!"/!J!S W!!L![![!g$22%!J!!!!!!!!!!_!!"(;;;;899PQR999:c[![!"(;;;;;;//<TUV>kEEEEEk////////<TUV> !!!!!"////////
\ No newline at end of file diff --git a/maps/blk/BullForestRoute1House.blk b/maps/blk/BullForestRoute1House.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/BullForestRoute1House.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BullForestRoute2.blk b/maps/blk/BullForestRoute2.blk new file mode 100644 index 0000000..712f222 --- /dev/null +++ b/maps/blk/BullForestRoute2.blk @@ -0,0 +1 @@ +//////////AB@A///></)><))>;;;;;(<))>;;;(<))>;;;;;(<))>;;;(<))>;;;;;(<))>;;;(<))>;;;;;(<))>;;;(<))>;;;;;(<))>;;;(<))>;;;;;(<))>;;;(<))>;;;;;(<))>;;;(<))>;;;;; <)//;;;////;;;;;////////////////APQRAA//TUVTUV
\ No newline at end of file diff --git a/maps/blk/BullForestRoute3.blk b/maps/blk/BullForestRoute3.blk new file mode 100644 index 0000000..66f48ab --- /dev/null +++ b/maps/blk/BullForestRoute3.blk @@ -0,0 +1 @@ +!!!J!!H!!!!JEE!!EEH!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!vvvvn_![H!zzzz{D_[H!zzzz{![NH!zzzz{__!H!~~~~_[[H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!JEEEEH!!J!J!!!!H!!J!J!!!!H!!JMN!!MMH!!J!J!!H!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!
\ No newline at end of file diff --git a/maps/blk/BullForestRouteGateStand.blk b/maps/blk/BullForestRouteGateStand.blk new file mode 100644 index 0000000..0ba6b01 --- /dev/null +++ b/maps/blk/BullForestRouteGateStand.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/BullHouse1.blk b/maps/blk/BullHouse1.blk new file mode 100644 index 0000000..923d6f0 --- /dev/null +++ b/maps/blk/BullHouse1.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BullHouse2.blk b/maps/blk/BullHouse2.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/BullHouse2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BullHouse3.blk b/maps/blk/BullHouse3.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/BullHouse3.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BullHouse4.blk b/maps/blk/BullHouse4.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/BullHouse4.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BullLeague1F.blk b/maps/blk/BullLeague1F.blk new file mode 100644 index 0000000..b4060b3 --- /dev/null +++ b/maps/blk/BullLeague1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BullLeague2F.blk b/maps/blk/BullLeague2F.blk new file mode 100644 index 0000000..36bbe14 --- /dev/null +++ b/maps/blk/BullLeague2F.blk @@ -0,0 +1 @@ +PLQRLRMMMRLNLOLQOLNSSSRPLQLPRSQQLSQ
\ No newline at end of file diff --git a/maps/blk/BullMart.blk b/maps/blk/BullMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/BullMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/BullPokecenter1F.blk b/maps/blk/BullPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/BullPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/BullPokecenter2F.blk b/maps/blk/BullPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/BullPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/CaveMinecarts1.blk b/maps/blk/CaveMinecarts1.blk new file mode 100644 index 0000000..2d940be --- /dev/null +++ b/maps/blk/CaveMinecarts1.blk @@ -0,0 +1,2 @@ + + 6 3
7 &
& '
' ' $("("# ) 3 ) ,* % * ! -+ + +..../001.27
\ No newline at end of file diff --git a/maps/blk/CaveMinecarts2.blk b/maps/blk/CaveMinecarts2.blk new file mode 100644 index 0000000..91d989c --- /dev/null +++ b/maps/blk/CaveMinecarts2.blk @@ -0,0 +1 @@ +H QMINL4 LK) ) O ) )JL) PR QSSSSSSSSST L
\ No newline at end of file diff --git a/maps/blk/CaveMinecarts3.blk b/maps/blk/CaveMinecarts3.blk new file mode 100644 index 0000000..91d989c --- /dev/null +++ b/maps/blk/CaveMinecarts3.blk @@ -0,0 +1 @@ +H QMINL4 LK) ) O ) )JL) PR QSSSSSSSSST L
\ No newline at end of file diff --git a/maps/blk/CaveMinecarts4.blk b/maps/blk/CaveMinecarts4.blk new file mode 100644 index 0000000..fda3a95 --- /dev/null +++ b/maps/blk/CaveMinecarts4.blk @@ -0,0 +1,2 @@ +9: + \; 8
\; lpm
ibj \; nqo
k \=aabaaae`be \]]]]]]]<9]]]> _ f]]]]_ % `abaahgf]]_dcK `be\]`abj ^^
\ No newline at end of file diff --git a/maps/blk/CaveMinecarts5.blk b/maps/blk/CaveMinecarts5.blk new file mode 100644 index 0000000..31ba890 --- /dev/null +++ b/maps/blk/CaveMinecarts5.blk @@ -0,0 +1 @@ + lm @3
lm @
lm @
@
@L
@B
@
@
nAo @
@
@
l? $m @
@K W
@W
nAAAAAAAAAo nAo
\ No newline at end of file diff --git a/maps/blk/CaveMinecarts6.blk b/maps/blk/CaveMinecarts6.blk new file mode 100644 index 0000000..36788e6 --- /dev/null +++ b/maps/blk/CaveMinecarts6.blk @@ -0,0 +1 @@ + 6@ @ @ @ @KCp?X 4
\ No newline at end of file diff --git a/maps/blk/CaveMinecarts7.blk b/maps/blk/CaveMinecarts7.blk new file mode 100644 index 0000000..bbafdd4 --- /dev/null +++ b/maps/blk/CaveMinecarts7.blk @@ -0,0 +1 @@ +9FFFFFFFF<\ x]GxG]]>\x]] Gx]x>\ ]]]]]]]>\]] ]>\]] _ f ]>\ ]
c ]>\x] `be ]>\]] ]>D^^^^^^^^E
\ No newline at end of file diff --git a/maps/blk/Fonto.blk b/maps/blk/Fonto.blk new file mode 100644 index 0000000..daeb894 --- /dev/null +++ b/maps/blk/Fonto.blk @@ -0,0 +1 @@ +/////////
KKKK//KKKde// *hijK/KK*lm3K%%//K/+KK
//AAAAAAA/ //
\ No newline at end of file diff --git a/maps/blk/FontoHouse.blk b/maps/blk/FontoHouse.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/FontoHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/FontoLab.blk b/maps/blk/FontoLab.blk new file mode 100644 index 0000000..a358ac9 --- /dev/null +++ b/maps/blk/FontoLab.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/blk/FontoMart.blk b/maps/blk/FontoMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/FontoMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/FontoPokecenter1F.blk b/maps/blk/FontoPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/FontoPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/FontoPokecenter2F.blk b/maps/blk/FontoPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/FontoPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/FontoRocketHouse.blk b/maps/blk/FontoRocketHouse.blk new file mode 100644 index 0000000..8f3b907 --- /dev/null +++ b/maps/blk/FontoRocketHouse.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/blk/FontoRoute1.blk b/maps/blk/FontoRoute1.blk new file mode 100644 index 0000000..a90f189 --- /dev/null +++ b/maps/blk/FontoRoute1.blk @@ -0,0 +1 @@ +yzzzzzz{!!!!!!!!!!!!!!!!!!!!!!!!!}~~~~~~MMMMMMMMMMMMMMMMMMMMMMM!!>01; H!!!!!!!!!!!!!!!!!!!!!J!!]]]^1; H!!!!!!!!!!!!!!!!!!!!!JMMaaab LMMMMMMMMMMMMMMMMMMM!!J!!>;;;!!!!!!!!!!!!!J!!>01;;;;>EEEEEEEEEEE!!JEEuvvvvvvvvvvvvvvvwEEEEEEEEEEEEEE!!yzzzzzzzzzzzzzzz{!!!!!!!!!!!!!!!!
\ No newline at end of file diff --git a/maps/blk/FontoRoute2.blk b/maps/blk/FontoRoute2.blk new file mode 100644 index 0000000..ef62cf7 --- /dev/null +++ b/maps/blk/FontoRoute2.blk @@ -0,0 +1 @@ +!!!!!!!!!!MMMMMMMM!!!!!!!!!J!!!!!!!!!J!!!!!!!!!J!!!!!!!!!J!!!!!!!!!J!!EF!!!!!J!!!J!!!!!J!!!J!!!!!J!!!J!!!!!J!!!J!!!!!J!!!J!!!!!J!!!J!"899:!J!"<>!J!"<>99<AB<<
\ No newline at end of file diff --git a/maps/blk/FontoRoute3.blk b/maps/blk/FontoRoute3.blk new file mode 100644 index 0000000..06622fe --- /dev/null +++ b/maps/blk/FontoRoute3.blk @@ -0,0 +1 @@ +//uvvvvvvvw////!!!!!!!!!!//}~~~~~~~////MMMMMMMMMM/*----$%($*>!!!!!!!!!!/.(4%((%%4-$*>!!!!!!!!!!(%(--($%4$>MMMMM!!!!!$%,*5($%4(4--*/&--,*%4(%(%%4-->!!!!!//uvvvvvvvvvvvw////:EEEEE//}~~~~~~~~~~~>!!!!!
\ No newline at end of file diff --git a/maps/blk/FontoRoute4.blk b/maps/blk/FontoRoute4.blk new file mode 100644 index 0000000..213f24a --- /dev/null +++ b/maps/blk/FontoRoute4.blk @@ -0,0 +1 @@ +!!!!!!!!!!MMMMMMMM!!!!!!!!!J!!!!!!!!!J!!!!!!!!!J!!!!!J!!MM!!!!J!!!J!!!!J!!MNMM!!J!!//;:!!J!!//;>!!J!!//;>!!J!!//;>!!J!!//;>!!JMM//;99://APQRABTUVTUV
\ No newline at end of file diff --git a/maps/blk/FontoRoute5.blk b/maps/blk/FontoRoute5.blk new file mode 100644 index 0000000..b26250d --- /dev/null +++ b/maps/blk/FontoRoute5.blk @@ -0,0 +1 @@ +!!!!!!!!!!!!MMMMMMMM!J!!!!!!!!!J!!!!!!!!!J!!!!!!!!!J!!!!!!!!!J!!!!!!!!!J!!!!!JEE!J!!!!!J!!!J!!!!!J!!!J!!!!!J!!!J!!!!!J!!!J!!!!!J!!>9999:>????>>APQRABTUVTUV
\ No newline at end of file diff --git a/maps/blk/FontoRoute6.blk b/maps/blk/FontoRoute6.blk new file mode 100644 index 0000000..50a0dec --- /dev/null +++ b/maps/blk/FontoRoute6.blk @@ -0,0 +1 @@ +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
\ No newline at end of file diff --git a/maps/blk/FontoRouteGate1.blk b/maps/blk/FontoRouteGate1.blk new file mode 100644 index 0000000..ac08a0a --- /dev/null +++ b/maps/blk/FontoRouteGate1.blk @@ -0,0 +1,2 @@ +
+ diff --git a/maps/blk/FontoRouteGate2.blk b/maps/blk/FontoRouteGate2.blk new file mode 100644 index 0000000..0ba6b01 --- /dev/null +++ b/maps/blk/FontoRouteGate2.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/FontoRouteGate3.blk b/maps/blk/FontoRouteGate3.blk new file mode 100644 index 0000000..0ba6b01 --- /dev/null +++ b/maps/blk/FontoRouteGate3.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/Haiteku.blk b/maps/blk/Haiteku.blk new file mode 100644 index 0000000..9c0ed26 --- /dev/null +++ b/maps/blk/Haiteku.blk @@ -0,0 +1,4 @@ +//[!!!!!!J!!H!!!!!!///[!!!!!J!!H!!!!!!// !!!!!J!!H!!!!!!////AAABA'@AAA/[!<//[99/)/ $%&)/ /AA + + +) W//B 'A
,-.) ! @AAA !!S /A/8/[!!!_//////</ !!//@'/ !_' !"<CAAAAAAAB W!"@AAAB f e W!!S W!J!!H!!!!!!!!!!!!!!!J!!H!!!!!!
\ No newline at end of file diff --git a/maps/blk/HaitekuAquarium1F.blk b/maps/blk/HaitekuAquarium1F.blk new file mode 100644 index 0000000..7df5533 --- /dev/null +++ b/maps/blk/HaitekuAquarium1F.blk @@ -0,0 +1 @@ + !
\ No newline at end of file diff --git a/maps/blk/HaitekuAquarium2F.blk b/maps/blk/HaitekuAquarium2F.blk new file mode 100644 index 0000000..3e74655 --- /dev/null +++ b/maps/blk/HaitekuAquarium2F.blk @@ -0,0 +1 @@ +!!"! diff --git a/maps/blk/HaitekuHouse1.blk b/maps/blk/HaitekuHouse1.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/HaitekuHouse1.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/HaitekuHouse2.blk b/maps/blk/HaitekuHouse2.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/HaitekuHouse2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/HaitekuImposterOakHouse.blk b/maps/blk/HaitekuImposterOakHouse.blk new file mode 100644 index 0000000..9acf892 --- /dev/null +++ b/maps/blk/HaitekuImposterOakHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/HaitekuLeague1F.blk b/maps/blk/HaitekuLeague1F.blk new file mode 100644 index 0000000..b4060b3 --- /dev/null +++ b/maps/blk/HaitekuLeague1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/HaitekuLeague2F.blk b/maps/blk/HaitekuLeague2F.blk new file mode 100644 index 0000000..9326b70 --- /dev/null +++ b/maps/blk/HaitekuLeague2F.blk @@ -0,0 +1 @@ +5777639894/.1/.,111-/002-/002-,111-
\ No newline at end of file diff --git a/maps/blk/HaitekuMart.blk b/maps/blk/HaitekuMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/HaitekuMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/HaitekuPokecenter1F.blk b/maps/blk/HaitekuPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/HaitekuPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/HaitekuPokecenter2F.blk b/maps/blk/HaitekuPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/HaitekuPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/HaitekuWestRoute.blk b/maps/blk/HaitekuWestRoute.blk new file mode 100644 index 0000000..ab728ef --- /dev/null +++ b/maps/blk/HaitekuWestRoute.blk @@ -0,0 +1 @@ +AAAAAAAAAAAAAAAAAAAAAAA;;;;dd;;<>AA//(*////////*/;./,;</(;*////;;//(;*///(;/(*////;*(;//;&/$;<d;;;dddd;;<9999999999999999999999999
\ No newline at end of file diff --git a/maps/blk/HaitekuWestRouteGate.blk b/maps/blk/HaitekuWestRouteGate.blk new file mode 100644 index 0000000..0ba6b01 --- /dev/null +++ b/maps/blk/HaitekuWestRouteGate.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/HaitekuWestRouteOcean.blk b/maps/blk/HaitekuWestRouteOcean.blk new file mode 100644 index 0000000..84d4ca7 --- /dev/null +++ b/maps/blk/HaitekuWestRouteOcean.blk @@ -0,0 +1 @@ +)))))))))))PQR)))))TUV))))TUV)))))AXYZA))vwuvz{66666yzz{yzz{66666yzz{yzz{66666yzz{yzz{66666yz~ yz!J yz!J!!! yz!J!!! yz!JMMM }~!J!!!H!!J!!!MMMH!!JEE! @A!J!!! <!J!!! <jNjjj > <>))))))<99999999
\ No newline at end of file diff --git a/maps/blk/Kanto.blk b/maps/blk/Kanto.blk new file mode 100644 index 0000000..f9c90c7 --- /dev/null +++ b/maps/blk/Kanto.blk @@ -0,0 +1,4 @@ +/////////////}x}~t/////////DEF///}~~~
///uw//HIJ<<y{//AAA</////}~~//////////////////////////////// //////////////////e//////////////////'//////eeeeeeeec//////
<///
f
/]]]^/<//eeeeg/aaab///////////////////
/////9<>9/////////<>//////////////>999999</////////////> + + <//////////><////////////>'DEF<//////////////>))HJ<//////////////>'<>A / + //> )))< kW!!"/>@ "=====< W!!!!k!!!"AAA/ " W!!!!!kkkkk ////// kk W!!!!!!!!!!!!!!!S
\ No newline at end of file diff --git a/maps/blk/KantoCeladonElevator.blk b/maps/blk/KantoCeladonElevator.blk new file mode 100644 index 0000000..2a0fe57 --- /dev/null +++ b/maps/blk/KantoCeladonElevator.blk @@ -0,0 +1 @@ +&%
\ No newline at end of file diff --git a/maps/blk/KantoCeladonMart1F.blk b/maps/blk/KantoCeladonMart1F.blk new file mode 100644 index 0000000..06ddb4d --- /dev/null +++ b/maps/blk/KantoCeladonMart1F.blk @@ -0,0 +1,2 @@ + +
%
\ No newline at end of file diff --git a/maps/blk/KantoCeladonMart2F.blk b/maps/blk/KantoCeladonMart2F.blk new file mode 100644 index 0000000..e5a6605 --- /dev/null +++ b/maps/blk/KantoCeladonMart2F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoCeladonMart3F.blk b/maps/blk/KantoCeladonMart3F.blk new file mode 100644 index 0000000..f7c657e --- /dev/null +++ b/maps/blk/KantoCeladonMart3F.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/blk/KantoCeladonMart4F.blk b/maps/blk/KantoCeladonMart4F.blk new file mode 100644 index 0000000..540dc4c --- /dev/null +++ b/maps/blk/KantoCeladonMart4F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoCeladonMart5F.blk b/maps/blk/KantoCeladonMart5F.blk new file mode 100644 index 0000000..447ad4d --- /dev/null +++ b/maps/blk/KantoCeladonMart5F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoCeruleanHouse.blk b/maps/blk/KantoCeruleanHouse.blk new file mode 100644 index 0000000..2e78955 --- /dev/null +++ b/maps/blk/KantoCeruleanHouse.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/blk/KantoDiner.blk b/maps/blk/KantoDiner.blk new file mode 100644 index 0000000..0e5ed4b --- /dev/null +++ b/maps/blk/KantoDiner.blk @@ -0,0 +1 @@ +####
\ No newline at end of file diff --git a/maps/blk/KantoEastRoute.blk b/maps/blk/KantoEastRoute.blk new file mode 100644 index 0000000..62c82e6 --- /dev/null +++ b/maps/blk/KantoEastRoute.blk @@ -0,0 +1 @@ +///////////>/\]^//<///AAAAAAAAAB\]^@/AB////XYZ//////899:////<///>/9:@AAB///////////////////////////
\ No newline at end of file diff --git a/maps/blk/KantoEldersHouse.blk b/maps/blk/KantoEldersHouse.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/KantoEldersHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoFishingGuru.blk b/maps/blk/KantoFishingGuru.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/KantoFishingGuru.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoGameCorner.blk b/maps/blk/KantoGameCorner.blk new file mode 100644 index 0000000..df126bb --- /dev/null +++ b/maps/blk/KantoGameCorner.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoGameCornerPrizes.blk b/maps/blk/KantoGameCornerPrizes.blk new file mode 100644 index 0000000..c069bf9 --- /dev/null +++ b/maps/blk/KantoGameCornerPrizes.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoGamefreakHQ1.blk b/maps/blk/KantoGamefreakHQ1.blk new file mode 100644 index 0000000..fa26b13 --- /dev/null +++ b/maps/blk/KantoGamefreakHQ1.blk @@ -0,0 +1 @@ +#
!"
\ No newline at end of file diff --git a/maps/blk/KantoGamefreakHQ2.blk b/maps/blk/KantoGamefreakHQ2.blk new file mode 100644 index 0000000..6e09a15 --- /dev/null +++ b/maps/blk/KantoGamefreakHQ2.blk @@ -0,0 +1 @@ +#
\ No newline at end of file diff --git a/maps/blk/KantoGamefreakHQ3.blk b/maps/blk/KantoGamefreakHQ3.blk new file mode 100644 index 0000000..f26a916 --- /dev/null +++ b/maps/blk/KantoGamefreakHQ3.blk @@ -0,0 +1 @@ +#
\ No newline at end of file diff --git a/maps/blk/KantoGamefreakHQ4.blk b/maps/blk/KantoGamefreakHQ4.blk new file mode 100644 index 0000000..e5908b7 --- /dev/null +++ b/maps/blk/KantoGamefreakHQ4.blk @@ -0,0 +1 @@ +% & "# $ ! $ !
\ No newline at end of file diff --git a/maps/blk/KantoGamefreakHQ5.blk b/maps/blk/KantoGamefreakHQ5.blk new file mode 100644 index 0000000..189cf67 --- /dev/null +++ b/maps/blk/KantoGamefreakHQ5.blk @@ -0,0 +1,2 @@ +! +
\ No newline at end of file diff --git a/maps/blk/KantoGreensHouse1F.blk b/maps/blk/KantoGreensHouse1F.blk new file mode 100644 index 0000000..5fbd05e --- /dev/null +++ b/maps/blk/KantoGreensHouse1F.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/blk/KantoGreensHouse2F.blk b/maps/blk/KantoGreensHouse2F.blk new file mode 100644 index 0000000..5b68e93 --- /dev/null +++ b/maps/blk/KantoGreensHouse2F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoHospital.blk b/maps/blk/KantoHospital.blk new file mode 100644 index 0000000..f9dc77b --- /dev/null +++ b/maps/blk/KantoHospital.blk @@ -0,0 +1,2 @@ + +
%
\ No newline at end of file diff --git a/maps/blk/KantoLavenderHouse.blk b/maps/blk/KantoLavenderHouse.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/KantoLavenderHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoLeague1F.blk b/maps/blk/KantoLeague1F.blk new file mode 100644 index 0000000..b4060b3 --- /dev/null +++ b/maps/blk/KantoLeague1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoLeague21F.blk b/maps/blk/KantoLeague21F.blk new file mode 100644 index 0000000..b4060b3 --- /dev/null +++ b/maps/blk/KantoLeague21F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoLeague22F.blk b/maps/blk/KantoLeague22F.blk new file mode 100644 index 0000000..0883f4a --- /dev/null +++ b/maps/blk/KantoLeague22F.blk @@ -0,0 +1 @@ +UeeeUeVeVeY(((XY(((XY(((XeWWWeUUeUU
\ No newline at end of file diff --git a/maps/blk/KantoLeague2F.blk b/maps/blk/KantoLeague2F.blk new file mode 100644 index 0000000..0883f4a --- /dev/null +++ b/maps/blk/KantoLeague2F.blk @@ -0,0 +1 @@ +UeeeUeVeVeY(((XY(((XY(((XeWWWeUUeUU
\ No newline at end of file diff --git a/maps/blk/KantoMart.blk b/maps/blk/KantoMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/KantoMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/KantoOaksLab.blk b/maps/blk/KantoOaksLab.blk new file mode 100644 index 0000000..a14cbaa --- /dev/null +++ b/maps/blk/KantoOaksLab.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/blk/KantoPokecenter1F.blk b/maps/blk/KantoPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/KantoPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoPokecenter21F.blk b/maps/blk/KantoPokecenter21F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/KantoPokecenter21F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoPokecenter22F.blk b/maps/blk/KantoPokecenter22F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/KantoPokecenter22F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/KantoPokecenter2F.blk b/maps/blk/KantoPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/KantoPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/KantoRedsHouse.blk b/maps/blk/KantoRedsHouse.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/KantoRedsHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoSchool.blk b/maps/blk/KantoSchool.blk new file mode 100644 index 0000000..4450749 --- /dev/null +++ b/maps/blk/KantoSchool.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/KantoSilphCo.blk b/maps/blk/KantoSilphCo.blk new file mode 100644 index 0000000..8276215 --- /dev/null +++ b/maps/blk/KantoSilphCo.blk @@ -0,0 +1 @@ + !!!!!!!! ! ! """""
\ No newline at end of file diff --git a/maps/blk/KantoUnusedArea.blk b/maps/blk/KantoUnusedArea.blk new file mode 100644 index 0000000..990dc3c --- /dev/null +++ b/maps/blk/KantoUnusedArea.blk @@ -0,0 +1 @@ +$$
\ No newline at end of file diff --git a/maps/blk/KantoViridianHouse.blk b/maps/blk/KantoViridianHouse.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/KantoViridianHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/MtFuji.blk b/maps/blk/MtFuji.blk new file mode 100644 index 0000000..eed5797 --- /dev/null +++ b/maps/blk/MtFuji.blk @@ -0,0 +1 @@ +yy}~~~~~{{y}~~~~~~{}~~~~~~~~/////////////////////////------/
\ No newline at end of file diff --git a/maps/blk/MtFujiRoute.blk b/maps/blk/MtFujiRoute.blk new file mode 100644 index 0000000..2437a8a --- /dev/null +++ b/maps/blk/MtFujiRoute.blk @@ -0,0 +1 @@ +8999999:<><>@AAAAAAB
\ No newline at end of file diff --git a/maps/blk/Newtype.blk b/maps/blk/Newtype.blk new file mode 100644 index 0000000..9e04fec --- /dev/null +++ b/maps/blk/Newtype.blk @@ -0,0 +1 @@ +!!!!k!!!TUV!!k!!!!!!!!!!k!!!TUV!!k!!!!!!///99999XYZ999))))))////DEF)))/ /HIJ///OO///// #/ 89hi///// "/@'lj//))/ "//))89:( "//////DF>(/ "/'//////KJB(/ "/oo//////OOoooooo//// #/ooooooo//// "/oooo/// "ooo///8999:/ "/8999:ooo///<>/ "/<>////
\ No newline at end of file diff --git a/maps/blk/NewtypeDiner.blk b/maps/blk/NewtypeDiner.blk new file mode 100644 index 0000000..c8c147d --- /dev/null +++ b/maps/blk/NewtypeDiner.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/NewtypeDojo.blk b/maps/blk/NewtypeDojo.blk new file mode 100644 index 0000000..eef748d --- /dev/null +++ b/maps/blk/NewtypeDojo.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/NewtypeHouse1.blk b/maps/blk/NewtypeHouse1.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/NewtypeHouse1.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/NewtypeHouse2.blk b/maps/blk/NewtypeHouse2.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/NewtypeHouse2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/NewtypeHouse3.blk b/maps/blk/NewtypeHouse3.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/NewtypeHouse3.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/NewtypeLeague1F.blk b/maps/blk/NewtypeLeague1F.blk new file mode 100644 index 0000000..b4060b3 --- /dev/null +++ b/maps/blk/NewtypeLeague1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/NewtypeLeague2F.blk b/maps/blk/NewtypeLeague2F.blk new file mode 100644 index 0000000..f046577 --- /dev/null +++ b/maps/blk/NewtypeLeague2F.blk @@ -0,0 +1 @@ +DffDG
FhHDIghHDIghKEJgDffDE
E
\ No newline at end of file diff --git a/maps/blk/NewtypeMart.blk b/maps/blk/NewtypeMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/NewtypeMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/NewtypePokecenter1F.blk b/maps/blk/NewtypePokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/NewtypePokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/NewtypePokecenter2F.blk b/maps/blk/NewtypePokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/NewtypePokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/NewtypeRoute.blk b/maps/blk/NewtypeRoute.blk new file mode 100644 index 0000000..3973f11 --- /dev/null +++ b/maps/blk/NewtypeRoute.blk @@ -0,0 +1 @@ +yzzzzzzzzzzzzzzyt~~~~xt~~~~~~~}y{5y{667uw*6766}y{67%&;;/;;;;;y{/*;;;;;;;;;y{uvvvvvvvvvvzzvvyzzzzzzzzzzzzzz
\ No newline at end of file diff --git a/maps/blk/NewtypeRouteGate.blk b/maps/blk/NewtypeRouteGate.blk new file mode 100644 index 0000000..0ba6b01 --- /dev/null +++ b/maps/blk/NewtypeRouteGate.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/NewtypeSailorHouse.blk b/maps/blk/NewtypeSailorHouse.blk new file mode 100644 index 0000000..9acf892 --- /dev/null +++ b/maps/blk/NewtypeSailorHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/North.blk b/maps/blk/North.blk new file mode 100644 index 0000000..6517275 --- /dev/null +++ b/maps/blk/North.blk @@ -0,0 +1 @@ +!!!y}~{!!@AA}~s~AB// ///G */H",./HS ,-. kH!S WJkMMMM!!MMk
\ No newline at end of file diff --git a/maps/blk/NorthHouse1.blk b/maps/blk/NorthHouse1.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/NorthHouse1.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/NorthHouse2.blk b/maps/blk/NorthHouse2.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/NorthHouse2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/NorthMart.blk b/maps/blk/NorthMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/NorthMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/NorthPokecenter1F.blk b/maps/blk/NorthPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/NorthPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/NorthPokecenter2F.blk b/maps/blk/NorthPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/NorthPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/Office1.blk b/maps/blk/Office1.blk new file mode 100644 index 0000000..2cc3b05 --- /dev/null +++ b/maps/blk/Office1.blk @@ -0,0 +1,5 @@ +
+ + !"# + +
\ No newline at end of file diff --git a/maps/blk/Office2.blk b/maps/blk/Office2.blk new file mode 100644 index 0000000..d746f18 --- /dev/null +++ b/maps/blk/Office2.blk @@ -0,0 +1,11 @@ +
>?)***+******+ 8 9:9 + + <== + ,---. + ;; + + 61 /71/002 ( + 3,--3 + 4 4 ' ( 5,--5 + +$%&
\ No newline at end of file diff --git a/maps/blk/Office3.blk b/maps/blk/Office3.blk new file mode 100644 index 0000000..a90acc0 --- /dev/null +++ b/maps/blk/Office3.blk @@ -0,0 +1,9 @@ +
>?EFGHIJ R LMNK + OPQ + + + + + @BC DBA + +&
\ No newline at end of file diff --git a/maps/blk/OldCity.blk b/maps/blk/OldCity.blk new file mode 100644 index 0000000..b097bad --- /dev/null +++ b/maps/blk/OldCity.blk @@ -0,0 +1 @@ +///////// "////////////////// "////////////////// "////////////////// "//////////////jk// "//////////DEF/no:/ "/DEF//////HIJ9rs>* "/HKJ//////LMNw~>* "/LMN//////8 9+{> S 9+/////999< > !"//////9l999 [8/////+
///// ///////
//////jk///AA'A//////pq/AA<PQR>AAA////// ///TUV/////////////////TUV/////////
\ No newline at end of file diff --git a/maps/blk/OldCityBillsHouse.blk b/maps/blk/OldCityBillsHouse.blk new file mode 100644 index 0000000..323fe84 --- /dev/null +++ b/maps/blk/OldCityBillsHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/OldCityGym.blk b/maps/blk/OldCityGym.blk new file mode 100644 index 0000000..53298ca --- /dev/null +++ b/maps/blk/OldCityGym.blk @@ -0,0 +1,4 @@ + + + +
\ No newline at end of file diff --git a/maps/blk/OldCityHouse.blk b/maps/blk/OldCityHouse.blk new file mode 100644 index 0000000..923d6f0 --- /dev/null +++ b/maps/blk/OldCityHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/OldCityKurtsHouse.blk b/maps/blk/OldCityKurtsHouse.blk new file mode 100644 index 0000000..5879f0b --- /dev/null +++ b/maps/blk/OldCityKurtsHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/OldCityMart.blk b/maps/blk/OldCityMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/OldCityMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/OldCityMuseum.blk b/maps/blk/OldCityMuseum.blk new file mode 100644 index 0000000..5806366 --- /dev/null +++ b/maps/blk/OldCityMuseum.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/OldCityPokecenter1F.blk b/maps/blk/OldCityPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/OldCityPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/OldCityPokecenter2F.blk b/maps/blk/OldCityPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/OldCityPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/OldCityPokecenterBattle.blk b/maps/blk/OldCityPokecenterBattle.blk new file mode 100644 index 0000000..2366a43 --- /dev/null +++ b/maps/blk/OldCityPokecenterBattle.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/OldCityPokecenterTimeMachine.blk b/maps/blk/OldCityPokecenterTimeMachine.blk new file mode 100644 index 0000000..ccd07b6 --- /dev/null +++ b/maps/blk/OldCityPokecenterTimeMachine.blk @@ -0,0 +1 @@ + " " %!#######$########
\ No newline at end of file diff --git a/maps/blk/OldCityPokecenterTrade.blk b/maps/blk/OldCityPokecenterTrade.blk new file mode 100644 index 0000000..56e9374 --- /dev/null +++ b/maps/blk/OldCityPokecenterTrade.blk @@ -0,0 +1 @@ +" !
\ No newline at end of file diff --git a/maps/blk/OldCitySchool.blk b/maps/blk/OldCitySchool.blk new file mode 100644 index 0000000..4450749 --- /dev/null +++ b/maps/blk/OldCitySchool.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/OldCityTower1F.blk b/maps/blk/OldCityTower1F.blk new file mode 100644 index 0000000..8e62ed2 --- /dev/null +++ b/maps/blk/OldCityTower1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/OldCityTower2F.blk b/maps/blk/OldCityTower2F.blk new file mode 100644 index 0000000..a25e4a1 --- /dev/null +++ b/maps/blk/OldCityTower2F.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/blk/OldCityTower3F.blk b/maps/blk/OldCityTower3F.blk new file mode 100644 index 0000000..f1458c4 --- /dev/null +++ b/maps/blk/OldCityTower3F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/OldCityTower4F.blk b/maps/blk/OldCityTower4F.blk new file mode 100644 index 0000000..fcbda17 --- /dev/null +++ b/maps/blk/OldCityTower4F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/OldCityTower5F.blk b/maps/blk/OldCityTower5F.blk new file mode 100644 index 0000000..177059a --- /dev/null +++ b/maps/blk/OldCityTower5F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/PlayerHouse1F.blk b/maps/blk/PlayerHouse1F.blk new file mode 100644 index 0000000..8b85e15 --- /dev/null +++ b/maps/blk/PlayerHouse1F.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/blk/PlayerHouse2F.blk b/maps/blk/PlayerHouse2F.blk new file mode 100644 index 0000000..2a93fa0 --- /dev/null +++ b/maps/blk/PlayerHouse2F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/PowerPlant1.blk b/maps/blk/PowerPlant1.blk new file mode 100644 index 0000000..c853622 --- /dev/null +++ b/maps/blk/PowerPlant1.blk @@ -0,0 +1,7 @@ +
+ + + + + +
\ No newline at end of file diff --git a/maps/blk/PowerPlant2.blk b/maps/blk/PowerPlant2.blk new file mode 100644 index 0000000..d8a5646 --- /dev/null +++ b/maps/blk/PowerPlant2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/PowerPlant3.blk b/maps/blk/PowerPlant3.blk new file mode 100644 index 0000000..1f866a0 --- /dev/null +++ b/maps/blk/PowerPlant3.blk @@ -0,0 +1 @@ + "#####))$$$$$$$$EICF>!$%%%%%$ELLFL$$$$$$$@AADK$$$$< =$K$G'%%%$12223$CLD &&&8;;;9&&&&*$$$6:::7C?BB$%$12523$LJ@$$$-.4/0&&$&*(&&&&$$$$$$$$$$$$$$$C CHFB%%%%E$CJA@J@$BEEG$AD,GL@> + +
\ No newline at end of file diff --git a/maps/blk/PowerPlant4.blk b/maps/blk/PowerPlant4.blk new file mode 100644 index 0000000..7074b1d --- /dev/null +++ b/maps/blk/PowerPlant4.blk @@ -0,0 +1 @@ + ))AKI@HICL,$$$RADDDDDDD$a$$GLLJDDDD($$aa$&&T<=&&QE$$$$[ZZZ\C$JM&&&$6:::7AFP&*NLJC$12223GS$$N@@IL8;Y;9CJHJNBKJ$]^a^_&&&&*NLBA$$`$`$$$$$M&&&&&QaaaaaaaCCE$B$$$$$$$DJGL@OaaaaaaR
\ No newline at end of file diff --git a/maps/blk/Prince.blk b/maps/blk/Prince.blk new file mode 100644 index 0000000..38a4316 --- /dev/null +++ b/maps/blk/Prince.blk @@ -0,0 +1 @@ +yy}n~~~~{{y}~n~~~~{}~~n~~/> !"/// 9+// //////////------/
\ No newline at end of file diff --git a/maps/blk/PrinceRoute.blk b/maps/blk/PrinceRoute.blk new file mode 100644 index 0000000..f3a7340 --- /dev/null +++ b/maps/blk/PrinceRoute.blk @@ -0,0 +1 @@ +uvvvvvvvvwyzzzzzzzz{yzzzzzzzz{yzzzzzzzz{}~~~~~~~~
\ No newline at end of file diff --git a/maps/blk/Route15.blk b/maps/blk/Route15.blk new file mode 100644 index 0000000..fc3199b --- /dev/null +++ b/maps/blk/Route15.blk @@ -0,0 +1 @@ +z{TUV////////z{TUV////AAz{9XYZ/////;;@Az{76--//////;z{////(z{///////8z{;;;*////<z{/////////999z{/////////////
\ No newline at end of file diff --git a/maps/blk/Route15Pokecenter1F.blk b/maps/blk/Route15Pokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/Route15Pokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/Route15Pokecenter2F.blk b/maps/blk/Route15Pokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/Route15Pokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/Route18.blk b/maps/blk/Route18.blk new file mode 100644 index 0000000..1333d63 --- /dev/null +++ b/maps/blk/Route18.blk @@ -0,0 +1 @@ +vwTUVuvvz{TUVyzzz{AXYZAyzzz{uzzzz{yzzzz{);))yzzzz{3;))}sxzz{1;)002yzz{;011uzzz{uvvvzzzz{}~~~~xzz{;;))yzz{;;;)yzz{6678yzz{;;;@yzz{9yzz{66666yzz{yzzzvvvvwyzzt~~~~7yzz{yzz{66666yzz{;;;;;yzz{66666yzz{;;;;;;yzz{yzz{66666yzz{(yzz{(;;yzz{67/6;;yzz{---.;;yzz{yzz{66666yzz{yzz{;;;;;yzz{))));6yzz{;;;;;yzx{66666yzy{;;;;;yzy{;;;yz}66666yz;;;yz;;;yzvvvvvvvvzzzzzzzzzzzz
\ No newline at end of file diff --git a/maps/blk/Route18Pokecenter1F.blk b/maps/blk/Route18Pokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/Route18Pokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/Route18Pokecenter2F.blk b/maps/blk/Route18Pokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/Route18Pokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/Route1Gate1F.blk b/maps/blk/Route1Gate1F.blk new file mode 100644 index 0000000..0985b28 --- /dev/null +++ b/maps/blk/Route1Gate1F.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/Route1Gate2F.blk b/maps/blk/Route1Gate2F.blk new file mode 100644 index 0000000..f7deeab --- /dev/null +++ b/maps/blk/Route1Gate2F.blk @@ -0,0 +1 @@ +%%&
\ No newline at end of file diff --git a/maps/blk/Route1P1.blk b/maps/blk/Route1P1.blk new file mode 100644 index 0000000..75a0913 --- /dev/null +++ b/maps/blk/Route1P1.blk @@ -0,0 +1 @@ +///////////////vvvw/AAAAAA//vvw{/<//zt{//'@AA~z{;;~~~//66$%%8990%%;;(<//999999999999/////////////////
\ No newline at end of file diff --git a/maps/blk/Route1P2.blk b/maps/blk/Route1P2.blk new file mode 100644 index 0000000..e0284a4 --- /dev/null +++ b/maps/blk/Route1P2.blk @@ -0,0 +1 @@ +///TUV///////TUV///////XYZ////////////////////AA/// <> !!"<> !!!!!"<> !!!/>99<///>;;;uvv/>;///yuv/>2/uvzyz/>/uzzz}~/>/}~~~~~/>%%%%/99999999//////////
\ No newline at end of file diff --git a/maps/blk/Route2.blk b/maps/blk/Route2.blk new file mode 100644 index 0000000..fa42442 --- /dev/null +++ b/maps/blk/Route2.blk @@ -0,0 +1 @@ +>////////////]]]^/////////aaab////))</99:;;);</>;;;;;;;99>;;)999999999999///////////////////////////
\ No newline at end of file diff --git a/maps/blk/Route2Gate1F.blk b/maps/blk/Route2Gate1F.blk new file mode 100644 index 0000000..b06889e --- /dev/null +++ b/maps/blk/Route2Gate1F.blk @@ -0,0 +1,2 @@ +
+ diff --git a/maps/blk/Route2Gate2F.blk b/maps/blk/Route2Gate2F.blk new file mode 100644 index 0000000..f7deeab --- /dev/null +++ b/maps/blk/Route2Gate2F.blk @@ -0,0 +1 @@ +%%&
\ No newline at end of file diff --git a/maps/blk/Route2House.blk b/maps/blk/Route2House.blk new file mode 100644 index 0000000..de07e9d --- /dev/null +++ b/maps/blk/Route2House.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/RouteSilentEast.blk b/maps/blk/RouteSilentEast.blk new file mode 100644 index 0000000..db594cc --- /dev/null +++ b/maps/blk/RouteSilentEast.blk @@ -0,0 +1 @@ +//uvw//////////uvvvvvvvvvvvw//AB}~AAAAAAAAAA}~~~~~~~~~~~//////</;;; \]]9:;;;;;(&( !!!";;`aa/>;;;;;(5( !!!";;<//>AAAAAAAA;;;;;(%AAA !!!"AAA</////////////////////kkkkk/////// !!!!S W!!!"/////
\ No newline at end of file diff --git a/maps/blk/RouteSilentEastGate.blk b/maps/blk/RouteSilentEastGate.blk new file mode 100644 index 0000000..ac08a0a --- /dev/null +++ b/maps/blk/RouteSilentEastGate.blk @@ -0,0 +1,2 @@ +
+ diff --git a/maps/blk/RuinsOfAlphEntrance.blk b/maps/blk/RuinsOfAlphEntrance.blk new file mode 100644 index 0000000..d73427a --- /dev/null +++ b/maps/blk/RuinsOfAlphEntrance.blk @@ -0,0 +1 @@ +!,,,,"
)*+)
\ No newline at end of file diff --git a/maps/blk/RuinsOfAlphMain.blk b/maps/blk/RuinsOfAlphMain.blk new file mode 100644 index 0000000..6e0ec61 --- /dev/null +++ b/maps/blk/RuinsOfAlphMain.blk @@ -0,0 +1,4 @@ +! " '('(
%&%&
#$#$
+ '('(
'&%(
'$#(
'('(
'('(
'('(
+ '('(
'&%(
'$#(
'('(
%&%&
#$#$
+
\ No newline at end of file diff --git a/maps/blk/ShizukanaOka.blk b/maps/blk/ShizukanaOka.blk new file mode 100644 index 0000000..c66d560 --- /dev/null +++ b/maps/blk/ShizukanaOka.blk @@ -0,0 +1,74 @@ + + + + + + + + + +"# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + +
+ + + "# + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/maps/blk/SilentHill.blk b/maps/blk/SilentHill.blk new file mode 100644 index 0000000..ebd7759 --- /dev/null +++ b/maps/blk/SilentHill.blk @@ -0,0 +1,3 @@ +//AB@///> + 9:>'BABk//9 + 'r/>///999999///
\ No newline at end of file diff --git a/maps/blk/SilentHillHouse.blk b/maps/blk/SilentHillHouse.blk new file mode 100644 index 0000000..8e61d7b --- /dev/null +++ b/maps/blk/SilentHillHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/SilentHillLabBack.blk b/maps/blk/SilentHillLabBack.blk new file mode 100644 index 0000000..671e694 --- /dev/null +++ b/maps/blk/SilentHillLabBack.blk @@ -0,0 +1,2 @@ +&' +
\ No newline at end of file diff --git a/maps/blk/SilentHillLabFront.blk b/maps/blk/SilentHillLabFront.blk new file mode 100644 index 0000000..b9daa9d --- /dev/null +++ b/maps/blk/SilentHillLabFront.blk @@ -0,0 +1,2 @@ + $%$% +
\ No newline at end of file diff --git a/maps/blk/SilentHillPokecenter.blk b/maps/blk/SilentHillPokecenter.blk new file mode 100644 index 0000000..5003589 --- /dev/null +++ b/maps/blk/SilentHillPokecenter.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/SlowpokeWellEntrance.blk b/maps/blk/SlowpokeWellEntrance.blk new file mode 100644 index 0000000..3de108d --- /dev/null +++ b/maps/blk/SlowpokeWellEntrance.blk @@ -0,0 +1 @@ +vvutwwvvutwwvvutwwvvrswwvv wwv x xw x
\ No newline at end of file diff --git a/maps/blk/SlowpokeWellMain.blk b/maps/blk/SlowpokeWellMain.blk new file mode 100644 index 0000000..02bd937 --- /dev/null +++ b/maps/blk/SlowpokeWellMain.blk @@ -0,0 +1,2 @@ +lzzy@\ Gx \ -@\\ x\\-@x\\\\\\-@ \\\\ x-@] x >-@D^ xx]>-nAAA| +AAA}@{@{@{@{@{@{@{@{@{@{
\ No newline at end of file diff --git a/maps/blk/South.blk b/maps/blk/South.blk new file mode 100644 index 0000000..ee089c7 --- /dev/null +++ b/maps/blk/South.blk @@ -0,0 +1,3 @@ +///pqrspqrs///TUV//////t|vwt|vwTUV///xy~{xy~{AAAXYZAAA///|~~|~~></////pqrspqrs </////t|vwtuvw9
89/////xy~{xyz{ +/////|~~|}~/+/////////('\]^///////())/`aa///////(= +//////////+//////////AAAAAAB//////////////////////////////////////////////////PQR/////////////////TUV/////////////////TUV///
\ No newline at end of file diff --git a/maps/blk/SouthHouse1.blk b/maps/blk/SouthHouse1.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/SouthHouse1.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/SouthHouse2.blk b/maps/blk/SouthHouse2.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/SouthHouse2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/SouthMart.blk b/maps/blk/SouthMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/SouthMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/SouthPokecenter1F.blk b/maps/blk/SouthPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/SouthPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/SouthPokecenter2F.blk b/maps/blk/SouthPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/SouthPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/Stand.blk b/maps/blk/Stand.blk new file mode 100644 index 0000000..c13d41c --- /dev/null +++ b/maps/blk/Stand.blk @@ -0,0 +1 @@ +/////////////////////////////////$%&$%&////////////(*(*899/////////99+99+<//TUV//////9+9(TUV//////$%&,-XYZ///]]]^(**//aaab99+
////////899:
'//< >*//,--.--899999//////////////////////
DEF/////////l5HIJ/////////4/////////////////'A//
\ No newline at end of file diff --git a/maps/blk/StandHouse.blk b/maps/blk/StandHouse.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/StandHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/StandLab.blk b/maps/blk/StandLab.blk new file mode 100644 index 0000000..05be865 --- /dev/null +++ b/maps/blk/StandLab.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/StandLeague1F.blk b/maps/blk/StandLeague1F.blk new file mode 100644 index 0000000..b4060b3 --- /dev/null +++ b/maps/blk/StandLeague1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/StandLeague2F.blk b/maps/blk/StandLeague2F.blk new file mode 100644 index 0000000..0883f4a --- /dev/null +++ b/maps/blk/StandLeague2F.blk @@ -0,0 +1 @@ +UeeeUeVeVeY(((XY(((XY(((XeWWWeUUeUU
\ No newline at end of file diff --git a/maps/blk/StandMart.blk b/maps/blk/StandMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/StandMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/StandOffice.blk b/maps/blk/StandOffice.blk new file mode 100644 index 0000000..02d3709 --- /dev/null +++ b/maps/blk/StandOffice.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/StandPokecenter1F.blk b/maps/blk/StandPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/StandPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/StandPokecenter2F.blk b/maps/blk/StandPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/StandPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/StandRocketHouse1F.blk b/maps/blk/StandRocketHouse1F.blk new file mode 100644 index 0000000..26395df --- /dev/null +++ b/maps/blk/StandRocketHouse1F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/StandRocketHouse2F.blk b/maps/blk/StandRocketHouse2F.blk new file mode 100644 index 0000000..2e80edb --- /dev/null +++ b/maps/blk/StandRocketHouse2F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/StandRoute.blk b/maps/blk/StandRoute.blk new file mode 100644 index 0000000..76b0872 --- /dev/null +++ b/maps/blk/StandRoute.blk @@ -0,0 +1 @@ +></AB@A/><>;/;;/;<>;;;/;;<>//<>;;/;;;<>;;;/;;<>//<>;;/;;;<>;;;/;;<>//<>;;/;;;<>;;;/;;<>//<>;;/;;;<>;;;;;;<><>;;;;;;<>;;;/;;<>//<>;;/;;;<>;;;/;;<><>APQRAA<TUVTUV
\ No newline at end of file diff --git a/maps/blk/StandRouteGateKanto.blk b/maps/blk/StandRouteGateKanto.blk new file mode 100644 index 0000000..0ba6b01 --- /dev/null +++ b/maps/blk/StandRouteGateKanto.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/Sugar.blk b/maps/blk/Sugar.blk new file mode 100644 index 0000000..1efeaa5 --- /dev/null +++ b/maps/blk/Sugar.blk @@ -0,0 +1 @@ +DEEEEEEEEFH_89:uvvwcg8
A}t~KG<>KG<- KG<CBKG@ACB no B WJLMS WMN
\ No newline at end of file diff --git a/maps/blk/SugarHouse.blk b/maps/blk/SugarHouse.blk new file mode 100644 index 0000000..f717157 --- /dev/null +++ b/maps/blk/SugarHouse.blk @@ -0,0 +1 @@ + !
\ No newline at end of file diff --git a/maps/blk/SugarHouse2.blk b/maps/blk/SugarHouse2.blk new file mode 100644 index 0000000..923d6f0 --- /dev/null +++ b/maps/blk/SugarHouse2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/SugarMart.blk b/maps/blk/SugarMart.blk new file mode 100644 index 0000000..dd7ef2a --- /dev/null +++ b/maps/blk/SugarMart.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/SugarPokecenter1F.blk b/maps/blk/SugarPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/SugarPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/SugarPokecenter2F.blk b/maps/blk/SugarPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/SugarPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/SugarRoute.blk b/maps/blk/SugarRoute.blk new file mode 100644 index 0000000..dadb2be --- /dev/null +++ b/maps/blk/SugarRoute.blk @@ -0,0 +1 @@ +kk!!!!!!kk!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J_[!!H!!JS W!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!JhhhhhhH!!J!!!!!!H!!J!!!!!!H!!J!!_[H!!J!!S WH!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!!H!!J!!!!!MH!!_@PQRB[H!!"TUV H!!S TUV WH!
\ No newline at end of file diff --git a/maps/blk/SugarRouteGate.blk b/maps/blk/SugarRouteGate.blk new file mode 100644 index 0000000..0ba6b01 --- /dev/null +++ b/maps/blk/SugarRouteGate.blk @@ -0,0 +1,2 @@ +
+
\ No newline at end of file diff --git a/maps/blk/UnusedMap13.blk b/maps/blk/UnusedMap13.blk new file mode 100644 index 0000000..500b0c7 --- /dev/null +++ b/maps/blk/UnusedMap13.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/West.blk b/maps/blk/West.blk new file mode 100644 index 0000000..d66bcea --- /dev/null +++ b/maps/blk/West.blk @@ -0,0 +1,2 @@ +!!!!!"TUV !!!!!!!!!8"TUV pqps!!!!DG<de:XYZ8tuvw9:!!H"@A??'B???<xyz{/>OOOOO????????@'??A89KK[K#@/hiA(?????<!!H!S </lm>? +A?\]]!!H!8999? ?`aa!!H!"<//???????<!!H!"</ ??///!!H!"@/????AAAAA//!!H!S @AAAAAB ///!!H!!S W!!J //!!DEF!!!!!!!!!DEFS /!!LMNMMMMMMMMMLMN!S !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
\ No newline at end of file diff --git a/maps/blk/WestGym.blk b/maps/blk/WestGym.blk new file mode 100644 index 0000000..b972334 --- /dev/null +++ b/maps/blk/WestGym.blk @@ -0,0 +1 @@ +###!((("!(((+!&%'"!&$'"*((("*)()+
\ No newline at end of file diff --git a/maps/blk/WestHouse1.blk b/maps/blk/WestHouse1.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/WestHouse1.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/WestHouse2.blk b/maps/blk/WestHouse2.blk new file mode 100644 index 0000000..3a80d96 --- /dev/null +++ b/maps/blk/WestHouse2.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/WestMart1F.blk b/maps/blk/WestMart1F.blk new file mode 100644 index 0000000..06ddb4d --- /dev/null +++ b/maps/blk/WestMart1F.blk @@ -0,0 +1,2 @@ + +
%
\ No newline at end of file diff --git a/maps/blk/WestMart2F.blk b/maps/blk/WestMart2F.blk new file mode 100644 index 0000000..e5a6605 --- /dev/null +++ b/maps/blk/WestMart2F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/WestMart3F.blk b/maps/blk/WestMart3F.blk new file mode 100644 index 0000000..f7c657e --- /dev/null +++ b/maps/blk/WestMart3F.blk @@ -0,0 +1,2 @@ + +
\ No newline at end of file diff --git a/maps/blk/WestMart4F.blk b/maps/blk/WestMart4F.blk new file mode 100644 index 0000000..540dc4c --- /dev/null +++ b/maps/blk/WestMart4F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/WestMart5F.blk b/maps/blk/WestMart5F.blk new file mode 100644 index 0000000..447ad4d --- /dev/null +++ b/maps/blk/WestMart5F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/WestMart6F.blk b/maps/blk/WestMart6F.blk new file mode 100644 index 0000000..55fa67e --- /dev/null +++ b/maps/blk/WestMart6F.blk @@ -0,0 +1 @@ +!!
\ No newline at end of file diff --git a/maps/blk/WestMartElevator.blk b/maps/blk/WestMartElevator.blk new file mode 100644 index 0000000..2a0fe57 --- /dev/null +++ b/maps/blk/WestMartElevator.blk @@ -0,0 +1 @@ +&%
\ No newline at end of file diff --git a/maps/blk/WestPokecenter1F.blk b/maps/blk/WestPokecenter1F.blk new file mode 100644 index 0000000..d861b25 --- /dev/null +++ b/maps/blk/WestPokecenter1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/WestPokecenter2F.blk b/maps/blk/WestPokecenter2F.blk new file mode 100644 index 0000000..cb1d07a --- /dev/null +++ b/maps/blk/WestPokecenter2F.blk @@ -0,0 +1,3 @@ + + +
\ No newline at end of file diff --git a/maps/blk/WestRadioTower1F.blk b/maps/blk/WestRadioTower1F.blk new file mode 100644 index 0000000..49aa4c7 --- /dev/null +++ b/maps/blk/WestRadioTower1F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/WestRadioTower2F.blk b/maps/blk/WestRadioTower2F.blk new file mode 100644 index 0000000..1a37166 --- /dev/null +++ b/maps/blk/WestRadioTower2F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/WestRadioTower3F.blk b/maps/blk/WestRadioTower3F.blk new file mode 100644 index 0000000..bbecb5f --- /dev/null +++ b/maps/blk/WestRadioTower3F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/WestRadioTower4F.blk b/maps/blk/WestRadioTower4F.blk new file mode 100644 index 0000000..b728241 --- /dev/null +++ b/maps/blk/WestRadioTower4F.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/blk/WestRadioTower5F.blk b/maps/blk/WestRadioTower5F.blk new file mode 100644 index 0000000..13d970e --- /dev/null +++ b/maps/blk/WestRadioTower5F.blk @@ -0,0 +1 @@ + " !
\ No newline at end of file diff --git a/maps/blk/WestRocketRaidedHouse.blk b/maps/blk/WestRocketRaidedHouse.blk new file mode 100644 index 0000000..9acf892 --- /dev/null +++ b/maps/blk/WestRocketRaidedHouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/dummy_text_pointers.asm b/maps/dummy_text_pointers.asm new file mode 100644 index 0000000..5d66925 --- /dev/null +++ b/maps/dummy_text_pointers.asm @@ -0,0 +1,52 @@ +INCLUDE "constants.asm" + +SECTION "maps/dummy_text_pointers.asm", ROMX +; d8000 (36:4000) +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
\ No newline at end of file diff --git a/pokegold-spaceworld.link b/pokegold-spaceworld.link new file mode 100644 index 0000000..1f24ae7 --- /dev/null +++ b/pokegold-spaceworld.link @@ -0,0 +1,979 @@ +; Automatically generated by map2link.py +ROM0 + "home/rst.asm@rst00" + ; $0001 + org $0008 + "home/rst.asm@rst08" + ; $0009 + org $0010 + "home/rst.asm@rst10" + ; $0011 + org $0018 + "home/rst.asm@rst18" + ; $0019 + org $0020 + "home/rst.asm@rst20" + ; $0021 + org $0028 + "home/rst.asm@rst28" + ; $0029 + org $0030 + "home/rst.asm@rst30" + ; $0031 + org $0038 + "home/rst.asm@rst38" + ; $003b + org $0040 + "home/interrupts.asm@VBlank interrupt vector" + ; $0043 + org $0048 + "home/interrupts.asm@LCD interrupt vector" + ; $004b + org $0050 + "home/interrupts.asm@Timer interrupt vector" + ; $0053 + org $0058 + "home/interrupts.asm@Serial interrupt vector" + ; $005b + org $0060 + "home/interrupts.asm@Joypad interrupt vector" + ; $0063 + org $0100 + "home/init.asm@Entry point" + ; $0104 + org $014e + "home/init.asm@Global check value" + "home/vblank.asm" + "home/delay.asm" + "home/rtc.asm" + "home/fade.asm" + "home/lcd.asm" + "home/interrupts.asm@Timer dummy interrupt" + "home/time.asm" + "home/init.asm@Init" + "home/serial.asm" + "home/interrupts.asm@Joypad dummy interrupt" + "home/joypad.asm" + "home/unknown.asm@Unknown_094c" + "home/pic.asm" + "home/copy2.asm" + "home/text.asm" + "home/vcopy.asm" + "home/map_objects.asm" + "home/movement.asm" + "home/menu_window.asm" + "home/menu.asm" + "home/window.asm" + "home/unknown.asm@Unknown functions" + "home/toolgear.asm" + "home/unknown.asm@Unknown_20f8" + "home/map.asm" + "home/overworld.asm@Startmenu and Select Button Check" + "home/tileset.asm" + "home/unknown.asm@Empty function" + "home/farcall.asm" + "home/predef.asm" + "home/talk_to_npc.asm" + "home/items.asm@TossItem" + "home/random.asm" + "home/sram.asm" + "home/bankswitch.asm" + "home/misc_32c8.asm@Unknown 32c8" + "home/clear_sprites.asm" + "home/copy.asm" + "home/math.asm" + "home/print_text.asm" + "home/util.asm" + "home/print_num.asm" + "home/print_hex.asm" + "home/jumptable.asm" + "home/overworld.asm@QueueScript" + "home/tables.asm" + "home/tilemap.asm" + "home/items.asm@GiveItem" + "home/misc_32c8.asm@Unknown 3686" + "home/names.asm@Names" + "home/scrolling_menu.asm" + "home/unknown_388f.asm" + "home/mon_stats.asm" + "home/cry.asm" + "home/pokemon.asm@3A4B" + "home/names.asm@GetNick" + "home/print_bcd.asm" + "home/pokemon.asm@3AED" + "home/misc_3c43.asm" + "home/audio.asm" +ROMX $01 + org $4000 + "engine/link/place_waiting_text.asm" + "engine/menu/debug_menu.asm" + org $4153 + "home/oam_dma.asm" + ; $416b + org $52f9 + "engine/menu/main_menu.asm@Initialize new game WRAM" + org $53cc + "engine/menu/main_menu.asm@MainMenu" + "engine/intro.asm" + "engine/title.asm@Title screen" + "engine/title.asm@Title screen TEMPORARY" + "engine/predef.asm" + org $6810 + "engine/math/math.asm" + "data/items/attributes.asm" + ; $6fe5 + org $6fec + "data/items/names.asm" + ; $771e + org $774a + "engine/overworld/object_collision.asm@GetSpritesNextTile" + org $77dd + "engine/overworld/object_collision.asm@_CheckObjectCollision" + ; $782c + org $7894 + "engine/overworld/object_collision.asm@_CheckPlayerObjectCollision" +ROMX $02 + org $4000 + org $44bf + "gfx.asm@Bank 2 Misc GFX" + ; $45cf + org $4a0f + "gfx.asm@Mon Nest Icon" + ; $4a17 + org $4f32 + "gfx.asm@Pokegear GFX" + org $51fb + "gfx.asm@Title Screen BG Decoration Border" + org $5b4c + "gfx.asm@Super Palettes" + ; $5e1c + org $62cc + "gfx.asm@Unused SGB Border GFX" + ; $666c + org $6b1c + "gfx.asm@SGB Border GFX" +ROMX $03 + org $4000 + "engine/overworld/player_movement.asm@Player Movement" + "data/collision/collision_type_table.asm" + "engine/overworld/player_movement.asm@Rest of Player Movement" + ; $477d + org $4791 + "engine/overworld/spawn_points.asm" + org $488d + "data/tileset_headers.asm" + org $4aa1 + "engine/items/inventory.asm@Inventory" + "engine/smallflag.asm" + "engine/pokemon/health.asm@HealParty" + "engine/bcd.asm" + "engine/items/inventory.asm@GetItemAmount" + "engine/pokemon/health.asm@HP Bar" + "engine/events/field_moves.asm" + "engine/items/inventory.asm@_CheckTossableItem" + ; $541d + org $78f6 + "engine/items/item_effects.asm" +ROMX $04 + org $4000 + "data/maps/maps.asm" + org $47cf + "gfx.asm@Title Screen GFX" + org $52d1 + "data/moves/tmhm_moves.asm" + org $5bb1 + "gfx.asm@Mail Icon GFX" + ; $5c31 + org $7171 + "gfx.asm@Trainer Card GFX" +ROMX $05 + org $4000 + "engine/overworld/player_movement.asm@_RedrawPlayerSprite" + org $4150 + "engine/sprites/sprites.asm@LoadOverworldSprite" + ; $4193 + org $423b + "engine/sprites/sprites.asm@OverworldSprites" + ; $43a7 +ROMX $06 + org $4000 + "gfx.asm@Bank 6 Tilesets 00" + ; $4400 + org $5800 + "gfx.asm@Bank 6 Tilesets 01" + ; $5c00 + org $6600 + "gfx.asm@Bank 6 Tilesets 02" + ; $6a00 + org $7400 + "gfx.asm@Bank 6 Tilesets 09" +ROMX $07 + org $4000 + "gfx.asm@Bank 7 Tilesets 13" + ; $4600 + org $4b00 + "gfx.asm@Bank 7 Tilesets 0e" + ; $5100 + org $5600 + "gfx.asm@Bank 7 Tilesets 06" + ; $5a00 + org $6400 + "gfx.asm@Bank 7 Tilesets 05" + ; $6800 + org $7200 + "gfx.asm@Bank 7 Tilesets 03" +ROMX $08 + org $4000 + "gfx.asm@Bank 8 Tilesets 04" + ; $4400 + org $4e00 + "gfx.asm@Bank 8 Tilesets 07" + ; $5200 + org $5c00 + "gfx.asm@Bank 8 Tilesets 08" + ; $6000 + org $6a00 + "gfx.asm@Bank 8 Tilesets 0f" + ; $7000 + org $7500 + "gfx.asm@Bank 8 Tilesets 11" +ROMX $09 + org $4000 + ; $4000 +ROMX $0a + org $4000 + ; $4000 + org $5641 + "gfx.asm@Gameboy GFX" +ROMX $0b + org $4000 + ; $4000 +ROMX $0c + org $4000 + "gfx.asm@Bank C Tilesets 12" + ; $4600 + org $4b00 + "gfx.asm@Bank C Tilesets 0b" + ; $5100 + org $5600 + "gfx.asm@Bank C Tilesets 0d" + ; $5c00 + org $6100 + "gfx.asm@Bank C Tilesets 14" + ; $6700 + org $7100 + "gfx.asm@Bank C Tilesets 0c" + ; $7700 +ROMX $0d + org $4000 + ; $4000 + org $506d + "data/types/type_matchups.asm" +ROMX $0e + org $4000 + ; $4000 + org $4494 + "gfx.asm@PokeBalls GFX" + ; $44d4 + org $4d90 + "data/trainers/class_names.asm" + ; $4f45 + org $5110 + "data/trainers/parties.asm@Trainer Parties" +ROMX $0f + org $4000 + ; $4000 + org $63da + "engine/battle/core.asm" + ; $6411 + org $6a3c + "data/wild.asm" +ROMX $10 + org $4000 + org $4943 + "data/pokemon/dex_order_alpha.asm" + ; $4a3e + org $4ecc + "data/types/search_strings.asm" + ; $4f17 + org $5068 + "data/types/search_types.asm" + ; $5077 + org $52a1 + "data/moves/names.asm" + ; $58b6 + org $6493 + "data/pokemon/evos_attacks.asm" +ROMX $11 + org $4000 + ; $4000 + org $40d5 + "gfx.asm@Pokedex GFX" +ROMX $12 + org $4000 + "gfx.asm@Trainer Battle Sprites" +ROMX $13 + org $4000 + "gfx.asm@Bank 13 Tilesets 0a" + ; $4600 + org $4b00 + "gfx.asm@Bank 13 Tilesets 16" + ; $5100 + org $5b00 + "gfx.asm@Bank 13 Tilesets 19" + ; $5f00 + org $6900 + "gfx.asm@Bank 13 Tilesets 1a" +ROMX $14 + org $4000 + org $40dd + "data/types/names.asm" + ; $4162 + org $4f10 + "data/pokemon/base_stats.asm" + "data/pokemon/names.asm" + "gfx.asm@PKMN Sprite Bank List" +ROMX $15 + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 1" +ROMX $16 + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 2" +ROMX $17 + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 3" +ROMX $18 + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 4" +ROMX $19 + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 5" +ROMX $1a + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 6" +ROMX $1b + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 7" +ROMX $1c + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 8" +ROMX $1d + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 9" +ROMX $1e + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 10" +ROMX $1f + org $4000 + "gfx/pokemon/pkmn_pics.asm@PKMN Pics 11" + "gfx.asm@Annon Pic Ptrs and Pics" + "gfx/pokemon/egg.asm" +ROMX $21 + org $4000 + "gfx.asm@Attack Animation GFX" +ROMX $23 + org $4000 + org $433e + "engine/palettes.asm@Overworld fade" + org $43d1 + "engine/palettes.asm@Palette fading, part 2?" + ; $446d + org $60cc + "gfx.asm@Pokemon Party Sprites" +ROMX $24 + org $4000 + org $4fdb + "gfx.asm@Slot Machine GFX" +ROMX $25 + org $4000 + "data/maps/attributes/Route2Gate1F.asm" + "maps/Route2Gate1F.asm" + "data/maps/attributes/Route2Gate2F.asm" + "maps/Route2Gate2F.asm" + "data/maps/attributes/Route2House.asm" + "maps/Route2House.asm" + "data/maps/attributes/OldCityMuseum.asm" + "maps/OldCityMuseum.asm" + "data/maps/attributes/OldCityGym.asm" + "maps/OldCityGym.asm" + "data/maps/attributes/OldCityTower1F.asm" + "maps/OldCityTower1F.asm" + "data/maps/attributes/OldCityTower2F.asm" + "maps/OldCityTower2F.asm" + "data/maps/attributes/OldCityTower3F.asm" + "maps/OldCityTower3F.asm" + "data/maps/attributes/OldCityTower4F.asm" + "maps/OldCityTower4F.asm" + "data/maps/attributes/OldCityTower5F.asm" + "maps/OldCityTower5F.asm" + "data/maps/attributes/OldCityBillsHouse.asm" + "maps/OldCityBillsHouse.asm" + "data/maps/attributes/OldCityMart.asm" + "maps/OldCityMart.asm" + "data/maps/attributes/OldCityHouse.asm" + "maps/OldCityHouse.asm" + "data/maps/attributes/OldCityPokecenter1F.asm" + "maps/OldCityPokecenter1F.asm" + "data/maps/attributes/OldCityPokecenter2F.asm" + org $4826 + "data/maps/attributes/OldCityPokecenterTrade.asm" + org $48ac + "data/maps/attributes/OldCityPokecenterBattle.asm" + org $492f + "data/maps/attributes/OldCityPokecenterTimeMachine.asm" + org $49ac + "data/maps/attributes/OldCityKurtsHouse.asm" + "maps/OldCityKurtsHouse.asm" + "data/maps/attributes/OldCitySchool.asm" + "maps/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/WestMart1F.asm" + "maps/WestMart1F.asm" + "data/maps/attributes/WestMart2F.asm" + "maps/WestMart2F.asm" + "data/maps/attributes/WestMart3F.asm" + "maps/WestMart3F.asm" + "data/maps/attributes/WestMart4F.asm" + "maps/WestMart4F.asm" + "data/maps/attributes/WestMart5F.asm" + "maps/WestMart5F.asm" + "data/maps/attributes/WestMart6F.asm" + "maps/WestMart6F.asm" + "data/maps/attributes/WestMartElevator.asm" + "maps/WestMartElevator.asm" + "data/maps/attributes/WestRadioTower1F.asm" + "maps/WestRadioTower1F.asm" + "data/maps/attributes/WestRadioTower2F.asm" + "maps/WestRadioTower2F.asm" + "data/maps/attributes/WestRadioTower3F.asm" + "maps/WestRadioTower3F.asm" + "data/maps/attributes/WestRadioTower4F.asm" + "maps/WestRadioTower4F.asm" + "data/maps/attributes/WestRadioTower5F.asm" + "maps/WestRadioTower5F.asm" + "data/maps/attributes/WestRocketRaidedHouse.asm" + "maps/WestRocketRaidedHouse.asm" + "data/maps/attributes/WestPokecenter1F.asm" + "maps/WestPokecenter1F.asm" + "data/maps/attributes/WestPokecenter2F.asm" + "maps/WestPokecenter2F.asm" + "data/maps/attributes/WestGym.asm" + "maps/WestGym.asm" + "data/maps/attributes/WestHouse1.asm" + "maps/WestHouse1.asm" + "data/maps/attributes/WestHouse2.asm" + "maps/WestHouse2.asm" +ROMX $27 + org $4000 + "data/maps/attributes/HaitekuWestRouteGate.asm" + "maps/HaitekuWestRouteGate.asm" + "data/maps/attributes/HaitekuPokecenter1F.asm" + "maps/HaitekuPokecenter1F.asm" + "data/maps/attributes/HaitekuPokecenter2F.asm" + "maps/HaitekuPokecenter2F.asm" + "data/maps/attributes/HaitekuLeague1F.asm" + "maps/HaitekuLeague1F.asm" + "data/maps/attributes/HaitekuLeague2F.asm" + "maps/HaitekuLeague2F.asm" + "data/maps/attributes/HaitekuMart.asm" + "maps/HaitekuMart.asm" + "data/maps/attributes/HaitekuHouse1.asm" + "maps/HaitekuHouse1.asm" + "data/maps/attributes/HaitekuHouse2.asm" + "maps/HaitekuHouse2.asm" + "data/maps/attributes/HaitekuImposterOakHouse.asm" + "maps/HaitekuImposterOakHouse.asm" + "data/maps/attributes/HaitekuAquarium1F.asm" + "maps/HaitekuAquarium1F.asm" + "data/maps/attributes/HaitekuAquarium2F.asm" + "maps/HaitekuAquarium2F.asm" + "data/maps/attributes/FontoRouteGate1.asm" + "maps/FontoRouteGate1.asm" + "data/maps/attributes/FontoRouteGate2.asm" + "maps/FontoRouteGate2.asm" + "data/maps/attributes/FontoRouteGate3.asm" + "maps/FontoRouteGate3.asm" + "data/maps/attributes/FontoRocketHouse.asm" + "maps/FontoRocketHouse.asm" + "data/maps/attributes/FontoMart.asm" + "maps/FontoMart.asm" + "data/maps/attributes/FontoHouse.asm" + "maps/FontoHouse.asm" + "data/maps/attributes/FontoPokecenter1F.asm" + "maps/FontoPokecenter1F.asm" + "data/maps/attributes/FontoPokecenter2F.asm" + "maps/FontoPokecenter2F.asm" + "data/maps/attributes/FontoLab.asm" + "maps/FontoLab.asm" + "data/maps/attributes/BaadonMart.asm" + "maps/BaadonMart.asm" + "data/maps/attributes/BaadonPokecenter1F.asm" + "maps/BaadonPokecenter1F.asm" + "data/maps/attributes/BaadonPokecenter2F.asm" + "maps/BaadonPokecenter2F.asm" + "data/maps/attributes/BaadonHouse1.asm" + "maps/BaadonHouse1.asm" + "data/maps/attributes/BaadonWallpaperHouse.asm" + "maps/BaadonWallpaperHouse.asm" + "data/maps/attributes/BaadonHouse2.asm" + "maps/BaadonHouse2.asm" + "data/maps/attributes/BaadonLeague1F.asm" + "maps/BaadonLeague1F.asm" + "data/maps/attributes/BaadonLeague2F.asm" + "maps/BaadonLeague2F.asm" + "data/maps/attributes/BaadonRouteGateWest.asm" + "maps/BaadonRouteGateWest.asm" + "data/maps/attributes/BaadonRouteGateNewtype.asm" + "maps/BaadonRouteGateNewtype.asm" + "data/maps/attributes/NewtypePokecenter1F.asm" + "maps/NewtypePokecenter1F.asm" + "data/maps/attributes/NewtypePokecenter2F.asm" + "maps/NewtypePokecenter2F.asm" + "data/maps/attributes/NewtypeLeague1F.asm" + "maps/NewtypeLeague1F.asm" + "data/maps/attributes/NewtypeLeague2F.asm" + "maps/NewtypeLeague2F.asm" + "data/maps/attributes/NewtypeSailorHouse.asm" + "maps/NewtypeSailorHouse.asm" + "data/maps/attributes/NewtypeMart.asm" + "maps/NewtypeMart.asm" + "data/maps/attributes/NewtypeDojo.asm" + "maps/NewtypeDojo.asm" + "data/maps/attributes/NewtypeHouse1.asm" + "maps/NewtypeHouse1.asm" + "data/maps/attributes/NewtypeDiner.asm" + "maps/NewtypeDiner.asm" + "data/maps/attributes/NewtypeHouse2.asm" + "maps/NewtypeHouse2.asm" + "data/maps/attributes/NewtypeHouse3.asm" + "maps/NewtypeHouse3.asm" + "data/maps/attributes/Route15Pokecenter1F.asm" + "maps/Route15Pokecenter1F.asm" + "data/maps/attributes/Route15Pokecenter2F.asm" + "maps/Route15Pokecenter2F.asm" + "data/maps/attributes/NewtypeRouteGate.asm" + "maps/NewtypeRouteGate.asm" + "data/maps/attributes/Route18Pokecenter1F.asm" + "maps/Route18Pokecenter1F.asm" + "data/maps/attributes/Route18Pokecenter2F.asm" + "maps/Route18Pokecenter2F.asm" + "data/maps/attributes/SugarRouteGate.asm" + "maps/SugarRouteGate.asm" + "data/maps/attributes/SugarHouse.asm" + "maps/SugarHouse.asm" + "data/maps/attributes/SugarHouse2.asm" + "maps/SugarHouse2.asm" + "data/maps/attributes/SugarMart.asm" + "maps/SugarMart.asm" + "data/maps/attributes/SugarPokecenter1F.asm" + "maps/SugarPokecenter1F.asm" + "data/maps/attributes/SugarPokecenter2F.asm" + "maps/SugarPokecenter2F.asm" + "data/maps/attributes/BullForestRoute1House.asm" + "maps/BullForestRoute1House.asm" + "data/maps/attributes/BullForestRouteGateStand.asm" + "maps/BullForestRouteGateStand.asm" + "data/maps/attributes/BullMart.asm" + "maps/BullMart.asm" + "data/maps/attributes/BullHouse1.asm" + "maps/BullHouse1.asm" + "data/maps/attributes/BullHouse2.asm" + "maps/BullHouse2.asm" + "data/maps/attributes/BullHouse3.asm" + "maps/BullHouse3.asm" + "data/maps/attributes/BullPokecenter1F.asm" + "maps/BullPokecenter1F.asm" + "data/maps/attributes/BullPokecenter2F.asm" + "maps/BullPokecenter2F.asm" + "data/maps/attributes/BullLeague1F.asm" + "maps/BullLeague1F.asm" + "data/maps/attributes/BullLeague2F.asm" + "maps/BullLeague2F.asm" + "data/maps/attributes/BullHouse4.asm" + "maps/BullHouse4.asm" + "data/maps/attributes/StandRouteGateKanto.asm" + "maps/StandRouteGateKanto.asm" + "data/maps/attributes/StandLab.asm" + "maps/StandLab.asm" + "data/maps/attributes/StandPokecenter1F.asm" + "maps/StandPokecenter1F.asm" + "data/maps/attributes/StandPokecenter2F.asm" + "maps/StandPokecenter2F.asm" + "data/maps/attributes/StandOffice.asm" + "maps/StandOffice.asm" + "data/maps/attributes/StandMart.asm" + "maps/StandMart.asm" + "data/maps/attributes/StandHouse.asm" + "maps/StandHouse.asm" + "data/maps/attributes/StandRocketHouse1F.asm" + "maps/StandRocketHouse1F.asm" + "data/maps/attributes/StandRocketHouse2F.asm" + "maps/StandRocketHouse2F.asm" + "data/maps/attributes/StandLeague1F.asm" + "maps/StandLeague1F.asm" + "data/maps/attributes/StandLeague2F.asm" + "maps/StandLeague2F.asm" + "data/maps/attributes/KantoCeruleanHouse.asm" + "maps/KantoCeruleanHouse.asm" + "data/maps/attributes/KantoPokecenter1F.asm" + "maps/KantoPokecenter1F.asm" + "data/maps/attributes/KantoPokecenter2F.asm" + "maps/KantoPokecenter2F.asm" + "data/maps/attributes/KantoLeague1F.asm" + "maps/KantoLeague1F.asm" + "data/maps/attributes/KantoLeague2F.asm" + "maps/KantoLeague2F.asm" + "data/maps/attributes/KantoLavenderHouse.asm" + "maps/KantoLavenderHouse.asm" + "data/maps/attributes/KantoCeladonMart1F.asm" + "maps/KantoCeladonMart1F.asm" + "data/maps/attributes/KantoCeladonMart2F.asm" + "maps/KantoCeladonMart2F.asm" + "data/maps/attributes/KantoCeladonMart3F.asm" + "maps/KantoCeladonMart3F.asm" + "data/maps/attributes/KantoCeladonMart4F.asm" + "maps/KantoCeladonMart4F.asm" + "data/maps/attributes/KantoCeladonMart5F.asm" + "maps/KantoCeladonMart5F.asm" + "data/maps/attributes/KantoCeladonElevator.asm" + "maps/KantoCeladonElevator.asm" + "data/maps/attributes/KantoMart.asm" + "maps/KantoMart.asm" + "data/maps/attributes/KantoGamefreakHQ1.asm" + "maps/KantoGamefreakHQ1.asm" + "data/maps/attributes/KantoGamefreakHQ2.asm" + "maps/KantoGamefreakHQ2.asm" + "data/maps/attributes/KantoGamefreakHQ3.asm" + "maps/KantoGamefreakHQ3.asm" + "data/maps/attributes/KantoGamefreakHQ4.asm" + "maps/KantoGamefreakHQ4.asm" + "data/maps/attributes/KantoGamefreakHQ5.asm" + "maps/KantoGamefreakHQ5.asm" + "data/maps/attributes/KantoSilphCo.asm" + "maps/KantoSilphCo.asm" + "data/maps/attributes/KantoViridianHouse.asm" + "maps/KantoViridianHouse.asm" + "data/maps/attributes/KantoGameCorner.asm" + "maps/KantoGameCorner.asm" + "data/maps/attributes/KantoUnusedArea.asm" + "maps/KantoUnusedArea.asm" + "data/maps/attributes/KantoGameCornerPrizes.asm" + "maps/KantoGameCornerPrizes.asm" + "data/maps/attributes/KantoDiner.asm" + "maps/KantoDiner.asm" + "data/maps/attributes/KantoSchool.asm" + "maps/KantoSchool.asm" + "data/maps/attributes/KantoHospital.asm" + "maps/KantoHospital.asm" + "data/maps/attributes/KantoPokecenter21F.asm" + "maps/KantoPokecenter21F.asm" + "data/maps/attributes/KantoPokecenter22F.asm" + "maps/KantoPokecenter22F.asm" + "data/maps/attributes/KantoRedsHouse.asm" + "maps/KantoRedsHouse.asm" + "data/maps/attributes/KantoGreensHouse1F.asm" + "maps/KantoGreensHouse1F.asm" + "data/maps/attributes/KantoGreensHouse2F.asm" + "maps/KantoGreensHouse2F.asm" + "data/maps/attributes/KantoEldersHouse.asm" + "maps/KantoEldersHouse.asm" + "data/maps/attributes/KantoOaksLab.asm" + "maps/KantoOaksLab.asm" + "data/maps/attributes/KantoLeague21F.asm" + "maps/KantoLeague21F.asm" + "data/maps/attributes/KantoLeague22F.asm" + "maps/KantoLeague22F.asm" + "data/maps/attributes/KantoFishingGuru.asm" + "maps/KantoFishingGuru.asm" + "data/maps/attributes/SouthHouse1.asm" + "maps/SouthHouse1.asm" + "data/maps/attributes/SouthPokecenter1F.asm" + "maps/SouthPokecenter1F.asm" + "data/maps/attributes/SouthPokecenter2F.asm" + "maps/SouthPokecenter2F.asm" + "data/maps/attributes/SouthMart.asm" + "maps/SouthMart.asm" + "data/maps/attributes/SouthHouse2.asm" + "maps/SouthHouse2.asm" + "data/maps/attributes/NorthHouse1.asm" + "maps/NorthHouse1.asm" + "data/maps/attributes/NorthMart.asm" + "maps/NorthMart.asm" + "data/maps/attributes/NorthHouse2.asm" + "maps/NorthHouse2.asm" + "data/maps/attributes/NorthPokecenter1F.asm" + "maps/NorthPokecenter1F.asm" + "data/maps/attributes/NorthPokecenter2F.asm" + "maps/NorthPokecenter2F.asm" +ROMX $2f + org $4000 + "data/maps/attributes/PowerPlant1.asm" + "maps/PowerPlant1.asm" + "data/maps/attributes/PowerPlant2.asm" + "maps/PowerPlant2.asm" + "data/maps/attributes/PowerPlant3.asm" + "maps/PowerPlant3.asm" + "data/maps/attributes/PowerPlant4.asm" + "maps/PowerPlant4.asm" + "data/maps/attributes/RuinsOfAlphEntrance.asm" + "maps/RuinsOfAlphEntrance.asm" + "data/maps/attributes/RuinsOfAlphMain.asm" + "maps/RuinsOfAlphMain.asm" + "data/maps/attributes/CaveMinecarts1.asm" + "maps/CaveMinecarts1.asm" + "data/maps/attributes/CaveMinecarts2.asm" + "maps/CaveMinecarts2.asm" + "data/maps/attributes/CaveMinecarts3.asm" + "maps/CaveMinecarts3.asm" + "data/maps/attributes/CaveMinecarts4.asm" + "maps/CaveMinecarts4.asm" + "data/maps/attributes/CaveMinecarts5.asm" + "maps/CaveMinecarts5.asm" + "data/maps/attributes/CaveMinecarts6.asm" + "maps/CaveMinecarts6.asm" + "data/maps/attributes/CaveMinecarts7.asm" + "maps/CaveMinecarts7.asm" + "data/maps/attributes/Office1.asm" + "maps/Office1.asm" + "data/maps/attributes/Office2.asm" + "maps/Office2.asm" + "data/maps/attributes/Office3.asm" + "maps/Office3.asm" + "data/maps/attributes/SlowpokeWellEntrance.asm" + "maps/SlowpokeWellEntrance.asm" + "data/maps/attributes/SlowpokeWellMain.asm" + "maps/SlowpokeWellMain.asm" + "data/maps/attributes/ShizukanaOka.asm" +ROMX $30 + org $4000 + "gfx.asm@Bank 30 Sprites 1" +ROMX $31 + org $4000 + "gfx.asm@Bank 31 Sprites 2" +ROMX $32 + org $4000 + "engine/battle_anims/bg_effects.asm" + ; $4cfe +ROMX $33 + org $4000 +ROMX $34 + org $4000 + "data/maps/attributes/RouteSilentEastGate.asm" + "maps/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" +ROMX $36 + org $4000 + "maps/dummy_text_pointers.asm" + "data/maps/attributes/SilentHill.asm" + "data/maps/attributes/OldCity.asm" + "maps/OldCity.asm" + "data/maps/attributes/West.asm" + "maps/West.asm" + "data/maps/attributes/Haiteku.asm" + "maps/Haiteku.asm" + "data/maps/attributes/Fonto.asm" + "maps/Fonto.asm" + "data/maps/attributes/Baadon.asm" + "maps/Baadon.asm" + "data/maps/attributes/Newtype.asm" + "maps/Newtype.asm" + "data/maps/attributes/Sugar.asm" + "maps/Sugar.asm" + "data/maps/attributes/BullForest.asm" + "maps/BullForest.asm" + "data/maps/attributes/Stand.asm" + "maps/Stand.asm" + "data/maps/attributes/Kanto.asm" + "maps/Kanto.asm" + "data/maps/attributes/Prince.asm" + "maps/Prince.asm" + "data/maps/attributes/MtFuji.asm" + "maps/MtFuji.asm" + "data/maps/attributes/South.asm" + "maps/South.asm" + "data/maps/attributes/North.asm" + "maps/North.asm" + "data/maps/attributes/Route1P1.asm" + "data/maps/attributes/Route1P2.asm" + "data/maps/attributes/Route2.asm" + "maps/Route2.asm" + "data/maps/attributes/HaitekuWestRoute.asm" + "maps/HaitekuWestRoute.asm" + "data/maps/attributes/HaitekuWestRouteOcean.asm" + "maps/HaitekuWestRouteOcean.asm" + "data/maps/attributes/FontoRoute1.asm" + "maps/FontoRoute1.asm" + "data/maps/attributes/FontoRoute6.asm" + "maps/FontoRoute6.asm" + "data/maps/attributes/FontoRoute2.asm" + "maps/FontoRoute2.asm" + "data/maps/attributes/FontoRoute4.asm" + "maps/FontoRoute4.asm" + "data/maps/attributes/FontoRoute3.asm" + "maps/FontoRoute3.asm" + "data/maps/attributes/BaadonRoute1.asm" + "maps/BaadonRoute1.asm" + "data/maps/attributes/BaadonRoute2.asm" + "maps/BaadonRoute2.asm" + "data/maps/attributes/BaadonRoute3.asm" + "maps/BaadonRoute3.asm" + "data/maps/attributes/Route15.asm" + "maps/Route15.asm" + "data/maps/attributes/NewtypeRoute.asm" + "maps/NewtypeRoute.asm" + "data/maps/attributes/Route18.asm" + "maps/Route18.asm" + "data/maps/attributes/BullForestRoute1.asm" + "maps/BullForestRoute1.asm" + "data/maps/attributes/SugarRoute.asm" + "maps/SugarRoute.asm" + "data/maps/attributes/BullForestRoute2.asm" + "maps/BullForestRoute2.asm" + "data/maps/attributes/StandRoute.asm" + "maps/StandRoute.asm" + "data/maps/attributes/KantoEastRoute.asm" + "maps/KantoEastRoute.asm" + "data/maps/attributes/RouteSilentEast.asm" + "maps/RouteSilentEast.asm" + "data/maps/attributes/PrinceRoute.asm" + "maps/PrinceRoute.asm" + "data/maps/attributes/MtFujiRoute.asm" + "maps/MtFujiRoute.asm" + "data/maps/attributes/FontoRoute5.asm" + "maps/FontoRoute5.asm" + "data/maps/attributes/BullForestRoute3.asm" + "maps/BullForestRoute3.asm" + "maps/SilentHill.asm" + org $7b98 + "maps/Route1P1.asm" + "maps/Route1P2.asm" +ROMX $37 + org $4000 + "gfx.asm@Bank 37 Tilesets 10" + ; $4600 + org $4b00 + "gfx.asm@Bank 37 Tilesets 15" + ; $5100 + org $5b00 + "gfx.asm@Bank 37 Tilesets 17" + ; $6100 + org $6b00 + "gfx.asm@Bank 37 Tilesets 18" +ROMX $38 + org $4000 + org $5403 + "gfx.asm@Poker GFX" + ; $5ae3 + org $5f93 + "gfx.asm@15 Puzzle GFX" + ; $6213 + org $6606 + "gfx.asm@Matches GFX" + ; $6886 + org $75b7 + "gfx.asm@Picross GFX" +ROMX $39 + org $4000 + org $41ff + "gfx.asm@Gamefreak Logo GFX" + org $4adf + "gfx.asm@Intro Underwater GFX" + ; $52df + org $55ef + "gfx.asm@Intro Water Mon and Forest GFX" + ; $60ef + org $626f + "gfx.asm@Intro Mon" +ROMX $3a + org $4000 + "audio/engine.asm@Audio" + ; $410b + org $42bd + "audio/engine.asm@IsChannelSFXOn" + "audio/engine.asm@Functione82f0" + org $4cee + "audio/engine.asm@Audio engine, part 2" + ; $4d8d + org $52c7 + "audio/engine.asm@Song Header Pointers" + org $52ee + "audio/songs/none.asm" +ROMX $3b + org $4000 + "audio/songs/nidorinointro.asm" + "audio/songs/viridiancity.asm" + "audio/songs/route1.asm" + "audio/songs/oakintro.asm" + "audio/songs/leaderbattle.asm" + "audio/songs/trainerbattle.asm" + "audio/songs/heal.asm" + "audio/songs/bicycle.asm" + "audio/songs/spottedrocket.asm" + "audio/songs/victorytrainer.asm" + "audio/songs/evolution.asm" +ROMX $3c + org $4000 + ; $4000 + org $51cb + "audio/cries.asm" + ; $51cb + org $62fe + "audio/songs/title.asm" +ROMX $3e + org $4000 + "engine/gfx.asm" + "gfx.asm@Misc GFX" +ROMX $3f + org $4000 + ; $4000 + org $4362 + "engine/menu/reset_dialog.asm" + ; $4381 + org $4aa5 + "engine/landmarks.asm" + "data/maps/landmarks.asm" + ; $4bc6 + org $506f + "gfx.asm@Town Map Cursor" + ; $50af +WRAM0 + org $c000 + "Music engine RAM" + ; $c1bc + org $c200 + "OAM Buffer" + ; $c570 + org $c5e8 + "Map Buffer" + org $dfff + "Stack Bottom" +VRAM 0 + "VRAM" +HRAM + "HRAM" +SRAM 0 + "Sprite Buffers" + ; $a498 + org $a600 + "Unknown, bank 0" + ; $a607 + org $bffe + "Window Stack Top" @@ -12,10 +12,6 @@ 01:DA83 wUnknownListLengthda83 01:DA84 wUnknownListda84 -; ROM0 -00:3C43 GetPartyParamLocation -00:3CA8 InitSpriteAnimStruct - 01:40FD Function40fd 01:5007 Function5007 01:50B9 Function50b9 @@ -71,6 +67,7 @@ 03:5F91 Functiondf91 03:60A0 Function60a0 03:6734 Function6734 +03:677F _UseItem 04:4743 ShrinkPic1 04:479D ShrinkPic2 @@ -90,7 +87,7 @@ 05:40D9 Function140d9 05:40EA Function140ea 05:40FB LoadUsedSpritesGfx ; TODO: maybe there's a better name -05:43B6 InitAllSRAMBanks +05:43B6 InitAllSRAMBanks 05:43E0 Function143e0 05:457A Function1457a 05:45B8 Function145b8 @@ -188,6 +185,7 @@ 23:4CFD InitEffectObject 23:4D0C PlaySpriteAnimationsAndDelayFrame 23:4d13 EffectObjectJumpNoDelay +23:4d52 _InitSpriteAnimStruct 23:60cc MenuMonIconGfx 23:71CB Function_8f1cb @@ -197,10 +195,11 @@ 32:76FF Functioncb6ff 32:7710 Functioncb710 32:7733 Functioncb733 +32:7FFF BattleAnimationsBankRef 33:4000 Functioncc000 33:4000 Functioncc000_2 -33:4001 Functioncc001 +33:4001 PlayBattleAnim 33:467B QueueBattleAnimation 33:625D BattleAnim_Sine_e 33:6263 BattleAnim_Cosine_e @@ -233,915 +232,13 @@ 3F:67A1 CallSubGameMenu ; Maps -25:404D Route2Gate1F_Blocks -25:4062 Route2Gate1F_Unk -25:4061 Route2Gate1F_MapScripts -25:400B Route2Gate1F_MapEvents -25:40B5 Route2Gate2F_Blocks -25:40C2 Route2Gate2F_Unk -25:40C1 Route2Gate2F_MapScripts -25:4087 Route2Gate2F_MapEvents -25:411F Route2House_Blocks -25:4130 Route2House_Unk -25:412F Route2House_MapScripts -25:40E7 Route2House_MapEvents -25:4192 OldCityMuseum_Blocks -25:41B3 OldCityMuseum_Unk -25:41B2 OldCityMuseum_MapScripts -25:4155 OldCityMuseum_MapEvents -25:4241 OldCityGym_Blocks -25:426F OldCityGym_Unk -25:426E OldCityGym_MapScripts -25:41D8 OldCityGym_MapEvents -25:42EE OldCityTower1F_Blocks -25:42FF OldCityTower1F_Unk -25:42FE OldCityTower1F_MapScripts -25:4294 OldCityTower1F_MapEvents -25:4373 OldCityTower2F_Blocks -25:4384 OldCityTower2F_Unk -25:4383 OldCityTower2F_MapScripts -25:4324 OldCityTower2F_MapEvents -25:43F8 OldCityTower3F_Blocks -25:4409 OldCityTower3F_Unk -25:4408 OldCityTower3F_MapScripts -25:43A9 OldCityTower3F_MapEvents -25:447D OldCityTower4F_Blocks -25:448E OldCityTower4F_Unk -25:448D OldCityTower4F_MapScripts -25:442E OldCityTower4F_MapEvents -25:44D8 OldCityTower5F_Blocks -25:44E2 OldCityTower5F_Unk -25:44E1 OldCityTower5F_MapScripts -25:44B3 OldCityTower5F_MapEvents -25:453F OldCityBillsHouse_Blocks -25:4550 OldCityBillsHouse_Unk -25:454F OldCityBillsHouse_MapScripts -25:4507 OldCityBillsHouse_MapEvents -25:45B3 OldCityMart_Blocks -25:45D4 OldCityMart_Unk -25:45D3 OldCityMart_MapScripts -25:4575 OldCityMart_MapEvents -25:4643 OldCityHouse_Blocks -25:4654 OldCityHouse_Unk -25:4653 OldCityHouse_MapScripts -25:45F9 OldCityHouse_MapEvents -25:46CB OldCityPokecenter1F_Blocks -25:46EC OldCityPokecenter1F_Unk -25:46EB OldCityPokecenter1F_MapScripts -25:4679 OldCityPokecenter1F_MapEvents -25:4762 OldCityPokecenter2F_Blocks -25:47A4 OldCityPokecenter2F_Unk -25:4782 OldCityPokecenter2F_MapScripts -25:4709 OldCityPokecenter2F_MapEvents -25:4851 OldCityPokecenterTrade_Blocks -25:4882 OldCityPokecenterTrade_Unk -25:4866 OldCityPokecenterTrade_MapScripts -25:4831 OldCityPokecenterTrade_MapEvents -25:48D7 OldCityPokecenterBattle_Blocks -25:4907 OldCityPokecenterBattle_Unk -25:48EB OldCityPokecenterBattle_MapScripts -25:48B7 OldCityPokecenterBattle_MapEvents -25:495E OldCityPokecenterTimeMachine_Blocks -25:499D OldCityPokecenterTimeMachine_Unk -25:497E OldCityPokecenterTimeMachine_MapScripts -25:493A OldCityPokecenterTimeMachine_MapEvents -25:49EB OldCityKurtsHouse_Blocks -25:4A0C OldCityKurtsHouse_Unk -25:4A0B OldCityKurtsHouse_MapScripts -25:49B7 OldCityKurtsHouse_MapEvents -25:4AA2 OldCitySchool_Blocks -25:4AC3 OldCitySchool_Unk -25:4AC2 OldCitySchool_MapScripts -25:4A31 OldCitySchool_MapEvents -26:404D Route1Gate1F_Blocks -26:4074 Route1Gate1F_Unk -26:4061 Route1Gate1F_MapScripts -26:400B Route1Gate1F_MapEvents -26:4113 Route1Gate2F_Blocks -26:4134 Route1Gate2F_Unk -26:411F Route1Gate2F_MapScripts -26:40E5 Route1Gate2F_MapEvents -26:4265 WestMart1F_Blocks -26:4286 WestMart1F_Unk -26:4285 WestMart1F_MapScripts -26:422F WestMart1F_MapEvents -26:4339 WestMart2F_Blocks -26:435A WestMart2F_Unk -26:4359 WestMart2F_MapScripts -26:42AB WestMart2F_MapEvents -26:43F8 WestMart3F_Blocks -26:4419 WestMart3F_Unk -26:4418 WestMart3F_MapScripts -26:437F WestMart3F_MapEvents -26:44B7 WestMart4F_Blocks -26:44D8 WestMart4F_Unk -26:44D7 WestMart4F_MapScripts -26:443E WestMart4F_MapEvents -26:4546 WestMart5F_Blocks -26:4567 WestMart5F_Unk -26:4566 WestMart5F_MapScripts -26:44FD WestMart5F_MapEvents -26:45D3 WestMart6F_Blocks -26:45F4 WestMart6F_Unk -26:45F3 WestMart6F_MapScripts -26:458C WestMart6F_MapEvents -26:462C WestMartElevator_Blocks -26:4631 WestMartElevator_Unk -26:4630 WestMartElevator_MapScripts -26:4619 WestMartElevator_MapEvents -26:469F WestRadioTower1F_Blocks -26:46B0 WestRadioTower1F_Unk -26:46AF WestRadioTower1F_MapScripts -26:4656 WestRadioTower1F_MapEvents -26:4747 WestRadioTower2F_Blocks -26:4758 WestRadioTower2F_Unk -26:4757 WestRadioTower2F_MapScripts -26:46D5 WestRadioTower2F_MapEvents -26:47FC WestRadioTower3F_Blocks -26:480D WestRadioTower3F_Unk -26:480C WestRadioTower3F_MapScripts -26:477D WestRadioTower3F_MapEvents -26:48BE WestRadioTower4F_Blocks -26:48CF WestRadioTower4F_Unk -26:48CE WestRadioTower4F_MapScripts -26:4832 WestRadioTower4F_MapEvents -26:4974 WestRadioTower5F_Blocks -26:4985 WestRadioTower5F_Unk -26:4984 WestRadioTower5F_MapScripts -26:48F4 WestRadioTower5F_MapEvents -26:4A1A WestRocketRaidedHouse_Blocks -26:4A2F WestRocketRaidedHouse_Unk -26:4A2E WestRocketRaidedHouse_MapScripts -26:49AA WestRocketRaidedHouse_MapEvents -26:4AA6 WestPokecenter1F_Blocks -26:4AC7 WestPokecenter1F_Unk -26:4AC6 WestPokecenter1F_MapScripts -26:4A54 WestPokecenter1F_MapEvents -26:4B23 WestPokecenter2F_Blocks -26:4B44 WestPokecenter2F_Unk -26:4B43 WestPokecenter2F_MapScripts -26:4AEC WestPokecenter2F_MapEvents -26:4BD2 WestGym_Blocks -26:4C00 WestGym_Unk -26:4BFF WestGym_MapScripts -26:4B69 WestGym_MapEvents -26:4C6F WestHouse1_Blocks -26:4C84 WestHouse1_Unk -26:4C83 WestHouse1_MapScripts -26:4C25 WestHouse1_MapEvents -26:4CF3 WestHouse2_Blocks -26:4D08 WestHouse2_Unk -26:4D07 WestHouse2_MapScripts -26:4CA9 WestHouse2_MapEvents -27:402C HaitekuWestRouteGate_Blocks -27:4041 HaitekuWestRouteGate_Unk -27:4040 HaitekuWestRouteGate_MapScripts -27:400B HaitekuWestRouteGate_MapEvents -27:40B4 HaitekuPokecenter1F_Blocks -27:40D5 HaitekuPokecenter1F_Unk -27:40D4 HaitekuPokecenter1F_MapScripts -27:4066 HaitekuPokecenter1F_MapEvents -27:412D HaitekuPokecenter2F_Blocks -27:414E HaitekuPokecenter2F_Unk -27:414D HaitekuPokecenter2F_MapScripts -27:40FA HaitekuPokecenter2F_MapEvents -27:41CE HaitekuLeague1F_Blocks -27:41EF HaitekuLeague1F_Unk -27:41EE HaitekuLeague1F_MapScripts -27:4173 HaitekuLeague1F_MapEvents -27:4261 HaitekuLeague2F_Blocks -27:428F HaitekuLeague2F_Unk -27:428E HaitekuLeague2F_MapScripts -27:4214 HaitekuLeague2F_MapEvents -27:42EE HaitekuMart_Blocks -27:430F HaitekuMart_Unk -27:430E HaitekuMart_MapScripts -27:42B4 HaitekuMart_MapEvents -27:4354 HaitekuHouse1_Blocks -27:4369 HaitekuHouse1_Unk -27:4368 HaitekuHouse1_MapScripts -27:4334 HaitekuHouse1_MapEvents -27:43AE HaitekuHouse2_Blocks -27:43C3 HaitekuHouse2_Unk -27:43C2 HaitekuHouse2_MapScripts -27:438E HaitekuHouse2_MapEvents -27:4415 HaitekuImposterOakHouse_Blocks -27:442A HaitekuImposterOakHouse_Unk -27:4429 HaitekuImposterOakHouse_MapScripts -27:43E8 HaitekuImposterOakHouse_MapEvents -27:4490 HaitekuAquarium1F_Blocks -27:44B1 HaitekuAquarium1F_Unk -27:44B0 HaitekuAquarium1F_MapScripts -27:444F HaitekuAquarium1F_MapEvents -27:44FC HaitekuAquarium2F_Blocks -27:451D HaitekuAquarium2F_Unk -27:451C HaitekuAquarium2F_MapScripts -27:44D6 HaitekuAquarium2F_MapEvents -27:4563 FontoRouteGate1_Blocks -27:4578 FontoRouteGate1_Unk -27:4577 FontoRouteGate1_MapScripts -27:4542 FontoRouteGate1_MapEvents -27:45BE FontoRouteGate2_Blocks -27:45D3 FontoRouteGate2_Unk -27:45D2 FontoRouteGate2_MapScripts -27:459D FontoRouteGate2_MapEvents -27:4619 FontoRouteGate3_Blocks -27:462E FontoRouteGate3_Unk -27:462D FontoRouteGate3_MapScripts -27:45F8 FontoRouteGate3_MapEvents -27:469A FontoRocketHouse_Blocks -27:46BB FontoRocketHouse_Unk -27:46BA FontoRocketHouse_MapScripts -27:4653 FontoRocketHouse_MapEvents -27:471A FontoMart_Blocks -27:473B FontoMart_Unk -27:473A FontoMart_MapScripts -27:46E0 FontoMart_MapEvents -27:4780 FontoHouse_Blocks -27:4795 FontoHouse_Unk -27:4794 FontoHouse_MapScripts -27:4760 FontoHouse_MapEvents -27:4808 FontoPokecenter1F_Blocks -27:4829 FontoPokecenter1F_Unk -27:4828 FontoPokecenter1F_MapScripts -27:47BA FontoPokecenter1F_MapEvents -27:4881 FontoPokecenter2F_Blocks -27:48A2 FontoPokecenter2F_Unk -27:48A1 FontoPokecenter2F_MapScripts -27:484E FontoPokecenter2F_MapEvents -27:48F4 FontoLab_Blocks -27:4909 FontoLab_Unk -27:4908 FontoLab_MapScripts -27:48C7 FontoLab_MapEvents -27:4968 BaadonMart_Blocks -27:4989 BaadonMart_Unk -27:4988 BaadonMart_MapScripts -27:492E BaadonMart_MapEvents -27:49EF BaadonPokecenter1F_Blocks -27:4A10 BaadonPokecenter1F_Unk -27:4A0F BaadonPokecenter1F_MapScripts -27:49AE BaadonPokecenter1F_MapEvents -27:4A68 BaadonPokecenter2F_Blocks -27:4A89 BaadonPokecenter2F_Unk -27:4A88 BaadonPokecenter2F_MapScripts -27:4A35 BaadonPokecenter2F_MapEvents -27:4ACE BaadonHouse1_Blocks -27:4ADF BaadonHouse1_Unk -27:4ADE BaadonHouse1_MapScripts -27:4AAE BaadonHouse1_MapEvents -27:4B17 BaadonWallpaperHouse_Blocks -27:4B28 BaadonWallpaperHouse_Unk -27:4B27 BaadonWallpaperHouse_MapScripts -27:4B04 BaadonWallpaperHouse_MapEvents -27:4B6D BaadonHouse2_Blocks -27:4B82 BaadonHouse2_Unk -27:4B81 BaadonHouse2_MapScripts -27:4B4D BaadonHouse2_MapEvents -27:4C02 BaadonLeague1F_Blocks -27:4C23 BaadonLeague1F_Unk -27:4C22 BaadonLeague1F_MapScripts -27:4BA7 BaadonLeague1F_MapEvents -27:4C95 BaadonLeague2F_Blocks -27:4CC3 BaadonLeague2F_Unk -27:4CC2 BaadonLeague2F_MapScripts -27:4C48 BaadonLeague2F_MapEvents -27:4D09 BaadonRouteGateWest_Blocks -27:4D1E BaadonRouteGateWest_Unk -27:4D1D BaadonRouteGateWest_MapScripts -27:4CE8 BaadonRouteGateWest_MapEvents -27:4D64 BaadonRouteGateNewtype_Blocks -27:4D79 BaadonRouteGateNewtype_Unk -27:4D78 BaadonRouteGateNewtype_MapScripts -27:4D43 BaadonRouteGateNewtype_MapEvents -27:4DEC NewtypePokecenter1F_Blocks -27:4E0D NewtypePokecenter1F_Unk -27:4E0C NewtypePokecenter1F_MapScripts -27:4D9E NewtypePokecenter1F_MapEvents -27:4E65 NewtypePokecenter2F_Blocks -27:4E86 NewtypePokecenter2F_Unk -27:4E85 NewtypePokecenter2F_MapScripts -27:4E32 NewtypePokecenter2F_MapEvents -27:4F06 NewtypeLeague1F_Blocks -27:4F27 NewtypeLeague1F_Unk -27:4F26 NewtypeLeague1F_MapScripts -27:4EAB NewtypeLeague1F_MapEvents -27:4F99 NewtypeLeague2F_Blocks -27:4FC7 NewtypeLeague2F_Unk -27:4FC6 NewtypeLeague2F_MapScripts -27:4F4C NewtypeLeague2F_MapEvents -27:500C NewtypeSailorHouse_Blocks -27:5021 NewtypeSailorHouse_Unk -27:5020 NewtypeSailorHouse_MapScripts -27:4FEC NewtypeSailorHouse_MapEvents -27:5080 NewtypeMart_Blocks -27:50A1 NewtypeMart_Unk -27:50A0 NewtypeMart_MapScripts -27:5046 NewtypeMart_MapEvents -27:511A NewtypeDojo_Blocks -27:513B NewtypeDojo_Unk -27:513A NewtypeDojo_MapScripts -27:50C6 NewtypeDojo_MapEvents -27:5180 NewtypeHouse1_Blocks -27:5195 NewtypeHouse1_Unk -27:5194 NewtypeHouse1_MapScripts -27:5160 NewtypeHouse1_MapEvents -27:5201 NewtypeDiner_Blocks -27:5212 NewtypeDiner_Unk -27:5211 NewtypeDiner_MapScripts -27:51BA NewtypeDiner_MapEvents -27:5257 NewtypeHouse2_Blocks -27:526C NewtypeHouse2_Unk -27:526B NewtypeHouse2_MapScripts -27:5237 NewtypeHouse2_MapEvents -27:52B1 NewtypeHouse3_Blocks -27:52C6 NewtypeHouse3_Unk -27:52C5 NewtypeHouse3_MapScripts -27:5291 NewtypeHouse3_MapEvents -27:5339 Route15Pokecenter1F_Blocks -27:535A Route15Pokecenter1F_Unk -27:5359 Route15Pokecenter1F_MapScripts -27:52EB Route15Pokecenter1F_MapEvents -27:538B Route15Pokecenter2F_Blocks -27:53AC Route15Pokecenter2F_Unk -27:53AB Route15Pokecenter2F_MapScripts -27:537F Route15Pokecenter2F_MapEvents -27:53F2 NewtypeRouteGate_Blocks -27:5407 NewtypeRouteGate_Unk -27:5406 NewtypeRouteGate_MapScripts -27:53D1 NewtypeRouteGate_MapEvents -27:547A Route18Pokecenter1F_Blocks -27:549B Route18Pokecenter1F_Unk -27:549A Route18Pokecenter1F_MapScripts -27:542C Route18Pokecenter1F_MapEvents -27:54CC Route18Pokecenter2F_Blocks -27:54ED Route18Pokecenter2F_Unk -27:54EC Route18Pokecenter2F_MapScripts -27:54C0 Route18Pokecenter2F_MapEvents -27:5533 SugarRouteGate_Blocks -27:5548 SugarRouteGate_Unk -27:5547 SugarRouteGate_MapScripts -27:5512 SugarRouteGate_MapEvents -27:55A7 SugarHouse_Blocks -27:55C8 SugarHouse_Unk -27:55C7 SugarHouse_MapScripts -27:556D SugarHouse_MapEvents -27:560D SugarHouse2_Blocks -27:561E SugarHouse2_Unk -27:561D SugarHouse2_MapScripts -27:55ED SugarHouse2_MapEvents -27:567D SugarMart_Blocks -27:569E SugarMart_Unk -27:569D SugarMart_MapScripts -27:5643 SugarMart_MapEvents -27:5711 SugarPokecenter1F_Blocks -27:5732 SugarPokecenter1F_Unk -27:5731 SugarPokecenter1F_MapScripts -27:56C3 SugarPokecenter1F_MapEvents -27:578A SugarPokecenter2F_Blocks -27:57AB SugarPokecenter2F_Unk -27:57AA SugarPokecenter2F_MapScripts -27:5757 SugarPokecenter2F_MapEvents -27:57F0 BullForestRoute1House_Blocks -27:5805 BullForestRoute1House_Unk -27:5804 BullForestRoute1House_MapScripts -27:57D0 BullForestRoute1House_MapEvents -27:584B BullForestRouteGateStand_Blocks -27:5860 BullForestRouteGateStand_Unk -27:585F BullForestRouteGateStand_MapScripts -27:582A BullForestRouteGateStand_MapEvents -27:58BF BullMart_Blocks -27:58E0 BullMart_Unk -27:58DF BullMart_MapScripts -27:5885 BullMart_MapEvents -27:5925 BullHouse1_Blocks -27:5936 BullHouse1_Unk -27:5935 BullHouse1_MapScripts -27:5905 BullHouse1_MapEvents -27:597B BullHouse2_Blocks -27:5990 BullHouse2_Unk -27:598F BullHouse2_MapScripts -27:595B BullHouse2_MapEvents -27:59D5 BullHouse3_Blocks -27:59EA BullHouse3_Unk -27:59E9 BullHouse3_MapScripts -27:59B5 BullHouse3_MapEvents -27:5A5D BullPokecenter1F_Blocks -27:5A7E BullPokecenter1F_Unk -27:5A7D BullPokecenter1F_MapScripts -27:5A0F BullPokecenter1F_MapEvents -27:5AD6 BullPokecenter2F_Blocks -27:5AF7 BullPokecenter2F_Unk -27:5AF6 BullPokecenter2F_MapScripts -27:5AA3 BullPokecenter2F_MapEvents -27:5B77 BullLeague1F_Blocks -27:5B98 BullLeague1F_Unk -27:5B97 BullLeague1F_MapScripts -27:5B1C BullLeague1F_MapEvents -27:5C0A BullLeague2F_Blocks -27:5C38 BullLeague2F_Unk -27:5C37 BullLeague2F_MapScripts -27:5BBD BullLeague2F_MapEvents -27:5C70 BullHouse4_Blocks -27:5C85 BullHouse4_Unk -27:5C84 BullHouse4_MapScripts -27:5C5D BullHouse4_MapEvents -27:5CCB StandRouteGateKanto_Blocks -27:5CE0 StandRouteGateKanto_Unk -27:5CDF StandRouteGateKanto_MapScripts -27:5CAA StandRouteGateKanto_MapEvents -27:5D25 StandLab_Blocks -27:5D36 StandLab_Unk -27:5D35 StandLab_MapScripts -27:5D05 StandLab_MapEvents -27:5DA9 StandPokecenter1F_Blocks -27:5DCA StandPokecenter1F_Unk -27:5DC9 StandPokecenter1F_MapScripts -27:5D5B StandPokecenter1F_MapEvents -27:5E22 StandPokecenter2F_Blocks -27:5E43 StandPokecenter2F_Unk -27:5E42 StandPokecenter2F_MapScripts -27:5DEF StandPokecenter2F_MapEvents -27:5EA2 StandOffice_Blocks -27:5EC3 StandOffice_Unk -27:5EC2 StandOffice_MapScripts -27:5E68 StandOffice_MapEvents -27:5F22 StandMart_Blocks -27:5F43 StandMart_Unk -27:5F42 StandMart_MapScripts -27:5EE8 StandMart_MapEvents -27:5F88 StandHouse_Blocks -27:5F9D StandHouse_Unk -27:5F9C StandHouse_MapScripts -27:5F68 StandHouse_MapEvents -27:5FE9 StandRocketHouse1F_Blocks -27:600A StandRocketHouse1F_Unk -27:6009 StandRocketHouse1F_MapScripts -27:5FC2 StandRocketHouse1F_MapEvents -27:6048 StandRocketHouse2F_Blocks -27:6069 StandRocketHouse2F_Unk -27:6068 StandRocketHouse2F_MapScripts -27:602F StandRocketHouse2F_MapEvents -27:60E9 StandLeague1F_Blocks -27:610A StandLeague1F_Unk -27:6109 StandLeague1F_MapScripts -27:608E StandLeague1F_MapEvents -27:617C StandLeague2F_Blocks -27:61AA StandLeague2F_Unk -27:61A9 StandLeague2F_MapScripts -27:612F StandLeague2F_MapEvents -27:61EF KantoCeruleanHouse_Blocks -27:6204 KantoCeruleanHouse_Unk -27:6203 KantoCeruleanHouse_MapScripts -27:61CF KantoCeruleanHouse_MapEvents -27:6277 KantoPokecenter1F_Blocks -27:6298 KantoPokecenter1F_Unk -27:6297 KantoPokecenter1F_MapScripts -27:6229 KantoPokecenter1F_MapEvents -27:62F0 KantoPokecenter2F_Blocks -27:6311 KantoPokecenter2F_Unk -27:6310 KantoPokecenter2F_MapScripts -27:62BD KantoPokecenter2F_MapEvents -27:6391 KantoLeague1F_Blocks -27:63B2 KantoLeague1F_Unk -27:63B1 KantoLeague1F_MapScripts -27:6336 KantoLeague1F_MapEvents -27:6424 KantoLeague2F_Blocks -27:6452 KantoLeague2F_Unk -27:6451 KantoLeague2F_MapScripts -27:63D7 KantoLeague2F_MapEvents -27:64A4 KantoLavenderHouse_Blocks -27:64B9 KantoLavenderHouse_Unk -27:64B8 KantoLavenderHouse_MapScripts -27:6477 KantoLavenderHouse_MapEvents -27:650C KantoCeladonMart1F_Blocks -27:652D KantoCeladonMart1F_Unk -27:652C KantoCeladonMart1F_MapScripts -27:64DE KantoCeladonMart1F_MapEvents -27:6586 KantoCeladonMart2F_Blocks -27:65A7 KantoCeladonMart2F_Unk -27:65A6 KantoCeladonMart2F_MapScripts -27:6552 KantoCeladonMart2F_MapEvents -27:6600 KantoCeladonMart3F_Blocks -27:6621 KantoCeladonMart3F_Unk -27:6620 KantoCeladonMart3F_MapScripts -27:65CC KantoCeladonMart3F_MapEvents -27:6687 KantoCeladonMart4F_Blocks -27:66A8 KantoCeladonMart4F_Unk -27:66A7 KantoCeladonMart4F_MapScripts -27:6646 KantoCeladonMart4F_MapEvents -27:6707 KantoCeladonMart5F_Blocks -27:6728 KantoCeladonMart5F_Unk -27:6727 KantoCeladonMart5F_MapScripts -27:66CD KantoCeladonMart5F_MapEvents -27:6760 KantoCeladonElevator_Blocks -27:6765 KantoCeladonElevator_Unk -27:6764 KantoCeladonElevator_MapScripts -27:674D KantoCeladonElevator_MapEvents -27:67C4 KantoMart_Blocks -27:67E5 KantoMart_Unk -27:67E4 KantoMart_MapScripts -27:678A KantoMart_MapEvents -27:6866 KantoGamefreakHQ1_Blocks -27:687F KantoGamefreakHQ1_Unk -27:687E KantoGamefreakHQ1_MapScripts -27:680A KantoGamefreakHQ1_MapEvents -27:68D2 KantoGamefreakHQ2_Blocks -27:68EB KantoGamefreakHQ2_Unk -27:68EA KantoGamefreakHQ2_MapScripts -27:68A4 KantoGamefreakHQ2_MapEvents -27:6958 KantoGamefreakHQ3_Blocks -27:6971 KantoGamefreakHQ3_Unk -27:6970 KantoGamefreakHQ3_MapScripts -27:6910 KantoGamefreakHQ3_MapEvents -27:69B0 KantoGamefreakHQ4_Blocks -27:69C9 KantoGamefreakHQ4_Unk -27:69C8 KantoGamefreakHQ4_MapScripts -27:6996 KantoGamefreakHQ4_MapEvents -27:6A01 KantoGamefreakHQ5_Blocks -27:6A12 KantoGamefreakHQ5_Unk -27:6A11 KantoGamefreakHQ5_MapScripts -27:69EE KantoGamefreakHQ5_MapEvents -27:6A64 KantoSilphCo_Blocks -27:6AC5 KantoSilphCo_Unk -27:6AC4 KantoSilphCo_MapScripts -27:6A37 KantoSilphCo_MapEvents -27:6B17 KantoViridianHouse_Blocks -27:6B2C KantoViridianHouse_Unk -27:6B2B KantoViridianHouse_MapScripts -27:6AEA KantoViridianHouse_MapEvents -27:6BF4 KantoGameCorner_Blocks -27:6C3B KantoGameCorner_Unk -27:6C3A KantoGameCorner_MapScripts -27:6B51 KantoGameCorner_MapEvents -27:6C65 KantoUnusedArea_Blocks -27:6C76 KantoUnusedArea_Unk -27:6C75 KantoUnusedArea_MapScripts -27:6C60 KantoUnusedArea_MapEvents -27:6CD5 KantoGameCornerPrizes_Blocks -27:6CEA KantoGameCornerPrizes_Unk -27:6CE9 KantoGameCornerPrizes_MapScripts -27:6C9B KantoGameCornerPrizes_MapEvents -27:6D22 KantoDiner_Blocks -27:6D37 KantoDiner_Unk -27:6D36 KantoDiner_MapScripts -27:6D0F KantoDiner_MapEvents -27:6DB0 KantoSchool_Blocks -27:6DD1 KantoSchool_Unk -27:6DD0 KantoSchool_MapScripts -27:6D5C KantoSchool_MapEvents -27:6E30 KantoHospital_Blocks -27:6E51 KantoHospital_Unk -27:6E50 KantoHospital_MapScripts -27:6DF6 KantoHospital_MapEvents -27:6EC4 KantoPokecenter21F_Blocks -27:6EE5 KantoPokecenter21F_Unk -27:6EE4 KantoPokecenter21F_MapScripts -27:6E76 KantoPokecenter21F_MapEvents -27:6F3D KantoPokecenter22F_Blocks -27:6F5E KantoPokecenter22F_Unk -27:6F5D KantoPokecenter22F_MapScripts -27:6F0A KantoPokecenter22F_MapEvents -27:6FB0 KantoRedsHouse_Blocks -27:6FC5 KantoRedsHouse_Unk -27:6FC4 KantoRedsHouse_MapScripts -27:6F83 KantoRedsHouse_MapEvents -27:7011 KantoGreensHouse1F_Blocks -27:7022 KantoGreensHouse1F_Unk -27:7021 KantoGreensHouse1F_MapScripts -27:6FEA KantoGreensHouse1F_MapEvents -27:7053 KantoGreensHouse2F_Blocks -27:7064 KantoGreensHouse2F_Unk -27:7063 KantoGreensHouse2F_MapScripts -27:7047 KantoGreensHouse2F_MapEvents -27:70B6 KantoEldersHouse_Blocks -27:70CB KantoEldersHouse_Unk -27:70CA KantoEldersHouse_MapScripts -27:7089 KantoEldersHouse_MapEvents -27:7110 KantoOaksLab_Blocks -27:7121 KantoOaksLab_Unk -27:7120 KantoOaksLab_MapScripts -27:70F0 KantoOaksLab_MapEvents -27:71A1 KantoLeague21F_Blocks -27:71C2 KantoLeague21F_Unk -27:71C1 KantoLeague21F_MapScripts -27:7146 KantoLeague21F_MapEvents -27:7234 KantoLeague22F_Blocks -27:7262 KantoLeague22F_Unk -27:7261 KantoLeague22F_MapScripts -27:71E7 KantoLeague22F_MapEvents -27:72A7 KantoFishingGuru_Blocks -27:72BC KantoFishingGuru_Unk -27:72BB KantoFishingGuru_MapScripts -27:7287 KantoFishingGuru_MapEvents -27:7301 SouthHouse1_Blocks -27:7316 SouthHouse1_Unk -27:7315 SouthHouse1_MapScripts -27:72E1 SouthHouse1_MapEvents -27:7389 SouthPokecenter1F_Blocks -27:73AA SouthPokecenter1F_Unk -27:73A9 SouthPokecenter1F_MapScripts -27:733B SouthPokecenter1F_MapEvents -27:7402 SouthPokecenter2F_Blocks -27:7423 SouthPokecenter2F_Unk -27:7422 SouthPokecenter2F_MapScripts -27:73CF SouthPokecenter2F_MapEvents -27:7482 SouthMart_Blocks -27:74A3 SouthMart_Unk -27:74A2 SouthMart_MapScripts -27:7448 SouthMart_MapEvents -27:74E8 SouthHouse2_Blocks -27:74FD SouthHouse2_Unk -27:74FC SouthHouse2_MapScripts -27:74C8 SouthHouse2_MapEvents -27:7542 NorthHouse1_Blocks -27:7557 NorthHouse1_Unk -27:7556 NorthHouse1_MapScripts -27:7522 NorthHouse1_MapEvents -27:75B6 NorthMart_Blocks -27:75D7 NorthMart_Unk -27:75D6 NorthMart_MapScripts -27:757C NorthMart_MapEvents -27:761C NorthHouse2_Blocks -27:7631 NorthHouse2_Unk -27:7630 NorthHouse2_MapScripts -27:75FC NorthHouse2_MapEvents -27:76A4 NorthPokecenter1F_Blocks -27:76C5 NorthPokecenter1F_Unk -27:76C4 NorthPokecenter1F_MapScripts -27:7656 NorthPokecenter1F_MapEvents -27:771D NorthPokecenter2F_Blocks -27:773E NorthPokecenter2F_Unk -27:773D NorthPokecenter2F_MapScripts -27:76EA NorthPokecenter2F_MapEvents -2F:4010 PowerPlant1_Blocks -2F:406B PowerPlant1_Unk -2F:406A PowerPlant1_MapScripts -2F:400B PowerPlant1_MapEvents -2F:408D PowerPlant2_Blocks -2F:40E8 PowerPlant2_Unk -2F:40E7 PowerPlant2_MapScripts -2F:4088 PowerPlant2_MapEvents -2F:410A PowerPlant3_Blocks -2F:4219 PowerPlant3_Unk -2F:4218 PowerPlant3_MapScripts -2F:4105 PowerPlant3_MapEvents -2F:423B PowerPlant4_Blocks -2F:434A PowerPlant4_Unk -2F:4349 PowerPlant4_MapScripts -2F:4236 PowerPlant4_MapEvents -2F:436C RuinsOfAlphEntrance_Blocks -2F:43C7 RuinsOfAlphEntrance_Unk -2F:43C6 RuinsOfAlphEntrance_MapScripts -2F:4367 RuinsOfAlphEntrance_MapEvents -2F:43E9 RuinsOfAlphMain_Blocks -2F:468D RuinsOfAlphMain_Unk -2F:468C RuinsOfAlphMain_MapScripts -2F:43E4 RuinsOfAlphMain_MapEvents -2F:46AF CaveMinecarts1_Blocks -2F:4818 CaveMinecarts1_Unk -2F:4817 CaveMinecarts1_MapScripts -2F:46AA CaveMinecarts1_MapEvents -2F:483A CaveMinecarts2_Blocks -2F:49A3 CaveMinecarts2_Unk -2F:49A2 CaveMinecarts2_MapScripts -2F:4835 CaveMinecarts2_MapEvents -2F:49C5 CaveMinecarts3_Blocks -2F:4B2E CaveMinecarts3_Unk -2F:4B2D CaveMinecarts3_MapScripts -2F:49C0 CaveMinecarts3_MapEvents -2F:4B50 CaveMinecarts4_Blocks -2F:4CB9 CaveMinecarts4_Unk -2F:4CB8 CaveMinecarts4_MapScripts -2F:4B4B CaveMinecarts4_MapEvents -2F:4CDB CaveMinecarts5_Blocks -2F:4E44 CaveMinecarts5_Unk -2F:4E43 CaveMinecarts5_MapScripts -2F:4CD6 CaveMinecarts5_MapEvents -2F:4E66 CaveMinecarts6_Blocks -2F:4F1B CaveMinecarts6_Unk -2F:4F1A CaveMinecarts6_MapScripts -2F:4E61 CaveMinecarts6_MapEvents -2F:4F3D CaveMinecarts7_Blocks -2F:4FF2 CaveMinecarts7_Unk -2F:4FF1 CaveMinecarts7_MapScripts -2F:4F38 CaveMinecarts7_MapEvents -2F:5014 Office1_Blocks -2F:506F Office1_Unk -2F:506E Office1_MapScripts -2F:500F Office1_MapEvents -2F:5091 Office2_Blocks -2F:51A0 Office2_Unk -2F:519F Office2_MapScripts -2F:508C Office2_MapEvents -2F:51C2 Office3_Blocks -2F:5277 Office3_Unk -2F:5276 Office3_MapScripts -2F:51BD Office3_MapEvents -2F:5299 SlowpokeWellEntrance_Blocks -2F:52F4 SlowpokeWellEntrance_Unk -2F:52F3 SlowpokeWellEntrance_MapScripts -2F:5294 SlowpokeWellEntrance_MapEvents -2F:5316 SlowpokeWellMain_Blocks -2F:53CB SlowpokeWellMain_Unk -2F:53CA SlowpokeWellMain_MapScripts -2F:5311 SlowpokeWellMain_MapEvents -2F:5489 ShizukanaOka_Blocks -2F:5664 ShizukanaOka_Unk -2F:564B ShizukanaOka_MapScripts -2F:53E8 ShizukanaOka_MapEvents -34:402C RouteSilentEastGate_Blocks -34:4041 RouteSilentEastGate_Unk -34:4040 RouteSilentEastGate_MapScripts -34:400B RouteSilentEastGate_MapEvents -34:4088 PlayerHouse1F_Blocks -34:40CF PlayerHouse1F_Unk -34:409C PlayerHouse1F_MapScripts -34:404D PlayerHouse1F_MapEvents -34:4177 PlayerHouse2F_Blocks -34:419D PlayerHouse2F_Unk -34:418B PlayerHouse2F_MapScripts -34:413D PlayerHouse2F_MapEvents -34:4662 SilentPokecenter_Blocks -34:46BC SilentPokecenter_Unk -34:4682 SilentPokecenter_MapScripts -34:460A SilentPokecenter_MapEvents -34:4825 SilentHillHouse_Blocks -34:494C SilentHillHouse_Unk -34:4839 SilentHillHouse_MapScripts -34:47E0 SilentHillHouse_MapEvents -34:4B9C SilentHillLab_Blocks -34:4C48 SilentHillLab_Unk -34:4BBC SilentHillLab_MapScripts -34:4AB7 SilentHillLab_MapEvents -34:5C59 SilentHillLab2_Blocks -34:5CA1 SilentHillLab2_Unk -34:5C69 SilentHillLab2_MapScripts -34:5BF1 SilentHillLab2_MapEvents -34:6068 Unused13_Blocks -34:6089 Unused13_Unk -34:6078 Unused13_MapScripts -34:6068 Unused13_MapEvents -36:40B3 SilentHill_Blocks -36:78D5 SilentHill_Unk -36:7669 SilentHill_MapScripts -36:4043 SilentHill_MapEvents -36:4208 OldCity_Blocks -36:4000 OldCity_Unk -36:4370 OldCity_MapScripts -36:4130 OldCity_MapEvents -36:4468 West_Blocks -36:4000 West_Unk -36:45D0 West_MapScripts -36:4395 West_MapEvents -36:468E Haiteku_Blocks -36:4000 Haiteku_Unk -36:47F6 Haiteku_MapScripts -36:45E9 Haiteku_MapEvents -36:4897 Fonto_Blocks -36:4000 Fonto_Unk -36:48F1 Fonto_MapScripts -36:4827 Fonto_MapEvents -36:499D Baadon_Blocks -36:4000 Baadon_Unk -36:49F7 Baadon_MapScripts -36:4922 Baadon_MapEvents -36:4AD0 Newtype_Blocks -36:4000 Newtype_Unk -36:4C38 Newtype_MapScripts -36:4A28 Newtype_MapEvents -36:4CA9 Sugar_Blocks -36:4000 Sugar_Unk -36:4D03 Sugar_MapScripts -36:4C51 Sugar_MapEvents -36:4DBE BullForest_Blocks -36:4000 BullForest_Unk -36:4F26 BullForest_MapScripts -36:4D34 BullForest_MapEvents -36:5033 Stand_Blocks -36:4000 Stand_Unk -36:519B Stand_MapScripts -36:4F4B Stand_MapEvents -36:52C7 Kanto_Blocks -36:4000 Kanto_Unk -36:55F1 Kanto_MapScripts -36:51C0 Kanto_MapEvents -36:561B Prince_Blocks -36:4000 Prince_Unk -36:5675 Prince_MapScripts -36:5616 Prince_MapEvents -36:5693 MtFuji_Blocks -36:4000 MtFuji_Unk -36:56ED MtFuji_MapScripts -36:568E MtFuji_MapEvents -36:57AA South_Blocks -36:4000 South_Unk -36:5912 South_MapScripts -36:571E South_MapEvents -36:5983 North_Blocks -36:4000 North_Unk -36:59DD North_MapScripts -36:592B North_MapEvents -36:5A37 Route1P1_Blocks -36:7BAD Route1P1_Unk -36:7B98 Route1P1_MapScripts -36:5A02 Route1P1_MapEvents -36:5B20 Route1P2_Blocks -36:7C7B Route1P2_Unk -36:7C68 Route1P2_MapScripts -36:5AE1 Route1P2_MapEvents -36:5C3D Route2_Blocks -36:4000 Route2_Unk -36:5CC4 Route2_MapScripts -36:5BF7 Route2_MapEvents -36:5CEE HaitekuWestRoute_Blocks -36:4000 HaitekuWestRoute_Unk -36:5DCF HaitekuWestRoute_MapScripts -36:5CE9 HaitekuWestRoute_MapEvents -36:5E07 HaitekuWestRouteOcean_Blocks -36:4000 HaitekuWestRouteOcean_Unk -36:5F15 HaitekuWestRouteOcean_MapScripts -36:5DF4 HaitekuWestRouteOcean_MapEvents -36:5F46 FontoRoute1_Blocks -36:4000 FontoRoute1_Unk -36:6081 FontoRoute1_MapScripts -36:5F3A FontoRoute1_MapEvents -36:60AB FontoRoute6_Blocks -36:4000 FontoRoute6_Unk -36:61E6 FontoRoute6_MapScripts -36:60A6 FontoRoute6_MapEvents -36:6210 FontoRoute2_Blocks -36:4000 FontoRoute2_Unk -36:62C4 FontoRoute2_MapScripts -36:620B FontoRoute2_MapEvents -36:62FC FontoRoute4_Blocks -36:4000 FontoRoute4_Unk -36:63B0 FontoRoute4_MapScripts -36:62E9 FontoRoute4_MapEvents -36:63DA FontoRoute3_Blocks -36:4000 FontoRoute3_Unk -36:64BB FontoRoute3_MapScripts -36:63D5 FontoRoute3_MapEvents -36:64F3 BaadonRoute1_Blocks -36:4000 BaadonRoute1_Unk -36:6601 BaadonRoute1_MapScripts -36:64E0 BaadonRoute1_MapEvents -36:662B BaadonRoute2_Blocks -36:4000 BaadonRoute2_Unk -36:67ED BaadonRoute2_MapScripts -36:6626 BaadonRoute2_MapEvents -36:6825 BaadonRoute3_Blocks -36:4000 BaadonRoute3_Unk -36:68D9 BaadonRoute3_MapScripts -36:6812 BaadonRoute3_MapEvents -36:6934 Route15_Blocks -36:4000 Route15_Unk -36:69BB Route15_MapScripts -36:68FE Route15_MapEvents -36:69E5 NewtypeRoute_Blocks -36:4000 NewtypeRoute_Unk -36:6A6C NewtypeRoute_MapScripts -36:69E0 NewtypeRoute_MapEvents -36:6AAB Route18_Blocks -36:4000 Route18_Unk -36:6C6D Route18_MapScripts -36:6A91 Route18_MapEvents -36:6CAC BullForestRoute1_Blocks -36:4000 BullForestRoute1_Unk -36:6D8D BullForestRoute1_MapScripts -36:6C92 BullForestRoute1_MapEvents -36:6DC5 SugarRoute_Blocks -36:4000 SugarRoute_Unk -36:6ED3 SugarRoute_MapScripts -36:6DB2 SugarRoute_MapEvents -36:6F0B BullForestRoute2_Blocks -36:4000 BullForestRoute2_Unk -36:7019 BullForestRoute2_MapScripts -36:6EF8 BullForestRoute2_MapEvents -36:7051 StandRoute_Blocks -36:4000 StandRoute_Unk -36:715F StandRoute_MapScripts -36:703E StandRoute_MapEvents -36:7197 KantoEastRoute_Blocks -36:4000 KantoEastRoute_Unk -36:724B KantoEastRoute_MapScripts -36:7184 KantoEastRoute_MapEvents -36:727C RouteSilentEast_Blocks -36:4000 RouteSilentEast_Unk -36:738A RouteSilentEast_MapScripts -36:7270 RouteSilentEast_MapEvents -36:73B4 PrinceRoute_Blocks -36:4000 PrinceRoute_Unk -36:73E6 PrinceRoute_MapScripts -36:73AF PrinceRoute_MapEvents -36:7410 MtFujiRoute_Blocks -36:4000 MtFujiRoute_Unk -36:7442 MtFujiRoute_MapScripts -36:740B MtFujiRoute_MapEvents -36:747A FontoRoute5_Blocks -36:4000 FontoRoute5_Unk -36:752E FontoRoute5_MapScripts -36:7467 FontoRoute5_MapEvents -36:7558 BullForestRoute3_Blocks -36:4000 BullForestRoute3_Unk -36:7666 BullForestRoute3_MapScripts -36:7553 BullForestRoute3_MapEvents +2F:5664 ShizukanaOkaTextPointers +2F:564B ShizukanaOkaScriptLoader +25:47A4 OldCityPokecenter2FTextPointers +25:4782 OldCityPokecenter2FScriptLoader +25:4882 OldCityPokecenterTradeTextPointers +25:4866 OldCityPokecenterTradeScriptLoader +25:4907 OldCityPokecenterBattleTextPointers +25:48EB OldCityPokecenterBattleScriptLoader +25:499D OldCityPokecenterTimeMachineTextPointers +25:497E OldCityPokecenterTimeMachineScriptLoader @@ -1,15 +1,15 @@ INCLUDE "constants.asm" -SECTION "Sprite Buffers", SRAM, BANK[$00] +SECTION "Sprite Buffers", SRAM sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000 sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188 sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310 -SECTION "Unknown, bank 0", SRAM[$A600], BANK[$00] +SECTION "Unknown, bank 0", SRAM s0_a600:: ; TODO: properly label this ds 7 ; TODO: figure out exact size -SECTION "Window Stack Top", SRAM[$BFFE], BANK[$00] -sWindowStackTop:: dw +SECTION "Window Stack Top", SRAM +sWindowStackTop:: dw
\ No newline at end of file diff --git a/tools/fix_sections.py b/tools/fix_sections.py new file mode 100644 index 0000000..dc23f52 --- /dev/null +++ b/tools/fix_sections.py @@ -0,0 +1,137 @@ +import os, errno +import re +import fix_sections_directory + +os.chdir("..") +cwd = os.getcwd() + +debug_lines_startswith = [ + "SECTION ", + "else", + "SECTION ", + "endc" +] + +with open("pokegold-spaceworld-gen.link", "r") as f: + linkerscript = f.read() + +def clean_section(line, file, multiple): + global linkerscript + lines = line.lstrip().split("\"") + if "@" in lines[1] or file == lines[1] or file == "hram.asm" or file == "vram.asm" or file == "sram.asm": + file = lines[1] + else: + file += ("@" + lines[1]) if multiple else "" + + linkerscript = linkerscript.replace("\"" + lines[1] + "\"", "\"" + file + "\"") + if "ROMX" in lines[2]: + return "SECTION \"%s\", ROMX" % file + elif "HRAM" in lines[2]: + return "SECTION \"%s\", HRAM" % file + elif "VRAM" in lines[2]: + return "SECTION \"%s\", VRAM" % file + elif "ROM0" in lines[2]: + return "SECTION \"%s\", ROM0" % file + elif "SRAM" in lines[2]: + return "SECTION \"%s\", SRAM" % file + else: + raise + +TEMP_PATH = fix_sections_directory.TEMP_DIRECTORY + +for root, dirs, files in os.walk(cwd): + for file in files: + rel_root = os.path.relpath(root, cwd) + if not rel_root.startswith("build") and not rel_root.startswith("temp") and file.endswith(".asm") and file != "rst.asm" and file != "wram.asm" and file != "zero_checksum.asm": + canonical_path = os.path.join(root, file) + rel_path = os.path.relpath(canonical_path, cwd) + with open(canonical_path, "r") as f: + contents = f.read() + content_lines = contents.splitlines() + + if "SECTION" in contents: + print(canonical_path) + modify_flag = False + skip_next_line = False + for i, line in enumerate(content_lines): + if not skip_next_line: + if line.lstrip().startswith("SECTION"): + modify_flag = True + content_lines[i] = clean_section(content_lines[i], rel_path, contents.count("SECTION") > 1) + elif "if DEBUG" in line: + debug_content_lines = content_lines[i+1:i+5] + debug_code = False + for debug_content_line, debug_line_startswith in zip(debug_content_lines, debug_lines_startswith): + if not debug_content_line.lstrip().startswith(debug_line_startswith): + break + else: + modify_flag = True + content_lines[i] = "; " + content_lines[i] + content_lines[i+1] = clean_section(content_lines[i+1], rel_path, contents.count("SECTION") > 2) + content_lines[i+2] = "; " + content_lines[i+2] + content_lines[i+3] = "; " + content_lines[i+3] + content_lines[i+4] = "; " + content_lines[i+4] + skip_next_line = True + else: + skip_next_line = False + + if modify_flag: + output = "\n".join(content_lines) + print("rel root: " + rel_root) + try: + os.makedirs(TEMP_PATH + rel_root) + except OSError as e: + if e.errno != errno.EEXIST: + raise + + with open(TEMP_PATH + rel_path, "w+") as f: + f.write(output) + +linkerscript_lines = linkerscript.splitlines() + +i = 0 +clean_wram = False + +while i < len(linkerscript_lines): + line = linkerscript_lines[i] + if clean_wram: + if "org $dfff" not in line: + print(linkerscript_lines.pop(i)) + else: + clean_wram = False + i += 1 + elif "\"Shim for " in line: + no_pop_count = 0 + shim_addr = line.replace(", ", " ; ").split(" ; ")[1] + if linkerscript_lines[i-1] == "\torg " + shim_addr and linkerscript_lines[i-1] != "\torg $4000": + print(linkerscript_lines.pop(i-1)) + else: + no_pop_count += 1 + print(linkerscript_lines.pop(i-1 + no_pop_count)) + + if linkerscript_lines[i-1 + no_pop_count] == "\t; " + shim_addr: + print(linkerscript_lines.pop(i-1 + no_pop_count)) + else: + no_pop_count += 1 + + i -= 3 - no_pop_count + print("") + elif "ROMX" in line and "org $4000" not in linkerscript_lines[i+1]: + linkerscript_lines.insert(i+1, "\torg $4000") + i += 1 + elif line.startswith("WRAM0"): + linkerscript_lines.insert(i+1, "\torg $c000") + i += 1 + elif "\"Map Buffer\"" in line: + clean_wram = True + i += 1 + else: + i += 1 + +for i in range(len(linkerscript_lines)): + linkerscript_lines[i] = linkerscript_lines[i].split(" ; ")[0] + +linkerscript = "\n".join(linkerscript_lines) + "\n" + +with open(TEMP_PATH + "pokegold-spaceworld.link", "w+") as f: + f.write(linkerscript)
\ No newline at end of file diff --git a/tools/fix_sections_directory.py b/tools/fix_sections_directory.py new file mode 100644 index 0000000..d359c8c --- /dev/null +++ b/tools/fix_sections_directory.py @@ -0,0 +1 @@ +TEMP_DIRECTORY = ""
\ No newline at end of file @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "VRAM", VRAM[$8000], BANK[$00] ; Get around a RGBLINK bug. Remove this when it doesn't yield an error about fixing the section +SECTION "VRAM", VRAM UNION @@ -1,7 +1,7 @@ INCLUDE "constants.asm" -SECTION "Music engine RAM", WRAM0[$C000] +SECTION "Music engine RAM", WRAM0 wMusic:: ; c000 @@ -76,14 +76,12 @@ wc1ba:: db ; c1ba wMusicInitEnd:: ; c1bc -SECTION "OAM buffer", WRAM0[$C200] +SECTION "OAM Buffer", WRAM0 wVirtualOAM:: ; c200 ds SPRITEOAMSTRUCT_LENGTH * NUM_SPRITE_OAM_STRUCTS wVirtualOAMEnd:: -SECTION "Tile map", WRAM0 [$C2A0] - wTileMap:: ; c2a0 ds SCREEN_HEIGHT * SCREEN_WIDTH @@ -99,11 +97,15 @@ NEXTU ; Monster or Trainer test? wWhichPicTest:: ; c40b db +; c40c + ds 180 + +wSpriteAnimIDBuffer:: db ; c4c0 ENDU -SECTION "Map buffer", WRAM0[$C5E8] +SECTION "Map Buffer", WRAM0 wMapBuffer:: wMapScriptNumber:: db ; c5e8 @@ -965,7 +967,7 @@ wWildMons:: ; d91b ds 41 -SECTION "Stack bottom", WRAM0[$DFFF] +SECTION "Stack Bottom", WRAM0 ; Where SP is set at game init wStackBottom:: ; dfff |