diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-07-03 17:07:05 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-07-03 17:07:05 -0400 |
| commit | e1659ecd41dfac70eb021c0f5fe983ed6f043433 (patch) | |
| tree | 86ec6137c666650168716247fa63241e79b1788b | |
| parent | f3f0e711bf4f4205fd29f2b448c93ff5597507e5 (diff) | |
Introduce linkerscript.
Addresses of sections will now be added to the linkerscript via `org`, and the section name will be the path/to/file. If there is more than one section in the file, then add a @SectionName after the path/to/file to describe the section.
134 files changed, 1899 insertions, 783 deletions
@@ -33,4 +33,4 @@ tools/gfx # extra utilities coverage.png coverage.log -pokegold-spaceworld.link +temp/ @@ -14,7 +14,8 @@ sort_sym := tools/sort_symfile.sh RGBASMFLAGS := -h -E -i $(BUILD)/ -DGOLD -DDEBUG=1 tools/gfx := -ROM := pokegold-spaceworld.gb +ROMNAME := pokegold-spaceworld +ROM := $(ROMNAME).gb BASEROM := baserom.gb SHIM := shim.sym CORRECTEDROM := $(ROM:%.gb=%-correctheader.gb) @@ -55,7 +56,7 @@ coverage: $(ROM:.gb=.map) tools/disasm_coverage.py $(PYTHON) tools/disasm_coverage.py -m $< -b 0x40 .PHONY: linkerscript -linkerscript: $(ROM:.gb=.link) +linkerscript: $(ROMNAME)-gen.link %.link: %.map tools/map2link.py $(PYTHON3) tools/map2link.py $< $@ @@ -68,7 +69,7 @@ $(CORRECTEDROM): %-correctheader.gb: %.gb $(RGBFIX) -f hg -m 0x10 $@ $(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 $(ROMNAME).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/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 index 4ff1d0e..a902a09 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -67,770 +67,770 @@ elif "\1" == "east" endc ENDM -SECTION "Route2Gate1F", ROMX[$4000], BANK[$25] +SECTION "data/maps/attributes.asm@Route2Gate1F", ROMX map_attributes Route2Gate1F, ROUTE_2_GATE_1F, 0 -SECTION "Route2Gate2F", ROMX[$407C], BANK[$25] +SECTION "data/maps/attributes.asm@Route2Gate2F", ROMX map_attributes Route2Gate2F, ROUTE_2_GATE_2F, 0 -SECTION "Route2House", ROMX[$40DC], BANK[$25] +SECTION "data/maps/attributes.asm@Route2House", ROMX map_attributes Route2House, ROUTE_2_HOUSE, 0 -SECTION "OldCityMuseum", ROMX[$414A], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityMuseum", ROMX map_attributes OldCityMuseum, OLD_CITY_MUSEUM, 0 -SECTION "OldCityGym", ROMX[$41CD], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityGym", ROMX map_attributes OldCityGym, OLD_CITY_GYM, 0 -SECTION "OldCityTower1F", ROMX[$4289], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityTower1F", ROMX map_attributes OldCityTower1F, OLD_CITY_TOWER_1F, 0 -SECTION "OldCityTower2F", ROMX[$4319], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityTower2F", ROMX map_attributes OldCityTower2F, OLD_CITY_TOWER_2F, 0 -SECTION "OldCityTower3F", ROMX[$439E], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityTower3F", ROMX map_attributes OldCityTower3F, OLD_CITY_TOWER_3F, 0 -SECTION "OldCityTower4F", ROMX[$4423], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityTower4F", ROMX map_attributes OldCityTower4F, OLD_CITY_TOWER_4F, 0 -SECTION "OldCityTower5F", ROMX[$44A8], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityTower5F", ROMX map_attributes OldCityTower5F, OLD_CITY_TOWER_5F, 0 -SECTION "OldCityBillsHouse", ROMX[$44FC], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityBillsHouse", ROMX map_attributes OldCityBillsHouse, OLD_CITY_BILLS_HOUSE, 0 -SECTION "OldCityMart", ROMX[$456A], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityMart", ROMX map_attributes OldCityMart, OLD_CITY_MART, 0 -SECTION "OldCityHouse", ROMX[$45EE], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityHouse", ROMX map_attributes OldCityHouse, OLD_CITY_HOUSE, 0 -SECTION "OldCityPokecenter1F", ROMX[$466E], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityPokecenter1F", ROMX map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, 0 -SECTION "OldCityPokecenter2F", ROMX[$46FE], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityPokecenter2F", ROMX map_attributes OldCityPokecenter2F, OLD_CITY_POKECENTER_2F, 0 -SECTION "OldCityPokecenterTrade", ROMX[$4826], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityPokecenterTrade", ROMX map_attributes OldCityPokecenterTrade, OLD_CITY_POKECENTER_TRADE, 0 -SECTION "OldCityPokecenterBattle", ROMX[$48AC], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityPokecenterBattle", ROMX map_attributes OldCityPokecenterBattle, OLD_CITY_POKECENTER_BATTLE, 0 -SECTION "OldCityPokecenterTimeMachine", ROMX[$492F], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityPokecenterTimeMachine", ROMX map_attributes OldCityPokecenterTimeMachine, OLD_CITY_POKECENTER_TIME_MACHINE, 0 -SECTION "OldCityKurtsHouse", ROMX[$49AC], BANK[$25] +SECTION "data/maps/attributes.asm@OldCityKurtsHouse", ROMX map_attributes OldCityKurtsHouse, OLD_CITY_KURTS_HOUSE, 0 -SECTION "OldCitySchool", ROMX[$4A26], BANK[$25] +SECTION "data/maps/attributes.asm@OldCitySchool", ROMX map_attributes OldCitySchool, OLD_CITY_SCHOOL, 0 -SECTION "Route1Gate1F", ROMX[$4000], BANK[$26] +SECTION "data/maps/attributes.asm@Route1Gate1F", ROMX map_attributes Route1Gate1F, ROUTE_1_GATE_1F, 0 -SECTION "Route1Gate2F", ROMX[$40DA], BANK[$26] +SECTION "data/maps/attributes.asm@Route1Gate2F", ROMX map_attributes Route1Gate2F, ROUTE_1_GATE_2F, 0 -SECTION "WestMart1F", ROMX[$4224], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart1F", ROMX map_attributes WestMart1F, WEST_MART_1F, 0 -SECTION "WestMart2F", ROMX[$42A0], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart2F", ROMX map_attributes WestMart2F, WEST_MART_2F, 0 -SECTION "WestMart3F", ROMX[$4374], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart3F", ROMX map_attributes WestMart3F, WEST_MART_3F, 0 -SECTION "WestMart4F", ROMX[$4433], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart4F", ROMX map_attributes WestMart4F, WEST_MART_4F, 0 -SECTION "WestMart5F", ROMX[$44F2], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart5F", ROMX map_attributes WestMart5F, WEST_MART_5F, 0 -SECTION "WestMart6F", ROMX[$4581], BANK[$26] +SECTION "data/maps/attributes.asm@WestMart6F", ROMX map_attributes WestMart6F, WEST_MART_6F, 0 -SECTION "WestMartElevator", ROMX[$460E], BANK[$26] +SECTION "data/maps/attributes.asm@WestMartElevator", ROMX map_attributes WestMartElevator, WEST_MART_ELEVATOR, 0 -SECTION "WestRadioTower1F", ROMX[$464B], BANK[$26] +SECTION "data/maps/attributes.asm@WestRadioTower1F", ROMX map_attributes WestRadioTower1F, WEST_RADIO_TOWER_1F, 0 -SECTION "WestRadioTower2F", ROMX[$46CA], BANK[$26] +SECTION "data/maps/attributes.asm@WestRadioTower2F", ROMX map_attributes WestRadioTower2F, WEST_RADIO_TOWER_2F, 0 -SECTION "WestRadioTower3F", ROMX[$4772], BANK[$26] +SECTION "data/maps/attributes.asm@WestRadioTower3F", ROMX map_attributes WestRadioTower3F, WEST_RADIO_TOWER_3F, 0 -SECTION "WestRadioTower4F", ROMX[$4827], BANK[$26] +SECTION "data/maps/attributes.asm@WestRadioTower4F", ROMX map_attributes WestRadioTower4F, WEST_RADIO_TOWER_4F, 0 -SECTION "WestRadioTower5F", ROMX[$48E9], BANK[$26] +SECTION "data/maps/attributes.asm@WestRadioTower5F", ROMX map_attributes WestRadioTower5F, WEST_RADIO_TOWER_5F, 0 -SECTION "WestRocketRaidedHouse", ROMX[$499F], BANK[$26] +SECTION "data/maps/attributes.asm@WestRocketRaidedHouse", ROMX map_attributes WestRocketRaidedHouse, WEST_ROCKET_RAIDED_HOUSE, 0 -SECTION "WestPokecenter1F", ROMX[$4A49], BANK[$26] +SECTION "data/maps/attributes.asm@WestPokecenter1F", ROMX map_attributes WestPokecenter1F, WEST_POKECENTER_1F, 0 -SECTION "WestPokecenter2F", ROMX[$4AE1], BANK[$26] +SECTION "data/maps/attributes.asm@WestPokecenter2F", ROMX map_attributes WestPokecenter2F, WEST_POKECENTER_2F, 0 -SECTION "WestGym", ROMX[$4B5E], BANK[$26] +SECTION "data/maps/attributes.asm@WestGym", ROMX map_attributes WestGym, WEST_GYM, 0 -SECTION "WestHouse1", ROMX[$4C1A], BANK[$26] +SECTION "data/maps/attributes.asm@WestHouse1", ROMX map_attributes WestHouse1, WEST_HOUSE_1, 0 -SECTION "WestHouse2", ROMX[$4C9E], BANK[$26] +SECTION "data/maps/attributes.asm@WestHouse2", ROMX map_attributes WestHouse2, WEST_HOUSE_2, 0 -SECTION "HaitekuWestRouteGate", ROMX[$4000], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuWestRouteGate", ROMX map_attributes HaitekuWestRouteGate, HAITEKU_WEST_ROUTE_GATE, 0 -SECTION "HaitekuPokecenter1F", ROMX[$405B], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuPokecenter1F", ROMX map_attributes HaitekuPokecenter1F, HAITEKU_POKECENTER_1F, 0 -SECTION "HaitekuPokecenter2F", ROMX[$40EF], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuPokecenter2F", ROMX map_attributes HaitekuPokecenter2F, HAITEKU_POKECENTER_2F, 0 -SECTION "HaitekuLeague1F", ROMX[$4168], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuLeague1F", ROMX map_attributes HaitekuLeague1F, HAITEKU_LEAGUE_1F, 0 -SECTION "HaitekuLeague2F", ROMX[$4209], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuLeague2F", ROMX map_attributes HaitekuLeague2F, HAITEKU_LEAGUE_2F, 0 -SECTION "HaitekuMart", ROMX[$42A9], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuMart", ROMX map_attributes HaitekuMart, HAITEKU_MART, 0 -SECTION "HaitekuHouse1", ROMX[$4329], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuHouse1", ROMX map_attributes HaitekuHouse1, HAITEKU_HOUSE_1, 0 -SECTION "HaitekuHouse2", ROMX[$4383], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuHouse2", ROMX map_attributes HaitekuHouse2, HAITEKU_HOUSE_2, 0 -SECTION "HaitekuImposterOakHouse", ROMX[$43DD], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuImposterOakHouse", ROMX map_attributes HaitekuImposterOakHouse, HAITEKU_IMPOSTER_OAK_HOUSE, 0 -SECTION "HaitekuAquarium1F", ROMX[$4444], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuAquarium1F", ROMX map_attributes HaitekuAquarium1F, HAITEKU_AQUARIUM_1F, 0 -SECTION "HaitekuAquarium2F", ROMX[$44CB], BANK[$27] +SECTION "data/maps/attributes.asm@HaitekuAquarium2F", ROMX map_attributes HaitekuAquarium2F, HAITEKU_AQUARIUM_2F, 0 -SECTION "FontoRouteGate1", ROMX[$4537], BANK[$27] +SECTION "data/maps/attributes.asm@FontoRouteGate1", ROMX map_attributes FontoRouteGate1, FONTO_ROUTE_GATE_1, 0 -SECTION "FontoRouteGate2", ROMX[$4592], BANK[$27] +SECTION "data/maps/attributes.asm@FontoRouteGate2", ROMX map_attributes FontoRouteGate2, FONTO_ROUTE_GATE_2, 0 -SECTION "FontoRouteGate3", ROMX[$45ED], BANK[$27] +SECTION "data/maps/attributes.asm@FontoRouteGate3", ROMX map_attributes FontoRouteGate3, FONTO_ROUTE_GATE_3, 0 -SECTION "FontoRocketHouse", ROMX[$4648], BANK[$27] +SECTION "data/maps/attributes.asm@FontoRocketHouse", ROMX map_attributes FontoRocketHouse, FONTO_ROCKET_HOUSE, 0 -SECTION "FontoMart", ROMX[$46D5], BANK[$27] +SECTION "data/maps/attributes.asm@FontoMart", ROMX map_attributes FontoMart, FONTO_MART, 0 -SECTION "FontoHouse", ROMX[$4755], BANK[$27] +SECTION "data/maps/attributes.asm@FontoHouse", ROMX map_attributes FontoHouse, FONTO_HOUSE, 0 -SECTION "FontoPokecenter1F", ROMX[$47AF], BANK[$27] +SECTION "data/maps/attributes.asm@FontoPokecenter1F", ROMX map_attributes FontoPokecenter1F, FONTO_POKECENTER_1F, 0 -SECTION "FontoPokecenter2F", ROMX[$4843], BANK[$27] +SECTION "data/maps/attributes.asm@FontoPokecenter2F", ROMX map_attributes FontoPokecenter2F, FONTO_POKECENTER_2F, 0 -SECTION "FontoLab", ROMX[$48BC], BANK[$27] +SECTION "data/maps/attributes.asm@FontoLab", ROMX map_attributes FontoLab, FONTO_LAB, 0 -SECTION "BaadonMart", ROMX[$4923], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonMart", ROMX map_attributes BaadonMart, BAADON_MART, 0 -SECTION "BaadonPokecenter1F", ROMX[$49A3], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonPokecenter1F", ROMX map_attributes BaadonPokecenter1F, BAADON_POKECENTER_1F, 0 -SECTION "BaadonPokecenter2F", ROMX[$4A2A], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonPokecenter2F", ROMX map_attributes BaadonPokecenter2F, BAADON_POKECENTER_2F, 0 -SECTION "BaadonHouse1", ROMX[$4AA3], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonHouse1", ROMX map_attributes BaadonHouse1, BAADON_HOUSE_1, 0 -SECTION "BaadonWallpaperHouse", ROMX[$4AF9], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonWallpaperHouse", ROMX map_attributes BaadonWallpaperHouse, BAADON_WALLPAPER_HOUSE, 0 -SECTION "BaadonHouse2", ROMX[$4B42], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonHouse2", ROMX map_attributes BaadonHouse2, BAADON_HOUSE_2, 0 -SECTION "BaadonLeague1F", ROMX[$4B9C], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonLeague1F", ROMX map_attributes BaadonLeague1F, BAADON_LEAGUE_1F, 0 -SECTION "BaadonLeague2F", ROMX[$4C3D], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonLeague2F", ROMX map_attributes BaadonLeague2F, BAADON_LEAGUE_2F, 0 -SECTION "BaadonRouteGateWest", ROMX[$4CDD], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonRouteGateWest", ROMX map_attributes BaadonRouteGateWest, BAADON_ROUTE_GATE_WEST, 0 -SECTION "BaadonRouteGateNewtype", ROMX[$4D38], BANK[$27] +SECTION "data/maps/attributes.asm@BaadonRouteGateNewtype", ROMX map_attributes BaadonRouteGateNewtype, BAADON_ROUTE_GATE_NEWTYPE, 0 -SECTION "NewtypePokecenter1F", ROMX[$4D93], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypePokecenter1F", ROMX map_attributes NewtypePokecenter1F, NEWTYPE_POKECENTER_1F, 0 -SECTION "NewtypePokecenter2F", ROMX[$4E27], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypePokecenter2F", ROMX map_attributes NewtypePokecenter2F, NEWTYPE_POKECENTER_2F, 0 -SECTION "NewtypeLeague1F", ROMX[$4EA0], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeLeague1F", ROMX map_attributes NewtypeLeague1F, NEWTYPE_LEAGUE_1F, 0 -SECTION "NewtypeLeague2F", ROMX[$4F41], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeLeague2F", ROMX map_attributes NewtypeLeague2F, NEWTYPE_LEAGUE_2F, 0 -SECTION "NewtypeSailorHouse", ROMX[$4FE1], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeSailorHouse", ROMX map_attributes NewtypeSailorHouse, NEWTYPE_SAILOR_HOUSE, 0 -SECTION "NewtypeMart", ROMX[$503B], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeMart", ROMX map_attributes NewtypeMart, NEWTYPE_MART, 0 -SECTION "NewtypeDojo", ROMX[$50BB], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeDojo", ROMX map_attributes NewtypeDojo, NEWTYPE_DOJO, 0 -SECTION "NewtypeHouse1", ROMX[$5155], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeHouse1", ROMX map_attributes NewtypeHouse1, NEWTYPE_HOUSE_1, 0 -SECTION "NewtypeDiner", ROMX[$51AF], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeDiner", ROMX map_attributes NewtypeDiner, NEWTYPE_DINER, 0 -SECTION "NewtypeHouse2", ROMX[$522C], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeHouse2", ROMX map_attributes NewtypeHouse2, NEWTYPE_HOUSE_2, 0 -SECTION "NewtypeHouse3", ROMX[$5286], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeHouse3", ROMX map_attributes NewtypeHouse3, NEWTYPE_HOUSE_3, 0 -SECTION "Route15Pokecenter1F", ROMX[$52E0], BANK[$27] +SECTION "data/maps/attributes.asm@Route15Pokecenter1F", ROMX map_attributes Route15Pokecenter1F, ROUTE_15_POKECENTER_1F, 0 -SECTION "Route15Pokecenter2F", ROMX[$5374], BANK[$27] +SECTION "data/maps/attributes.asm@Route15Pokecenter2F", ROMX map_attributes Route15Pokecenter2F, ROUTE_15_POKECENTER_2F, 0 -SECTION "NewtypeRouteGate", ROMX[$53C6], BANK[$27] +SECTION "data/maps/attributes.asm@NewtypeRouteGate", ROMX map_attributes NewtypeRouteGate, NEWTYPE_ROUTE_GATE, 0 -SECTION "Route18Pokecenter1F", ROMX[$5421], BANK[$27] +SECTION "data/maps/attributes.asm@Route18Pokecenter1F", ROMX map_attributes Route18Pokecenter1F, ROUTE_18_POKECENTER_1F, 0 -SECTION "Route18Pokecenter2F", ROMX[$54B5], BANK[$27] +SECTION "data/maps/attributes.asm@Route18Pokecenter2F", ROMX map_attributes Route18Pokecenter2F, ROUTE_18_POKECENTER_2F, 0 -SECTION "SugarRouteGate", ROMX[$5507], BANK[$27] +SECTION "data/maps/attributes.asm@SugarRouteGate", ROMX map_attributes SugarRouteGate, SUGAR_ROUTE_GATE, 0 -SECTION "SugarHouse", ROMX[$5562], BANK[$27] +SECTION "data/maps/attributes.asm@SugarHouse", ROMX map_attributes SugarHouse, SUGAR_HOUSE, 0 -SECTION "SugarHouse2", ROMX[$55E2], BANK[$27] +SECTION "data/maps/attributes.asm@SugarHouse2", ROMX map_attributes SugarHouse2, SUGAR_HOUSE_2, 0 -SECTION "SugarMart", ROMX[$5638], BANK[$27] +SECTION "data/maps/attributes.asm@SugarMart", ROMX map_attributes SugarMart, SUGAR_MART, 0 -SECTION "SugarPokecenter1F", ROMX[$56B8], BANK[$27] +SECTION "data/maps/attributes.asm@SugarPokecenter1F", ROMX map_attributes SugarPokecenter1F, SUGAR_POKECENTER_1F, 0 -SECTION "SugarPokecenter2F", ROMX[$574C], BANK[$27] +SECTION "data/maps/attributes.asm@SugarPokecenter2F", ROMX map_attributes SugarPokecenter2F, SUGAR_POKECENTER_2F, 0 -SECTION "BullForestRoute1House", ROMX[$57C5], BANK[$27] +SECTION "data/maps/attributes.asm@BullForestRoute1House", ROMX map_attributes BullForestRoute1House, BULL_FOREST_ROUTE_1_HOUSE, 0 -SECTION "BullForestRouteGateStand", ROMX[$581F], BANK[$27] +SECTION "data/maps/attributes.asm@BullForestRouteGateStand", ROMX map_attributes BullForestRouteGateStand, BULL_FOREST_ROUTE_GATE_STAND, 0 -SECTION "BullMart", ROMX[$587A], BANK[$27] +SECTION "data/maps/attributes.asm@BullMart", ROMX map_attributes BullMart, BULL_MART, 0 -SECTION "BullHouse1", ROMX[$58FA], BANK[$27] +SECTION "data/maps/attributes.asm@BullHouse1", ROMX map_attributes BullHouse1, BULL_HOUSE_1, 0 -SECTION "BullHouse2", ROMX[$5950], BANK[$27] +SECTION "data/maps/attributes.asm@BullHouse2", ROMX map_attributes BullHouse2, BULL_HOUSE_2, 0 -SECTION "BullHouse3", ROMX[$59AA], BANK[$27] +SECTION "data/maps/attributes.asm@BullHouse3", ROMX map_attributes BullHouse3, BULL_HOUSE_3, 0 -SECTION "BullPokecenter1F", ROMX[$5A04], BANK[$27] +SECTION "data/maps/attributes.asm@BullPokecenter1F", ROMX map_attributes BullPokecenter1F, BULL_POKECENTER_1F, 0 -SECTION "BullPokecenter2F", ROMX[$5A98], BANK[$27] +SECTION "data/maps/attributes.asm@BullPokecenter2F", ROMX map_attributes BullPokecenter2F, BULL_POKECENTER_2F, 0 -SECTION "BullLeague1F", ROMX[$5B11], BANK[$27] +SECTION "data/maps/attributes.asm@BullLeague1F", ROMX map_attributes BullLeague1F, BULL_LEAGUE_1F, 0 -SECTION "BullLeague2F", ROMX[$5BB2], BANK[$27] +SECTION "data/maps/attributes.asm@BullLeague2F", ROMX map_attributes BullLeague2F, BULL_LEAGUE_2F, 0 -SECTION "BullHouse4", ROMX[$5C52], BANK[$27] +SECTION "data/maps/attributes.asm@BullHouse4", ROMX map_attributes BullHouse4, BULL_HOUSE_4, 0 -SECTION "StandRouteGateKanto", ROMX[$5C9F], BANK[$27] +SECTION "data/maps/attributes.asm@StandRouteGateKanto", ROMX map_attributes StandRouteGateKanto, STAND_ROUTE_GATE_KANTO, 0 -SECTION "StandLab", ROMX[$5CFA], BANK[$27] +SECTION "data/maps/attributes.asm@StandLab", ROMX map_attributes StandLab, STAND_LAB, 0 -SECTION "StandPokecenter1F", ROMX[$5D50], BANK[$27] +SECTION "data/maps/attributes.asm@StandPokecenter1F", ROMX map_attributes StandPokecenter1F, STAND_POKECENTER_1F, 0 -SECTION "StandPokecenter2F", ROMX[$5DE4], BANK[$27] +SECTION "data/maps/attributes.asm@StandPokecenter2F", ROMX map_attributes StandPokecenter2F, STAND_POKECENTER_2F, 0 -SECTION "StandOffice", ROMX[$5E5D], BANK[$27] +SECTION "data/maps/attributes.asm@StandOffice", ROMX map_attributes StandOffice, STAND_OFFICE, 0 -SECTION "StandMart", ROMX[$5EDD], BANK[$27] +SECTION "data/maps/attributes.asm@StandMart", ROMX map_attributes StandMart, STAND_MART, 0 -SECTION "StandHouse", ROMX[$5F5D], BANK[$27] +SECTION "data/maps/attributes.asm@StandHouse", ROMX map_attributes StandHouse, STAND_HOUSE, 0 -SECTION "StandRocketHouse1F", ROMX[$5FB7], BANK[$27] +SECTION "data/maps/attributes.asm@StandRocketHouse1F", ROMX map_attributes StandRocketHouse1F, STAND_ROCKET_HOUSE_1F, 0 -SECTION "StandRocketHouse2F", ROMX[$6024], BANK[$27] +SECTION "data/maps/attributes.asm@StandRocketHouse2F", ROMX map_attributes StandRocketHouse2F, STAND_ROCKET_HOUSE_2F, 0 -SECTION "StandLeague1F", ROMX[$6083], BANK[$27] +SECTION "data/maps/attributes.asm@StandLeague1F", ROMX map_attributes StandLeague1F, STAND_LEAGUE_1F, 0 -SECTION "StandLeague2F", ROMX[$6124], BANK[$27] +SECTION "data/maps/attributes.asm@StandLeague2F", ROMX map_attributes StandLeague2F, STAND_LEAGUE_2F, 0 -SECTION "KantoCeruleanHouse", ROMX[$61C4], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeruleanHouse", ROMX map_attributes KantoCeruleanHouse, KANTO_CERULEAN_HOUSE, 0 -SECTION "KantoPokecenter1F", ROMX[$621E], BANK[$27] +SECTION "data/maps/attributes.asm@KantoPokecenter1F", ROMX map_attributes KantoPokecenter1F, KANTO_POKECENTER_1F, 0 -SECTION "KantoPokecenter2F", ROMX[$62B2], BANK[$27] +SECTION "data/maps/attributes.asm@KantoPokecenter2F", ROMX map_attributes KantoPokecenter2F, KANTO_POKECENTER_2F, 0 -SECTION "KantoLeague1F", ROMX[$632B], BANK[$27] +SECTION "data/maps/attributes.asm@KantoLeague1F", ROMX map_attributes KantoLeague1F, KANTO_LEAGUE_1F, 0 -SECTION "KantoLeague2F", ROMX[$63CC], BANK[$27] +SECTION "data/maps/attributes.asm@KantoLeague2F", ROMX map_attributes KantoLeague2F, KANTO_LEAGUE_2F, 0 -SECTION "KantoLavenderHouse", ROMX[$646C], BANK[$27] +SECTION "data/maps/attributes.asm@KantoLavenderHouse", ROMX map_attributes KantoLavenderHouse, KANTO_LAVENDER_HOUSE, 0 -SECTION "KantoCeladonMart1F", ROMX[$64D3], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonMart1F", ROMX map_attributes KantoCeladonMart1F, KANTO_CELADON_MART_1F, 0 -SECTION "KantoCeladonMart2F", ROMX[$6547], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonMart2F", ROMX map_attributes KantoCeladonMart2F, KANTO_CELADON_MART_2F, 0 -SECTION "KantoCeladonMart3F", ROMX[$65C1], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonMart3F", ROMX map_attributes KantoCeladonMart3F, KANTO_CELADON_MART_3F, 0 -SECTION "KantoCeladonMart4F", ROMX[$663B], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonMart4F", ROMX map_attributes KantoCeladonMart4F, KANTO_CELADON_MART_4F, 0 -SECTION "KantoCeladonMart5F", ROMX[$66C2], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonMart5F", ROMX map_attributes KantoCeladonMart5F, KANTO_CELADON_MART_5F, 0 -SECTION "KantoCeladonElevator", ROMX[$6742], BANK[$27] +SECTION "data/maps/attributes.asm@KantoCeladonElevator", ROMX map_attributes KantoCeladonElevator, KANTO_CELADON_ELEVATOR, 0 -SECTION "KantoMart", ROMX[$677F], BANK[$27] +SECTION "data/maps/attributes.asm@KantoMart", ROMX map_attributes KantoMart, KANTO_MART, 0 -SECTION "KantoGamefreakHQ1", ROMX[$67FF], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGamefreakHQ1", ROMX map_attributes KantoGamefreakHQ1, KANTO_GAMEFREAK_HQ_1, 0 -SECTION "KantoGamefreakHQ2", ROMX[$6899], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGamefreakHQ2", ROMX map_attributes KantoGamefreakHQ2, KANTO_GAMEFREAK_HQ_2, 0 -SECTION "KantoGamefreakHQ3", ROMX[$6905], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGamefreakHQ3", ROMX map_attributes KantoGamefreakHQ3, KANTO_GAMEFREAK_HQ_3, 0 -SECTION "KantoGamefreakHQ4", ROMX[$698B], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGamefreakHQ4", ROMX map_attributes KantoGamefreakHQ4, KANTO_GAMEFREAK_HQ_4, 0 -SECTION "KantoGamefreakHQ5", ROMX[$69E3], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGamefreakHQ5", ROMX map_attributes KantoGamefreakHQ5, KANTO_GAMEFREAK_HQ_5, 0 -SECTION "KantoSilphCo", ROMX[$6A2C], BANK[$27] +SECTION "data/maps/attributes.asm@KantoSilphCo", ROMX map_attributes KantoSilphCo, KANTO_SILPH_CO, 0 -SECTION "KantoViridianHouse", ROMX[$6ADF], BANK[$27] +SECTION "data/maps/attributes.asm@KantoViridianHouse", ROMX map_attributes KantoViridianHouse, KANTO_VIRIDIAN_HOUSE, 0 -SECTION "KantoGameCorner", ROMX[$6B46], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGameCorner", ROMX map_attributes KantoGameCorner, KANTO_GAME_CORNER, 0 -SECTION "KantoUnusedArea", ROMX[$6C55], BANK[$27] +SECTION "data/maps/attributes.asm@KantoUnusedArea", ROMX map_attributes KantoUnusedArea, KANTO_UNUSED_AREA, 0 -SECTION "KantoGameCornerPrizes", ROMX[$6C90], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGameCornerPrizes", ROMX map_attributes KantoGameCornerPrizes, KANTO_GAME_CORNER_PRIZES, 0 -SECTION "KantoDiner", ROMX[$6D04], BANK[$27] +SECTION "data/maps/attributes.asm@KantoDiner", ROMX map_attributes KantoDiner, KANTO_DINER, 0 -SECTION "KantoSchool", ROMX[$6D51], BANK[$27] +SECTION "data/maps/attributes.asm@KantoSchool", ROMX map_attributes KantoSchool, KANTO_SCHOOL, 0 -SECTION "KantoHospital", ROMX[$6DEB], BANK[$27] +SECTION "data/maps/attributes.asm@KantoHospital", ROMX map_attributes KantoHospital, KANTO_HOSPITAL, 0 -SECTION "KantoPokecenter21F", ROMX[$6E6B], BANK[$27] +SECTION "data/maps/attributes.asm@KantoPokecenter21F", ROMX map_attributes KantoPokecenter21F, KANTO_POKECENTER_2_1F, 0 -SECTION "KantoPokecenter22F", ROMX[$6EFF], BANK[$27] +SECTION "data/maps/attributes.asm@KantoPokecenter22F", ROMX map_attributes KantoPokecenter22F, KANTO_POKECENTER_2_2F, 0 -SECTION "KantoRedsHouse", ROMX[$6F78], BANK[$27] +SECTION "data/maps/attributes.asm@KantoRedsHouse", ROMX map_attributes KantoRedsHouse, KANTO_REDS_HOUSE, 0 -SECTION "KantoGreensHouse1F", ROMX[$6FDF], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGreensHouse1F", ROMX map_attributes KantoGreensHouse1F, KANTO_GREENS_HOUSE_1F, 0 -SECTION "KantoGreensHouse2F", ROMX[$703C], BANK[$27] +SECTION "data/maps/attributes.asm@KantoGreensHouse2F", ROMX map_attributes KantoGreensHouse2F, KANTO_GREENS_HOUSE_2F, 0 -SECTION "KantoEldersHouse", ROMX[$707E], BANK[$27] +SECTION "data/maps/attributes.asm@KantoEldersHouse", ROMX map_attributes KantoEldersHouse, KANTO_ELDERS_HOUSE, 0 -SECTION "KantoOaksLab", ROMX[$70E5], BANK[$27] +SECTION "data/maps/attributes.asm@KantoOaksLab", ROMX map_attributes KantoOaksLab, KANTO_OAKS_LAB, 0 -SECTION "KantoLeague21F", ROMX[$713B], BANK[$27] +SECTION "data/maps/attributes.asm@KantoLeague21F", ROMX map_attributes KantoLeague21F, KANTO_LEAGUE_2_1F, 0 -SECTION "KantoLeague22F", ROMX[$71DC], BANK[$27] +SECTION "data/maps/attributes.asm@KantoLeague22F", ROMX map_attributes KantoLeague22F, KANTO_LEAGUE_2_2F, 0 -SECTION "KantoFishingGuru", ROMX[$727C], BANK[$27] +SECTION "data/maps/attributes.asm@KantoFishingGuru", ROMX map_attributes KantoFishingGuru, KANTO_FISHING_GURU, 0 -SECTION "SouthHouse1", ROMX[$72D6], BANK[$27] +SECTION "data/maps/attributes.asm@SouthHouse1", ROMX map_attributes SouthHouse1, SOUTH_HOUSE_1, 0 -SECTION "SouthPokecenter1F", ROMX[$7330], BANK[$27] +SECTION "data/maps/attributes.asm@SouthPokecenter1F", ROMX map_attributes SouthPokecenter1F, SOUTH_POKECENTER_1F, 0 -SECTION "SouthPokecenter2F", ROMX[$73C4], BANK[$27] +SECTION "data/maps/attributes.asm@SouthPokecenter2F", ROMX map_attributes SouthPokecenter2F, SOUTH_POKECENTER_2F, 0 -SECTION "SouthMart", ROMX[$743D], BANK[$27] +SECTION "data/maps/attributes.asm@SouthMart", ROMX map_attributes SouthMart, SOUTH_MART, 0 -SECTION "SouthHouse2", ROMX[$74BD], BANK[$27] +SECTION "data/maps/attributes.asm@SouthHouse2", ROMX map_attributes SouthHouse2, SOUTH_HOUSE_2, 0 -SECTION "NorthHouse1", ROMX[$7517], BANK[$27] +SECTION "data/maps/attributes.asm@NorthHouse1", ROMX map_attributes NorthHouse1, NORTH_HOUSE_1, 0 -SECTION "NorthMart", ROMX[$7571], BANK[$27] +SECTION "data/maps/attributes.asm@NorthMart", ROMX map_attributes NorthMart, NORTH_MART, 0 -SECTION "NorthHouse2", ROMX[$75F1], BANK[$27] +SECTION "data/maps/attributes.asm@NorthHouse2", ROMX map_attributes NorthHouse2, NORTH_HOUSE_2, 0 -SECTION "NorthPokecenter1F", ROMX[$764B], BANK[$27] +SECTION "data/maps/attributes.asm@NorthPokecenter1F", ROMX map_attributes NorthPokecenter1F, NORTH_POKECENTER_1F, 0 -SECTION "NorthPokecenter2F", ROMX[$76DF], BANK[$27] +SECTION "data/maps/attributes.asm@NorthPokecenter2F", ROMX map_attributes NorthPokecenter2F, NORTH_POKECENTER_2F, 0 -SECTION "PowerPlant1", ROMX[$4000], BANK[$2F] +SECTION "data/maps/attributes.asm@PowerPlant1", ROMX map_attributes PowerPlant1, POWER_PLANT_1, 0 -SECTION "PowerPlant2", ROMX[$407D], BANK[$2F] +SECTION "data/maps/attributes.asm@PowerPlant2", ROMX map_attributes PowerPlant2, POWER_PLANT_2, 0 -SECTION "PowerPlant3", ROMX[$40FA], BANK[$2F] +SECTION "data/maps/attributes.asm@PowerPlant3", ROMX map_attributes PowerPlant3, POWER_PLANT_3, 0 -SECTION "PowerPlant4", ROMX[$422B], BANK[$2F] +SECTION "data/maps/attributes.asm@PowerPlant4", ROMX map_attributes PowerPlant4, POWER_PLANT_4, 0 -SECTION "RuinsOfAlphEntrance", ROMX[$435C], BANK[$2F] +SECTION "data/maps/attributes.asm@RuinsOfAlphEntrance", ROMX map_attributes RuinsOfAlphEntrance, RUINS_OF_ALPH_ENTRANCE, 0 -SECTION "RuinsOfAlphMain", ROMX[$43D9], BANK[$2F] +SECTION "data/maps/attributes.asm@RuinsOfAlphMain", ROMX map_attributes RuinsOfAlphMain, RUINS_OF_ALPH_MAIN, 0 -SECTION "CaveMinecarts1", ROMX[$469F], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts1", ROMX map_attributes CaveMinecarts1, CAVE_MINECARTS_1, 0 -SECTION "CaveMinecarts2", ROMX[$482A], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts2", ROMX map_attributes CaveMinecarts2, CAVE_MINECARTS_2, 0 -SECTION "CaveMinecarts3", ROMX[$49B5], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts3", ROMX map_attributes CaveMinecarts3, CAVE_MINECARTS_3, 0 -SECTION "CaveMinecarts4", ROMX[$4B40], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts4", ROMX map_attributes CaveMinecarts4, CAVE_MINECARTS_4, 0 -SECTION "CaveMinecarts5", ROMX[$4CCB], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts5", ROMX map_attributes CaveMinecarts5, CAVE_MINECARTS_5, 0 -SECTION "CaveMinecarts6", ROMX[$4E56], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts6", ROMX map_attributes CaveMinecarts6, CAVE_MINECARTS_6, 0 -SECTION "CaveMinecarts7", ROMX[$4F2D], BANK[$2F] +SECTION "data/maps/attributes.asm@CaveMinecarts7", ROMX map_attributes CaveMinecarts7, CAVE_MINECARTS_7, 0 -SECTION "Office1", ROMX[$5004], BANK[$2F] +SECTION "data/maps/attributes.asm@Office1", ROMX map_attributes Office1, OFFICE_1, 0 -SECTION "Office2", ROMX[$5081], BANK[$2F] +SECTION "data/maps/attributes.asm@Office2", ROMX map_attributes Office2, OFFICE_2, 0 -SECTION "Office3", ROMX[$51B2], BANK[$2F] +SECTION "data/maps/attributes.asm@Office3", ROMX map_attributes Office3, OFFICE_3, 0 -SECTION "SlowpokeWellEntrance", ROMX[$5289], BANK[$2F] +SECTION "data/maps/attributes.asm@SlowpokeWellEntrance", ROMX map_attributes SlowpokeWellEntrance, SLOWPOKE_WELL_ENTRANCE, 0 -SECTION "SlowpokeWellMain", ROMX[$5306], BANK[$2F] +SECTION "data/maps/attributes.asm@SlowpokeWellMain", ROMX map_attributes SlowpokeWellMain, SLOWPOKE_WELL_MAIN, 0 -SECTION "ShizukanaOka", ROMX[$53DD], BANK[$2F] +SECTION "data/maps/attributes.asm@ShizukanaOka", ROMX map_attributes ShizukanaOka, SHIZUKANA_OKA, 0 -SECTION "RouteSilentEastGate", ROMX[$4000], BANK[$34] +SECTION "data/maps/attributes.asm@RouteSilentEastGate", ROMX map_attributes RouteSilentEastGate, ROUTE_SILENT_EAST_GATE, 0 -SECTION "PlayerHouse1F", ROMX[$4042], BANK[$34] +SECTION "data/maps/attributes.asm@PlayerHouse1F", ROMX map_attributes PlayerHouse1F, PLAYER_HOUSE_1F, 0 -SECTION "PlayerHouse2F", ROMX[$4132], BANK[$34] +SECTION "data/maps/attributes.asm@PlayerHouse2F", ROMX map_attributes PlayerHouse2F, PLAYER_HOUSE_2F, 0 -SECTION "SilentPokecenter", ROMX[$45FF], BANK[$34] +SECTION "data/maps/attributes.asm@SilentPokecenter", ROMX map_attributes SilentPokecenter, SILENT_POKECENTER, 0 -SECTION "SilentHillHouse", ROMX[$47D5], BANK[$34] +SECTION "data/maps/attributes.asm@SilentHillHouse", ROMX map_attributes SilentHillHouse, SILENT_HILL_HOUSE, 0 -SECTION "SilentHillLab", ROMX[$4AAC], BANK[$34] +SECTION "data/maps/attributes.asm@SilentHillLab", ROMX map_attributes SilentHillLab, SILENT_HILL_LAB, 0 -SECTION "SilentHillLab2", ROMX[$5BE6], BANK[$34] +SECTION "data/maps/attributes.asm@SilentHillLab2", ROMX map_attributes SilentHillLab2, SILENT_HILL_LAB_2, 0 -SECTION "Unused13", ROMX[$605D], BANK[$34] +SECTION "data/maps/attributes.asm@Unused13", ROMX map_attributes Unused13, UNUSED_13, 0 -SECTION "SilentHill", ROMX[$4014], BANK[$36] +SECTION "data/maps/attributes.asm@SilentHill", 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 -SECTION "OldCity", ROMX[$410D], BANK[$36] +SECTION "data/maps/attributes.asm@OldCity", 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 -SECTION "West", ROMX[$4372], BANK[$36] +SECTION "data/maps/attributes.asm@West", ROMX 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] +SECTION "data/maps/attributes.asm@Haiteku", ROMX map_attributes Haiteku, HAITEKU, WEST connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0, 0, 9 -SECTION "Fonto", ROMX[$47F8], BANK[$36] +SECTION "data/maps/attributes.asm@Fonto", 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 -SECTION "Baadon", ROMX[$48F3], BANK[$36] +SECTION "data/maps/attributes.asm@Baadon", 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 -SECTION "Newtype", ROMX[$49F9], BANK[$36] +SECTION "data/maps/attributes.asm@Newtype", 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 -SECTION "Sugar", ROMX[$4C3A], BANK[$36] +SECTION "data/maps/attributes.asm@Sugar", ROMX map_attributes Sugar, SUGAR, SOUTH connection south, SugarRoute, SUGAR_ROUTE, 0, 0, 10 -SECTION "BullForest", ROMX[$4D05], BANK[$36] +SECTION "data/maps/attributes.asm@BullForest", 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 -SECTION "Stand", ROMX[$4F28], BANK[$36] +SECTION "data/maps/attributes.asm@Stand", 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 -SECTION "Kanto", ROMX[$519D], BANK[$36] +SECTION "data/maps/attributes.asm@Kanto", 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 -SECTION "Prince", ROMX[$55F3], BANK[$36] +SECTION "data/maps/attributes.asm@Prince", ROMX 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] +SECTION "data/maps/attributes.asm@MtFuji", ROMX map_attributes MtFuji, MT_FUJI, SOUTH connection south, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10 -SECTION "South", ROMX[$56EF], BANK[$36] +SECTION "data/maps/attributes.asm@South", 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 -SECTION "North", ROMX[$5914], BANK[$36] +SECTION "data/maps/attributes.asm@North", ROMX map_attributes North, NORTH, SOUTH connection south, BullForestRoute3, BULL_FOREST_ROUTE_3, 0, 0, 10 -SECTION "Route1P1", ROMX[$59DF], BANK[$36] +SECTION "data/maps/attributes.asm@Route1P1", 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 -SECTION "Route1P2", ROMX[$5ABE], BANK[$36] +SECTION "data/maps/attributes.asm@Route1P2", 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 -SECTION "Route2", ROMX[$5BD4], BANK[$36] +SECTION "data/maps/attributes.asm@Route2", ROMX 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] +SECTION "data/maps/attributes.asm@HaitekuWestRoute", 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 -SECTION "HaitekuWestRouteOcean", ROMX[$5DD1], BANK[$36] +SECTION "data/maps/attributes.asm@HaitekuWestRouteOcean", 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 -SECTION "FontoRoute1", ROMX[$5F17], BANK[$36] +SECTION "data/maps/attributes.asm@FontoRoute1", ROMX 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] +SECTION "data/maps/attributes.asm@FontoRoute6", 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 -SECTION "FontoRoute2", ROMX[$61E8], BANK[$36] +SECTION "data/maps/attributes.asm@FontoRoute2", 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 -SECTION "FontoRoute4", ROMX[$62C6], BANK[$36] +SECTION "data/maps/attributes.asm@FontoRoute4", 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 -SECTION "FontoRoute3", ROMX[$63B2], BANK[$36] +SECTION "data/maps/attributes.asm@FontoRoute3", 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 -SECTION "BaadonRoute1", ROMX[$64BD], BANK[$36] +SECTION "data/maps/attributes.asm@BaadonRoute1", ROMX 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] +SECTION "data/maps/attributes.asm@BaadonRoute2", 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 -SECTION "BaadonRoute3", ROMX[$67EF], BANK[$36] +SECTION "data/maps/attributes.asm@BaadonRoute3", 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 -SECTION "Route15", ROMX[$68DB], BANK[$36] +SECTION "data/maps/attributes.asm@Route15", ROMX 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] +SECTION "data/maps/attributes.asm@NewtypeRoute", ROMX 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] +SECTION "data/maps/attributes.asm@Route18", 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 -SECTION "BullForestRoute1", ROMX[$6C6F], BANK[$36] +SECTION "data/maps/attributes.asm@BullForestRoute1", 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 -SECTION "SugarRoute", ROMX[$6D8F], BANK[$36] +SECTION "data/maps/attributes.asm@SugarRoute", ROMX 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] +SECTION "data/maps/attributes.asm@BullForestRoute2", 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 -SECTION "StandRoute", ROMX[$701B], BANK[$36] +SECTION "data/maps/attributes.asm@StandRoute", ROMX 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] +SECTION "data/maps/attributes.asm@KantoEastRoute", ROMX 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] +SECTION "data/maps/attributes.asm@RouteSilentEast", ROMX 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] +SECTION "data/maps/attributes.asm@PrinceRoute", ROMX 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] +SECTION "data/maps/attributes.asm@MtFujiRoute", ROMX 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] +SECTION "data/maps/attributes.asm@FontoRoute5", 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 -SECTION "BullForestRoute3", ROMX[$7530], BANK[$36] +SECTION "data/maps/attributes.asm@BullForestRoute3", 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 + connection south, BullForest, BULL_FOREST, -3, 2, 16
\ 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..6f8f896 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -11,7 +11,7 @@ map: MACRO db 0, 0 ; ??? ENDM -SECTION "Map Data", ROMX[$4000], BANK[$04] +SECTION "data/maps/maps.asm", ROMX db 0 ; ??? @@ -294,4 +294,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/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..3a60696 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 432570a..75fd00a 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Main Menu", ROMX[$53CC], BANK[$01] +SECTION "engine/menu/main_menu.asm", ROMX MainMenu:: ; 01:53CC ld hl, wd4a9 @@ -208,4 +208,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/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..d8739e5 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,7 @@ Unreferenced_GetMoveName:: ; 00:37fc pop hl ret -SECTION "GetNick", ROM0[$3a97] +SECTION "home/names.asm@GetNick", ROM0 GetNick: ; 00:3a97 ; Get nickname a from list hl. @@ -259,4 +259,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..9a89497 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] @@ -17,4 +17,3 @@ TimeOfDayPals:: UpdateTimePals:: ; 33a callab _UpdateTimePals ; Func_8c335 ret - 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..9874234 100644 --- a/home/talk_to_npc.asm +++ b/home/talk_to_npc.asm @@ -1,10 +1,10 @@ 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 @@ -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..8a6ef44 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 @@ -416,4 +416,4 @@ LoadTileset:: ; 2f48 pop bc pop hl - ret + 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 diff --git a/maps/Map13.asm b/maps/Map13.asm index b69dc4b..ed74a16 100644 --- a/maps/Map13.asm +++ b/maps/Map13.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Map 13 Script", ROMX[$6078], BANK[$34] +SECTION "maps/Map13.asm", ROMX Map13ScriptLoader:: ; 6078 ld hl, Map13ScriptPointers diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 5157d63..f93f363 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Player's House 1F", ROMX[$409C], BANK[$34] +SECTION "maps/PlayersHouse1F.asm", ROMX PlayersHouse1FScriptLoader:: ; 409C ld hl, PlayersHouse1FScriptPointers diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index e96a07b..973b57c 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Player's House 2F", ROMX[$418B], BANK[$34] +SECTION "maps/PlayersHouse2F.asm", ROMX PlayersHouse2FScriptLoader:: ; 418B ld hl, PlayersHouse2FScriptPointers diff --git a/maps/Route1Gate1F.asm b/maps/Route1Gate1F.asm index 4772da7..1ab0485 100644 --- a/maps/Route1Gate1F.asm +++ b/maps/Route1Gate1F.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Route 1 Gate 1F", ROMX[$4061], BANK[$26] +SECTION "maps/Route1Gate1F.asm", ROMX Route1Gate1FScriptLoader: ;4061 ld hl, Route1Gate1FScriptPointers @@ -52,4 +52,3 @@ Route1Gate1FText2String: ; 40AC done ;ends at 40D9 - diff --git a/maps/Route1Gate2F.asm b/maps/Route1Gate2F.asm index 0ab81a8..7f9ec79 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 diff --git a/maps/Route1P1.asm b/maps/Route1P1.asm index d67ffd9..28bb505 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 diff --git a/maps/Route1P2.asm b/maps/Route1P2.asm index 9fa72ec..f47cce9 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 diff --git a/maps/SilentHills.asm b/maps/SilentHills.asm index ed7639c..37f567f 100644 --- a/maps/SilentHills.asm +++ b/maps/SilentHills.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Silent Hills Script", ROMX[$7669], BANK[$36] +SECTION "maps/SilentHills.asm", ROMX SilentHillsScriptLoader:: ; 7669 ld hl, SilentHillsScriptPointers1 diff --git a/maps/SilentHouse.asm b/maps/SilentHouse.asm index 70a6649..3d542ec 100644 --- a/maps/SilentHouse.asm +++ b/maps/SilentHouse.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Silent Hills House", ROMX[$4839], BANK[$34] +SECTION "maps/SilentHouse.asm", ROMX SilentHouseScriptLoader:: ; 4839 ld hl, SilentHouseScriptPointers diff --git a/maps/SilentLabP1.asm b/maps/SilentLabP1.asm index eb4cd57..6588e01 100644 --- a/maps/SilentLabP1.asm +++ b/maps/SilentLabP1.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Silent Lab P1", ROMX[$4BBC], BANK[$34] +SECTION "maps/SilentLabP1.asm", ROMX SilentLabP1ScriptLoader:: ; 4BBC ld hl, SilentLabP1ScriptPointers diff --git a/maps/SilentLabP2.asm b/maps/SilentLabP2.asm index 54aab8f..767e62a 100644 --- a/maps/SilentLabP2.asm +++ b/maps/SilentLabP2.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Silent Lab P2 Script", ROMX[$5C69], BANK[$34] +SECTION "maps/SilentLabP2.asm", ROMX SilentLabP2ScriptLoader:: ; 5C69 ld hl, SilentLabP2ScriptPointers diff --git a/maps/SilentPokecenter.asm b/maps/SilentPokecenter.asm index dc1a35a..30c27c1 100644 --- a/maps/SilentPokecenter.asm +++ b/maps/SilentPokecenter.asm @@ -1,6 +1,6 @@ include "constants.asm" -SECTION "Silent Hills Pokecenter", ROMX[$4682], BANK[$34] +SECTION "maps/SilentPokecenter.asm", ROMX SilentPokecenterScriptLoader:: ; 4682 ld hl, SilentPokecenterScriptPointers diff --git a/pokegold-spaceworld.link b/pokegold-spaceworld.link new file mode 100644 index 0000000..0bface0 --- /dev/null +++ b/pokegold-spaceworld.link @@ -0,0 +1,985 @@ +; Automatically generated by map2link.py +ROM0 + org $0000 + "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" + ; $2f6b + org $2f97 + "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" + ; $3a91 + org $3a97 + "home/names.asm@GetNick" + "home/print_bcd.asm" + "home/pokemon.asm@3AED" + org $3cbf + "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 $53cc + "engine/menu/main_menu.asm" + "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 $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 $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 $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 $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 $4000 + org $4fdb + "gfx.asm@Slot Machine GFX" +ROMX $25 + org $4000 + "data/maps/attributes.asm@Route2Gate1F" + org $407c + "data/maps/attributes.asm@Route2Gate2F" + org $40dc + "data/maps/attributes.asm@Route2House" + org $414a + "data/maps/attributes.asm@OldCityMuseum" + org $41cd + "data/maps/attributes.asm@OldCityGym" + org $4289 + "data/maps/attributes.asm@OldCityTower1F" + org $4319 + "data/maps/attributes.asm@OldCityTower2F" + org $439e + "data/maps/attributes.asm@OldCityTower3F" + org $4423 + "data/maps/attributes.asm@OldCityTower4F" + org $44a8 + "data/maps/attributes.asm@OldCityTower5F" + org $44fc + "data/maps/attributes.asm@OldCityBillsHouse" + org $456a + "data/maps/attributes.asm@OldCityMart" + org $45ee + "data/maps/attributes.asm@OldCityHouse" + org $466e + "data/maps/attributes.asm@OldCityPokecenter1F" + org $46fe + "data/maps/attributes.asm@OldCityPokecenter2F" + org $4826 + "data/maps/attributes.asm@OldCityPokecenterTrade" + org $48ac + "data/maps/attributes.asm@OldCityPokecenterBattle" + org $492f + "data/maps/attributes.asm@OldCityPokecenterTimeMachine" + org $49ac + "data/maps/attributes.asm@OldCityKurtsHouse" + org $4a26 + "data/maps/attributes.asm@OldCitySchool" +ROMX $26 + org $4000 + "data/maps/attributes.asm@Route1Gate1F" + org $40da + "data/maps/attributes.asm@Route1Gate2F" + org $4224 + "data/maps/attributes.asm@WestMart1F" + org $42a0 + "data/maps/attributes.asm@WestMart2F" + org $4374 + "data/maps/attributes.asm@WestMart3F" + org $4433 + "data/maps/attributes.asm@WestMart4F" + org $44f2 + "data/maps/attributes.asm@WestMart5F" + org $4581 + "data/maps/attributes.asm@WestMart6F" + org $460e + "data/maps/attributes.asm@WestMartElevator" + org $464b + "data/maps/attributes.asm@WestRadioTower1F" + org $46ca + "data/maps/attributes.asm@WestRadioTower2F" + org $4772 + "data/maps/attributes.asm@WestRadioTower3F" + org $4827 + "data/maps/attributes.asm@WestRadioTower4F" + org $48e9 + "data/maps/attributes.asm@WestRadioTower5F" + org $499f + "data/maps/attributes.asm@WestRocketRaidedHouse" + org $4a49 + "data/maps/attributes.asm@WestPokecenter1F" + org $4ae1 + "data/maps/attributes.asm@WestPokecenter2F" + org $4b5e + "data/maps/attributes.asm@WestGym" + org $4c1a + "data/maps/attributes.asm@WestHouse1" + org $4c9e + "data/maps/attributes.asm@WestHouse2" +ROMX $27 + org $4000 + "data/maps/attributes.asm@HaitekuWestRouteGate" + org $405b + "data/maps/attributes.asm@HaitekuPokecenter1F" + org $40ef + "data/maps/attributes.asm@HaitekuPokecenter2F" + org $4168 + "data/maps/attributes.asm@HaitekuLeague1F" + org $4209 + "data/maps/attributes.asm@HaitekuLeague2F" + org $42a9 + "data/maps/attributes.asm@HaitekuMart" + org $4329 + "data/maps/attributes.asm@HaitekuHouse1" + org $4383 + "data/maps/attributes.asm@HaitekuHouse2" + org $43dd + "data/maps/attributes.asm@HaitekuImposterOakHouse" + org $4444 + "data/maps/attributes.asm@HaitekuAquarium1F" + org $44cb + "data/maps/attributes.asm@HaitekuAquarium2F" + org $4537 + "data/maps/attributes.asm@FontoRouteGate1" + org $4592 + "data/maps/attributes.asm@FontoRouteGate2" + org $45ed + "data/maps/attributes.asm@FontoRouteGate3" + org $4648 + "data/maps/attributes.asm@FontoRocketHouse" + org $46d5 + "data/maps/attributes.asm@FontoMart" + org $4755 + "data/maps/attributes.asm@FontoHouse" + org $47af + "data/maps/attributes.asm@FontoPokecenter1F" + org $4843 + "data/maps/attributes.asm@FontoPokecenter2F" + org $48bc + "data/maps/attributes.asm@FontoLab" + org $4923 + "data/maps/attributes.asm@BaadonMart" + org $49a3 + "data/maps/attributes.asm@BaadonPokecenter1F" + org $4a2a + "data/maps/attributes.asm@BaadonPokecenter2F" + org $4aa3 + "data/maps/attributes.asm@BaadonHouse1" + org $4af9 + "data/maps/attributes.asm@BaadonWallpaperHouse" + org $4b42 + "data/maps/attributes.asm@BaadonHouse2" + org $4b9c + "data/maps/attributes.asm@BaadonLeague1F" + org $4c3d + "data/maps/attributes.asm@BaadonLeague2F" + org $4cdd + "data/maps/attributes.asm@BaadonRouteGateWest" + org $4d38 + "data/maps/attributes.asm@BaadonRouteGateNewtype" + org $4d93 + "data/maps/attributes.asm@NewtypePokecenter1F" + org $4e27 + "data/maps/attributes.asm@NewtypePokecenter2F" + org $4ea0 + "data/maps/attributes.asm@NewtypeLeague1F" + org $4f41 + "data/maps/attributes.asm@NewtypeLeague2F" + org $4fe1 + "data/maps/attributes.asm@NewtypeSailorHouse" + org $503b + "data/maps/attributes.asm@NewtypeMart" + org $50bb + "data/maps/attributes.asm@NewtypeDojo" + org $5155 + "data/maps/attributes.asm@NewtypeHouse1" + org $51af + "data/maps/attributes.asm@NewtypeDiner" + org $522c + "data/maps/attributes.asm@NewtypeHouse2" + org $5286 + "data/maps/attributes.asm@NewtypeHouse3" + org $52e0 + "data/maps/attributes.asm@Route15Pokecenter1F" + org $5374 + "data/maps/attributes.asm@Route15Pokecenter2F" + org $53c6 + "data/maps/attributes.asm@NewtypeRouteGate" + org $5421 + "data/maps/attributes.asm@Route18Pokecenter1F" + org $54b5 + "data/maps/attributes.asm@Route18Pokecenter2F" + org $5507 + "data/maps/attributes.asm@SugarRouteGate" + org $5562 + "data/maps/attributes.asm@SugarHouse" + org $55e2 + "data/maps/attributes.asm@SugarHouse2" + org $5638 + "data/maps/attributes.asm@SugarMart" + org $56b8 + "data/maps/attributes.asm@SugarPokecenter1F" + org $574c + "data/maps/attributes.asm@SugarPokecenter2F" + org $57c5 + "data/maps/attributes.asm@BullForestRoute1House" + org $581f + "data/maps/attributes.asm@BullForestRouteGateStand" + org $587a + "data/maps/attributes.asm@BullMart" + org $58fa + "data/maps/attributes.asm@BullHouse1" + org $5950 + "data/maps/attributes.asm@BullHouse2" + org $59aa + "data/maps/attributes.asm@BullHouse3" + org $5a04 + "data/maps/attributes.asm@BullPokecenter1F" + org $5a98 + "data/maps/attributes.asm@BullPokecenter2F" + org $5b11 + "data/maps/attributes.asm@BullLeague1F" + org $5bb2 + "data/maps/attributes.asm@BullLeague2F" + org $5c52 + "data/maps/attributes.asm@BullHouse4" + org $5c9f + "data/maps/attributes.asm@StandRouteGateKanto" + org $5cfa + "data/maps/attributes.asm@StandLab" + org $5d50 + "data/maps/attributes.asm@StandPokecenter1F" + org $5de4 + "data/maps/attributes.asm@StandPokecenter2F" + org $5e5d + "data/maps/attributes.asm@StandOffice" + org $5edd + "data/maps/attributes.asm@StandMart" + org $5f5d + "data/maps/attributes.asm@StandHouse" + org $5fb7 + "data/maps/attributes.asm@StandRocketHouse1F" + org $6024 + "data/maps/attributes.asm@StandRocketHouse2F" + org $6083 + "data/maps/attributes.asm@StandLeague1F" + org $6124 + "data/maps/attributes.asm@StandLeague2F" + org $61c4 + "data/maps/attributes.asm@KantoCeruleanHouse" + org $621e + "data/maps/attributes.asm@KantoPokecenter1F" + org $62b2 + "data/maps/attributes.asm@KantoPokecenter2F" + org $632b + "data/maps/attributes.asm@KantoLeague1F" + org $63cc + "data/maps/attributes.asm@KantoLeague2F" + org $646c + "data/maps/attributes.asm@KantoLavenderHouse" + org $64d3 + "data/maps/attributes.asm@KantoCeladonMart1F" + org $6547 + "data/maps/attributes.asm@KantoCeladonMart2F" + org $65c1 + "data/maps/attributes.asm@KantoCeladonMart3F" + org $663b + "data/maps/attributes.asm@KantoCeladonMart4F" + org $66c2 + "data/maps/attributes.asm@KantoCeladonMart5F" + org $6742 + "data/maps/attributes.asm@KantoCeladonElevator" + org $677f + "data/maps/attributes.asm@KantoMart" + org $67ff + "data/maps/attributes.asm@KantoGamefreakHQ1" + org $6899 + "data/maps/attributes.asm@KantoGamefreakHQ2" + org $6905 + "data/maps/attributes.asm@KantoGamefreakHQ3" + org $698b + "data/maps/attributes.asm@KantoGamefreakHQ4" + org $69e3 + "data/maps/attributes.asm@KantoGamefreakHQ5" + org $6a2c + "data/maps/attributes.asm@KantoSilphCo" + org $6adf + "data/maps/attributes.asm@KantoViridianHouse" + org $6b46 + "data/maps/attributes.asm@KantoGameCorner" + org $6c55 + "data/maps/attributes.asm@KantoUnusedArea" + org $6c90 + "data/maps/attributes.asm@KantoGameCornerPrizes" + org $6d04 + "data/maps/attributes.asm@KantoDiner" + org $6d51 + "data/maps/attributes.asm@KantoSchool" + org $6deb + "data/maps/attributes.asm@KantoHospital" + org $6e6b + "data/maps/attributes.asm@KantoPokecenter21F" + org $6eff + "data/maps/attributes.asm@KantoPokecenter22F" + org $6f78 + "data/maps/attributes.asm@KantoRedsHouse" + org $6fdf + "data/maps/attributes.asm@KantoGreensHouse1F" + org $703c + "data/maps/attributes.asm@KantoGreensHouse2F" + org $707e + "data/maps/attributes.asm@KantoEldersHouse" + org $70e5 + "data/maps/attributes.asm@KantoOaksLab" + org $713b + "data/maps/attributes.asm@KantoLeague21F" + org $71dc + "data/maps/attributes.asm@KantoLeague22F" + org $727c + "data/maps/attributes.asm@KantoFishingGuru" + org $72d6 + "data/maps/attributes.asm@SouthHouse1" + org $7330 + "data/maps/attributes.asm@SouthPokecenter1F" + org $73c4 + "data/maps/attributes.asm@SouthPokecenter2F" + org $743d + "data/maps/attributes.asm@SouthMart" + org $74bd + "data/maps/attributes.asm@SouthHouse2" + org $7517 + "data/maps/attributes.asm@NorthHouse1" + org $7571 + "data/maps/attributes.asm@NorthMart" + org $75f1 + "data/maps/attributes.asm@NorthHouse2" + org $764b + "data/maps/attributes.asm@NorthPokecenter1F" + org $76df + "data/maps/attributes.asm@NorthPokecenter2F" +ROMX $2f + org $4000 + "data/maps/attributes.asm@PowerPlant1" + org $407d + "data/maps/attributes.asm@PowerPlant2" + org $40fa + "data/maps/attributes.asm@PowerPlant3" + org $422b + "data/maps/attributes.asm@PowerPlant4" + org $435c + "data/maps/attributes.asm@RuinsOfAlphEntrance" + org $43d9 + "data/maps/attributes.asm@RuinsOfAlphMain" + org $469f + "data/maps/attributes.asm@CaveMinecarts1" + org $482a + "data/maps/attributes.asm@CaveMinecarts2" + org $49b5 + "data/maps/attributes.asm@CaveMinecarts3" + org $4b40 + "data/maps/attributes.asm@CaveMinecarts4" + org $4ccb + "data/maps/attributes.asm@CaveMinecarts5" + org $4e56 + "data/maps/attributes.asm@CaveMinecarts6" + org $4f2d + "data/maps/attributes.asm@CaveMinecarts7" + org $5004 + "data/maps/attributes.asm@Office1" + org $5081 + "data/maps/attributes.asm@Office2" + org $51b2 + "data/maps/attributes.asm@Office3" + org $5289 + "data/maps/attributes.asm@SlowpokeWellEntrance" + org $5306 + "data/maps/attributes.asm@SlowpokeWellMain" + org $53dd + "data/maps/attributes.asm@ShizukanaOka" +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 + org $4000 +ROMX $34 + org $4000 + "data/maps/attributes.asm@RouteSilentEastGate" + org $4042 + "data/maps/attributes.asm@PlayerHouse1F" + org $4132 + "data/maps/attributes.asm@PlayerHouse2F" + org $45ff + "data/maps/attributes.asm@SilentPokecenter" + org $47d5 + "data/maps/attributes.asm@SilentHillHouse" + org $4aac + "data/maps/attributes.asm@SilentHillLab" + org $5be6 + "data/maps/attributes.asm@SilentHillLab2" + org $605d + "data/maps/attributes.asm@Unused13" +ROMX $36 + org $4000 + org $4000 + org $4014 + "data/maps/attributes.asm@SilentHill" + org $410d + "data/maps/attributes.asm@OldCity" + org $4372 + "data/maps/attributes.asm@West" + org $45d2 + "data/maps/attributes.asm@Haiteku" + org $47f8 + "data/maps/attributes.asm@Fonto" + org $48f3 + "data/maps/attributes.asm@Baadon" + org $49f9 + "data/maps/attributes.asm@Newtype" + org $4c3a + "data/maps/attributes.asm@Sugar" + org $4d05 + "data/maps/attributes.asm@BullForest" + org $4f28 + "data/maps/attributes.asm@Stand" + org $519d + "data/maps/attributes.asm@Kanto" + org $55f3 + "data/maps/attributes.asm@Prince" + org $5677 + "data/maps/attributes.asm@MtFuji" + org $56ef + "data/maps/attributes.asm@South" + org $5914 + "data/maps/attributes.asm@North" + org $59df + "data/maps/attributes.asm@Route1P1" + org $5abe + "data/maps/attributes.asm@Route1P2" + org $5bd4 + "data/maps/attributes.asm@Route2" + org $5cc6 + "data/maps/attributes.asm@HaitekuWestRoute" + org $5dd1 + "data/maps/attributes.asm@HaitekuWestRouteOcean" + org $5f17 + "data/maps/attributes.asm@FontoRoute1" + org $6083 + "data/maps/attributes.asm@FontoRoute6" + org $61e8 + "data/maps/attributes.asm@FontoRoute2" + org $62c6 + "data/maps/attributes.asm@FontoRoute4" + org $63b2 + "data/maps/attributes.asm@FontoRoute3" + org $64bd + "data/maps/attributes.asm@BaadonRoute1" + org $6603 + "data/maps/attributes.asm@BaadonRoute2" + org $67ef + "data/maps/attributes.asm@BaadonRoute3" + org $68db + "data/maps/attributes.asm@Route15" + org $69bd + "data/maps/attributes.asm@NewtypeRoute" + org $6a6e + "data/maps/attributes.asm@Route18" + org $6c6f + "data/maps/attributes.asm@BullForestRoute1" + org $6d8f + "data/maps/attributes.asm@SugarRoute" + org $6ed5 + "data/maps/attributes.asm@BullForestRoute2" + org $701b + "data/maps/attributes.asm@StandRoute" + org $7161 + "data/maps/attributes.asm@KantoEastRoute" + org $724d + "data/maps/attributes.asm@RouteSilentEast" + org $738c + "data/maps/attributes.asm@PrinceRoute" + org $73e8 + "data/maps/attributes.asm@MtFujiRoute" + org $7444 + "data/maps/attributes.asm@FontoRoute5" + org $7530 + "data/maps/attributes.asm@BullForestRoute3" +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 $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 $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" @@ -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..266bb10 --- /dev/null +++ b/tools/fix_sections.py @@ -0,0 +1,134 @@ +import os, errno +import re + +os.chdir("..") +cwd = os.getcwd() + +debug_lines_startswith = [ + "SECTION ", + "else", + "SECTION ", + "endc" +] + +with open("pokegold-spaceworld.link", "r") as f: + linkerscript = f.read() + +def clean_section(line, file, multiple): + global linkerscript + lines = line.lstrip().split("\"") + 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 = "" + +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": + 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 + + """ + if debug_code: + debug_content_lines = content_lines[i+1:] + debug_code_index = 0 + while True: + #if debug_content_lines[debug_code_index].startswith("else"): + # conditional_type = 0 + # break + if debug_content_lines[debug_code_index].strip().startswith("endc"): + break + debug_code_index += 1 + print(line) + for debug_content_line in debug_content_lines[:debug_code_index+1]: + print(debug_content_line) + """ + 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 +while i < len(linkerscript_lines): + line = linkerscript_lines[i] + if "\"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: + linkerscript_lines.insert(i+1, "\torg $4000") + 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) + +with open(TEMP_PATH + "pokegold-spaceworld.link", "w+") as f: + f.write(linkerscript)
\ 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 @@ -103,7 +101,7 @@ wWhichPicTest:: ; c40b ENDU -SECTION "Map buffer", WRAM0[$C5E8] +SECTION "Map Buffer", WRAM0 wMapBuffer:: wMapScriptNumber:: db ; c5e8 @@ -955,7 +953,7 @@ wWildMons:: ; d91b ds 41 -SECTION "Stack bottom", WRAM0[$DFFF] +SECTION "Stack Bottom", WRAM0 ; Where SP is set at game init wStackBottom:: ; dfff |