diff options
458 files changed, 532 insertions, 791 deletions
@@ -362,7 +362,7 @@ INCLUDE "audio/sfx/cry22_3.asm" SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] -PlayBattleMusic:: ; 0x90c6 +PlayBattleMusic:: xor a ld [wAudioFadeOutControl], a ld [wLowHealthAlarm], a @@ -402,7 +402,7 @@ INCLUDE "audio/engine_1.asm" ; an alternate start for MeetRival which has a different first measure -Music_RivalAlternateStart:: ; 0x9b47 +Music_RivalAlternateStart:: ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -413,7 +413,7 @@ Music_RivalAlternateStart:: ; 0x9b47 call Audio1_OverwriteChannelPointer ld de, Music_MeetRival_branch_b2b5 -Audio1_OverwriteChannelPointer: ; 0x9b60 +Audio1_OverwriteChannelPointer: ld a, e ld [hli], a ld a, d @@ -421,7 +421,7 @@ Audio1_OverwriteChannelPointer: ; 0x9b60 ret ; an alternate tempo for MeetRival which is slightly slower -Music_RivalAlternateTempo:: ; 0x9b65 +Music_RivalAlternateTempo:: ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -430,14 +430,14 @@ Music_RivalAlternateTempo:: ; 0x9b65 jp Audio1_OverwriteChannelPointer ; applies both the alternate start and alternate tempo -Music_RivalAlternateStartAndTempo:: ; 0x9b75 +Music_RivalAlternateStartAndTempo:: call Music_RivalAlternateStart ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b19b jp Audio1_OverwriteChannelPointer ; an alternate tempo for Cities1 which is used for the Hall of Fame room -Music_Cities1AlternateTempo:: ; 0x9b81 +Music_Cities1AlternateTempo:: ld a, 10 ld [wAudioFadeOutCounterReloadValue], a ld [wAudioFadeOutCounter], a diff --git a/audio/engine_1.asm b/audio/engine_1.asm index c729fa7e..36f5db5a 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1,6 +1,6 @@ ; The first of three duplicated sound engines. -Audio1_UpdateMusic:: ; 0x9103 +Audio1_UpdateMusic:: ld c, CH0 .loop ld b, 0 @@ -36,7 +36,7 @@ Audio1_UpdateMusic:: ; 0x9103 ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -Audio1_ApplyMusicAffects: ; 0x9138 +Audio1_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc @@ -144,7 +144,7 @@ Audio1_ApplyMusicAffects: ; 0x9138 ; this routine executes all music commands that take up no time, ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached -Audio1_PlayNextNote: ; 0x91d0 +Audio1_PlayNextNote: ; reload the vibrato delay counter ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc @@ -160,7 +160,7 @@ Audio1_PlayNextNote: ; 0x91d0 call Audio1_endchannel ret -Audio1_endchannel: ; 0x91e6 +Audio1_endchannel: call Audio1_GetNextMusicByte ld d, a cp $ff ; is this command an endchannel? @@ -250,7 +250,7 @@ Audio1_endchannel: ; 0x91e6 ld [hl], b ret -Audio1_callchannel: ; 0x9274 +Audio1_callchannel: cp $fd ; is this command a callchannel? jp nz, Audio1_loopchannel ; no call Audio1_GetNextMusicByte @@ -287,7 +287,7 @@ Audio1_callchannel: ; 0x9274 set BIT_CHANNEL_CALL, [hl] ; set the call flag jp Audio1_endchannel -Audio1_loopchannel: ; 0x92a9 +Audio1_loopchannel: cp $fe ; is this command a loopchannel? jp nz, Audio1_notetype ; no call Audio1_GetNextMusicByte @@ -325,7 +325,7 @@ Audio1_loopchannel: ; 0x92a9 ld [hl], b jp Audio1_endchannel -Audio1_notetype: ; 0x92e4 +Audio1_notetype: and $f0 cp $d0 ; is this command a notetype? jp nz, Audio1_toggleperfectpitch ; no @@ -369,7 +369,7 @@ Audio1_notetype: ; 0x92e4 .noiseChannel jp Audio1_endchannel -Audio1_toggleperfectpitch: ; 0x9323 +Audio1_toggleperfectpitch: ld a, d cp $e8 ; is this command a toggleperfectpitch? jr nz, Audio1_vibrato ; no @@ -381,7 +381,7 @@ Audio1_toggleperfectpitch: ; 0x9323 ld [hl], a ; flip bit 0 of wChannelFlags1 jp Audio1_endchannel -Audio1_vibrato: ; 0x9335 +Audio1_vibrato: cp $ea ; is this command a vibrato? jr nz, Audio1_pitchbend ; no call Audio1_GetNextMusicByte @@ -429,7 +429,7 @@ Audio1_vibrato: ; 0x9335 jp Audio1_endchannel -Audio1_pitchbend: ; 0x936d +Audio1_pitchbend: cp $eb ; is this command a pitchbend? jr nz, Audio1_duty ; no call Audio1_GetNextMusicByte @@ -460,7 +460,7 @@ Audio1_pitchbend: ; 0x936d ld d, a jp Audio1_notelength -Audio1_duty: ; 0x93a5 +Audio1_duty: cp $ec ; is this command a duty? jr nz, Audio1_tempo ; no call Audio1_GetNextMusicByte @@ -473,7 +473,7 @@ Audio1_duty: ; 0x93a5 ld [hl], a ; store duty jp Audio1_endchannel -Audio1_tempo: ; 0x93ba +Audio1_tempo: cp $ed ; is this command a tempo? jr nz, Audio1_stereopanning ; no ld a, c @@ -502,7 +502,7 @@ Audio1_tempo: ; 0x93ba .musicChannelDone jp Audio1_endchannel -Audio1_stereopanning: ; 0x93fa +Audio1_stereopanning: cp $ee ; is this command a stereopanning? jr nz, Audio1_unknownmusic0xef ; no call Audio1_GetNextMusicByte @@ -510,7 +510,7 @@ Audio1_stereopanning: ; 0x93fa jp Audio1_endchannel ; this appears to never be used -Audio1_unknownmusic0xef: ; 0x9407 +Audio1_unknownmusic0xef: cp $ef ; is this command an unknownmusic0xef? jr nz, Audio1_dutycycle ; no call Audio1_GetNextMusicByte @@ -527,7 +527,7 @@ Audio1_unknownmusic0xef: ; 0x9407 .skip jp Audio1_endchannel -Audio1_dutycycle: ; 0x9426 +Audio1_dutycycle: cp $fc ; is this command a dutycycle? jr nz, Audio1_volume ; no call Audio1_GetNextMusicByte @@ -544,14 +544,14 @@ Audio1_dutycycle: ; 0x9426 set BIT_ROTATE_DUTY, [hl] jp Audio1_endchannel -Audio1_volume: ; 0x9444 +Audio1_volume: cp $f0 ; is this command a volume? jr nz, Audio1_executemusic ; no call Audio1_GetNextMusicByte ld [rNR50], a ; store volume jp Audio1_endchannel -Audio1_executemusic: ; 0x9450 +Audio1_executemusic: cp $f8 ; is this command an executemusic? jr nz, Audio1_octave ; no ld b, $0 @@ -560,7 +560,7 @@ Audio1_executemusic: ; 0x9450 set BIT_EXECUTE_MUSIC, [hl] jp Audio1_endchannel -Audio1_octave: ; 0x945f +Audio1_octave: and $f0 cp $e0 ; is this command an octave? jr nz, Audio1_unknownsfx0x20 ; no @@ -572,7 +572,7 @@ Audio1_octave: ; 0x945f ld [hl], a ; store low nibble as octave jp Audio1_endchannel -Audio1_unknownsfx0x20: ; 0x9472 +Audio1_unknownsfx0x20: cp $20 ; is this command an unknownsfx0x20? jr nz, Audio1_unknownsfx0x10 ld a, c @@ -676,7 +676,7 @@ asm_94fd pop bc pop de -Audio1_notelength: ; 0x950a +Audio1_notelength: ld a, d push af and $f @@ -734,7 +734,7 @@ Audio1_notelength: ; 0x950a pop hl ret -Audio1_notepitch: ; 0x9568 +Audio1_notepitch: pop af and $f0 cp $c0 ; compare to rest @@ -829,7 +829,7 @@ Audio1_notepitch: ; 0x9568 call Audio1_ApplyWavePatternAndFrequency ret -Audio1_EnableChannelOutput: ; 0x95f8 +Audio1_EnableChannelOutput: ld b, 0 ld hl, Audio1_HWChannelEnableMasks add hl, bc @@ -866,7 +866,7 @@ Audio1_EnableChannelOutput: ; 0x95f8 ld [rNR51], a ret -Audio1_ApplyDutyAndSoundLength: ; 0x9629 +Audio1_ApplyDutyAndSoundLength: ld b, 0 ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc @@ -891,7 +891,7 @@ Audio1_ApplyDutyAndSoundLength: ; 0x9629 ld [hl], d ret -Audio1_ApplyWavePatternAndFrequency: ; 0x964b +Audio1_ApplyWavePatternAndFrequency: ld a, c cp CH2 jr z, .channel3 @@ -942,7 +942,7 @@ Audio1_ApplyWavePatternAndFrequency: ; 0x964b call Audio1_ApplyFrequencyModifier ret -Audio1_SetSfxTempo: ; 0x9693 +Audio1_SetSfxTempo: call Audio1_IsCry jr nc, .notCry ld d, 0 @@ -963,7 +963,7 @@ Audio1_SetSfxTempo: ; 0x9693 .done ret -Audio1_ApplyFrequencyModifier: ; 0x96b5 +Audio1_ApplyFrequencyModifier: call Audio1_IsCry jr nc, .done ; if playing a cry, add the cry's frequency modifier @@ -980,7 +980,7 @@ Audio1_ApplyFrequencyModifier: ; 0x96b5 .done ret -Audio1_GoBackOneCommandIfCry: ; 0x96c7 +Audio1_GoBackOneCommandIfCry: call Audio1_IsCry jr nc, .done ld hl, wChannelCommandPointers @@ -1003,7 +1003,7 @@ Audio1_GoBackOneCommandIfCry: ; 0x96c7 ccf ret -Audio1_IsCry: ; 0x96e5 +Audio1_IsCry: ; Returns whether the currently playing audio is a cry in carry. ld a, [wChannelSoundIDs + CH4] cp CRY_SFX_START @@ -1021,7 +1021,7 @@ Audio1_IsCry: ; 0x96e5 scf ret -Audio1_ApplyPitchBend: ; 0x96f9 +Audio1_ApplyPitchBend: ld hl, wChannelFlags1 add hl, bc bit BIT_PITCH_BEND_DECREASING, [hl] @@ -1125,7 +1125,7 @@ Audio1_ApplyPitchBend: ; 0x96f9 res BIT_PITCH_BEND_DECREASING, [hl] ret -Audio1_InitPitchBendVars: ; 0x978f +Audio1_InitPitchBendVars: ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d @@ -1224,7 +1224,7 @@ Audio1_InitPitchBendVars: ; 0x978f ld [hl], a ; store remainder - dividend ret -Audio1_ApplyDutyCycle: ; 0x980d +Audio1_ApplyDutyCycle: ld b, 0 ld hl, wChannelDutyCycles add hl, bc @@ -1242,7 +1242,7 @@ Audio1_ApplyDutyCycle: ; 0x980d ld [hl], a ret -Audio1_GetNextMusicByte: ; 0x9825 +Audio1_GetNextMusicByte: ld d, 0 ld a, c add a @@ -1260,7 +1260,7 @@ Audio1_GetNextMusicByte: ; 0x9825 ld [hl], d ret -Audio1_GetRegisterPointer: ; 0x9838 +Audio1_GetRegisterPointer: ; hl = address of hardware sound register b for software channel c ld a, c ld hl, Audio1_HWChannelBaseAddresses @@ -1275,7 +1275,7 @@ Audio1_GetRegisterPointer: ; 0x9838 ld h, $ff ret -Audio1_MultiplyAdd: ; 0x9847 +Audio1_MultiplyAdd: ; hl = l + (a * de) ld h, 0 .loop @@ -1291,7 +1291,7 @@ Audio1_MultiplyAdd: ; 0x9847 .done ret -Audio1_CalculateFrequency: ; 0x9858 +Audio1_CalculateFrequency: ; return the frequency for note a, octave b in de ld h, 0 ld l, a @@ -1317,7 +1317,7 @@ Audio1_CalculateFrequency: ; 0x9858 ld d, a ret -Audio1_PlaySound:: ; 0x9876 +Audio1_PlaySound:: ld [wSoundID], a cp $ff jp z, .stopAllAudio @@ -1695,23 +1695,23 @@ Audio1_PlaySound:: ; 0x9876 .done ret -Audio1_CryEndchannel: ; 0x9b16 +Audio1_CryEndchannel: endchannel -Audio1_HWChannelBaseAddresses: ; 0x9b17 +Audio1_HWChannelBaseAddresses: ; the low bytes of each HW channel's base address db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3 db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7 -Audio1_HWChannelDisableMasks: ; 0x9b1f +Audio1_HWChannelDisableMasks: db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3 db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7 -Audio1_HWChannelEnableMasks: ; 0x9b27 +Audio1_HWChannelEnableMasks: db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 -Audio1_Pitches: ; 0x9b2f +Audio1_Pitches: dw $F82C ; C_ dw $F89D ; C# dw $F907 ; D_ diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 85541409..3928d092 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -566,7 +566,7 @@ Audio2_octave: ld [hl], a ; store low nibble as octave jp Audio2_endchannel -Audio2_unknownsfx0x20: ; 21bf3 +Audio2_unknownsfx0x20: cp $20 ; is this command an unknownsfx0x20? jr nz, Audio2_unknownsfx0x10 ; no ld a, c diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 7f98249d..8adc039a 100755 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -53,5 +53,3 @@ Music_DefeatedGymLeader:: dw Music_DefeatedGymLeader_Ch2 db CH2 dw Music_DefeatedGymLeader_Ch3 - -; 202fd diff --git a/data/mapHeaders/agatha.asm b/data/mapHeaders/agatha.asm index dcfe0231..f3389579 100755 --- a/data/mapHeaders/agatha.asm +++ b/data/mapHeaders/agatha.asm @@ -1,4 +1,4 @@ -Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247) +Agatha_h: db CEMETERY ; tileset db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x) dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts diff --git a/data/mapHeaders/bikeshop.asm b/data/mapHeaders/bikeshop.asm index 958e9fd4..b63b03df 100755 --- a/data/mapHeaders/bikeshop.asm +++ b/data/mapHeaders/bikeshop.asm @@ -1,4 +1,4 @@ -BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66) +BikeShop_h: db CLUB ; tileset db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x) dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts diff --git a/data/mapHeaders/billshouse.asm b/data/mapHeaders/billshouse.asm index 5218c5f3..735f8d62 100755 --- a/data/mapHeaders/billshouse.asm +++ b/data/mapHeaders/billshouse.asm @@ -1,4 +1,4 @@ -BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88) +BillsHouse_h: db INTERIOR ; tileset db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x) dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/blueshouse.asm b/data/mapHeaders/blueshouse.asm index 24564da5..47e5c5b4 100755 --- a/data/mapHeaders/blueshouse.asm +++ b/data/mapHeaders/blueshouse.asm @@ -1,4 +1,4 @@ -BluesHouse_h: ; 0x19b2f id=39 +BluesHouse_h: db HOUSE ; tileset db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript diff --git a/data/mapHeaders/bruno.asm b/data/mapHeaders/bruno.asm index 19536501..1267ebe2 100755 --- a/data/mapHeaders/bruno.asm +++ b/data/mapHeaders/bruno.asm @@ -1,4 +1,4 @@ -Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246) +Bruno_h: db GYM ; tileset db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x) dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadondiner.asm b/data/mapHeaders/celadondiner.asm index cc2b6075..9520d76e 100755 --- a/data/mapHeaders/celadondiner.asm +++ b/data/mapHeaders/celadondiner.asm @@ -1,4 +1,4 @@ -CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138) +CeladonDiner_h: db LOBBY ; tileset db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x) dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadongamecorner.asm b/data/mapHeaders/celadongamecorner.asm index f211b930..3c5674a7 100755 --- a/data/mapHeaders/celadongamecorner.asm +++ b/data/mapHeaders/celadongamecorner.asm @@ -1,4 +1,4 @@ -CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135) +CeladonGameCorner_h: db LOBBY ; tileset db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x) dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadongym.asm b/data/mapHeaders/celadongym.asm index b54aa76c..c0dcf162 100755 --- a/data/mapHeaders/celadongym.asm +++ b/data/mapHeaders/celadongym.asm @@ -1,4 +1,4 @@ -CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134) +CeladonGym_h: db GYM ; tileset db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x) dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonhotel.asm b/data/mapHeaders/celadonhotel.asm index 6bb908fb..019c3cc3 100755 --- a/data/mapHeaders/celadonhotel.asm +++ b/data/mapHeaders/celadonhotel.asm @@ -1,4 +1,4 @@ -CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140) +CeladonHotel_h: db POKECENTER ; tileset db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x) dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonhouse.asm b/data/mapHeaders/celadonhouse.asm index fee3fa15..ba510282 100755 --- a/data/mapHeaders/celadonhouse.asm +++ b/data/mapHeaders/celadonhouse.asm @@ -1,4 +1,4 @@ -CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139) +CeladonHouse_h: db MANSION ; tileset db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x) dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmansion1.asm b/data/mapHeaders/celadonmansion1.asm index 8b2d9856..8c94cc63 100755 --- a/data/mapHeaders/celadonmansion1.asm +++ b/data/mapHeaders/celadonmansion1.asm @@ -1,4 +1,4 @@ -CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128) +CeladonMansion1_h: db MANSION ; tileset db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x) dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmansion2.asm b/data/mapHeaders/celadonmansion2.asm index e5afd96e..462dfdf3 100755 --- a/data/mapHeaders/celadonmansion2.asm +++ b/data/mapHeaders/celadonmansion2.asm @@ -1,4 +1,4 @@ -CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129) +CeladonMansion2_h: db MANSION ; tileset db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x) dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmansion3.asm b/data/mapHeaders/celadonmansion3.asm index 8b290e42..81b3f2e2 100755 --- a/data/mapHeaders/celadonmansion3.asm +++ b/data/mapHeaders/celadonmansion3.asm @@ -1,4 +1,4 @@ -CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130) +CeladonMansion3_h: db MANSION ; tileset db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x) dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmansion4.asm b/data/mapHeaders/celadonmansion4.asm index e7277d66..c5cf2da9 100755 --- a/data/mapHeaders/celadonmansion4.asm +++ b/data/mapHeaders/celadonmansion4.asm @@ -1,4 +1,4 @@ -CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131) +CeladonMansion4_h: db MANSION ; tileset db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x) dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmansion5.asm b/data/mapHeaders/celadonmansion5.asm index 06c5ce09..d26faccf 100755 --- a/data/mapHeaders/celadonmansion5.asm +++ b/data/mapHeaders/celadonmansion5.asm @@ -1,4 +1,4 @@ -CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132) +CeladonMansion5_h: db HOUSE ; tileset db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x) dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmart1.asm b/data/mapHeaders/celadonmart1.asm index 2a5dc6ad..50d171bc 100755 --- a/data/mapHeaders/celadonmart1.asm +++ b/data/mapHeaders/celadonmart1.asm @@ -1,4 +1,4 @@ -CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122) +CeladonMart1_h: db LOBBY ; tileset db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x) dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmart2.asm b/data/mapHeaders/celadonmart2.asm index 9bcd63bf..ecd609cb 100755 --- a/data/mapHeaders/celadonmart2.asm +++ b/data/mapHeaders/celadonmart2.asm @@ -1,4 +1,4 @@ -CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123) +CeladonMart2_h: db LOBBY ; tileset db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x) dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmart3.asm b/data/mapHeaders/celadonmart3.asm index bb847159..af109528 100755 --- a/data/mapHeaders/celadonmart3.asm +++ b/data/mapHeaders/celadonmart3.asm @@ -1,4 +1,4 @@ -CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124) +CeladonMart3_h: db LOBBY ; tileset db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x) dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmart4.asm b/data/mapHeaders/celadonmart4.asm index 12e7cc12..4ae820d9 100755 --- a/data/mapHeaders/celadonmart4.asm +++ b/data/mapHeaders/celadonmart4.asm @@ -1,4 +1,4 @@ -CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125) +CeladonMart4_h: db LOBBY ; tileset db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x) dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmart5.asm b/data/mapHeaders/celadonmart5.asm index c16207ca..0d28464f 100755 --- a/data/mapHeaders/celadonmart5.asm +++ b/data/mapHeaders/celadonmart5.asm @@ -1,4 +1,4 @@ -CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136) +CeladonMart5_h: db LOBBY ; tileset db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x) dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmartelevator.asm b/data/mapHeaders/celadonmartelevator.asm index 1e51a262..498587c6 100755 --- a/data/mapHeaders/celadonmartelevator.asm +++ b/data/mapHeaders/celadonmartelevator.asm @@ -1,4 +1,4 @@ -CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127) +CeladonMartElevator_h: db LOBBY ; tileset db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonmartroof.asm b/data/mapHeaders/celadonmartroof.asm index 9654ef3d..8814092b 100755 --- a/data/mapHeaders/celadonmartroof.asm +++ b/data/mapHeaders/celadonmartroof.asm @@ -1,4 +1,4 @@ -CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126) +CeladonMartRoof_h: db LOBBY ; tileset db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonpokecenter.asm b/data/mapHeaders/celadonpokecenter.asm index e2164223..b9464c68 100755 --- a/data/mapHeaders/celadonpokecenter.asm +++ b/data/mapHeaders/celadonpokecenter.asm @@ -1,4 +1,4 @@ -CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133) +CeladonPokecenter_h: db POKECENTER ; tileset db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x) dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/celadonprizeroom.asm b/data/mapHeaders/celadonprizeroom.asm index 96951df0..f7a5dc12 100755 --- a/data/mapHeaders/celadonprizeroom.asm +++ b/data/mapHeaders/celadonprizeroom.asm @@ -1,4 +1,4 @@ -CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137) +CeladonPrizeRoom_h: db LOBBY ; tileset db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x) dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleancity.asm b/data/mapHeaders/ceruleancity.asm index 56cab9f7..be6dc5b2 100755 --- a/data/mapHeaders/ceruleancity.asm +++ b/data/mapHeaders/ceruleancity.asm @@ -1,4 +1,4 @@ -CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3) +CeruleanCity_h: db OVERWORLD ; tileset db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleangym.asm b/data/mapHeaders/ceruleangym.asm index 7296a2a7..f95e1a79 100755 --- a/data/mapHeaders/ceruleangym.asm +++ b/data/mapHeaders/ceruleangym.asm @@ -1,4 +1,4 @@ -CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65) +CeruleanGym_h: db GYM ; tileset db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x) dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleanhouse1.asm b/data/mapHeaders/ceruleanhouse1.asm index 879ceb23..2a8c9197 100755 --- a/data/mapHeaders/ceruleanhouse1.asm +++ b/data/mapHeaders/ceruleanhouse1.asm @@ -1,4 +1,4 @@ -CeruleanHouse1_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63) +CeruleanHouse1_h: db HOUSE ; tileset db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x) dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleanhouse2.asm b/data/mapHeaders/ceruleanhouse2.asm index d2c44a47..1e040ffd 100755 --- a/data/mapHeaders/ceruleanhouse2.asm +++ b/data/mapHeaders/ceruleanhouse2.asm @@ -1,4 +1,4 @@ -CeruleanHouse2_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230) +CeruleanHouse2_h: db SHIP ; tileset db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x) dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleanhousetrashed.asm b/data/mapHeaders/ceruleanhousetrashed.asm index 60c6dc94..90119dc5 100755 --- a/data/mapHeaders/ceruleanhousetrashed.asm +++ b/data/mapHeaders/ceruleanhousetrashed.asm @@ -1,4 +1,4 @@ -CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62) +CeruleanHouseTrashed_h: db HOUSE ; tileset db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x) dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleanmart.asm b/data/mapHeaders/ceruleanmart.asm index a2e112fd..3f3231e8 100755 --- a/data/mapHeaders/ceruleanmart.asm +++ b/data/mapHeaders/ceruleanmart.asm @@ -1,4 +1,4 @@ -CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67) +CeruleanMart_h: db MART ; tileset db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x) dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ceruleanpokecenter.asm b/data/mapHeaders/ceruleanpokecenter.asm index 908229fe..636a89ae 100755 --- a/data/mapHeaders/ceruleanpokecenter.asm +++ b/data/mapHeaders/ceruleanpokecenter.asm @@ -1,4 +1,4 @@ -CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64) +CeruleanPokecenter_h: db POKECENTER ; tileset db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x) dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/cinnabargym.asm b/data/mapHeaders/cinnabargym.asm index 1902fe5d..3f05790c 100755 --- a/data/mapHeaders/cinnabargym.asm +++ b/data/mapHeaders/cinnabargym.asm @@ -1,4 +1,4 @@ -CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166) +CinnabarGym_h: db FACILITY ; tileset db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x) dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/cinnabarisland.asm b/data/mapHeaders/cinnabarisland.asm index 60ba7560..6ae6424d 100755 --- a/data/mapHeaders/cinnabarisland.asm +++ b/data/mapHeaders/cinnabarisland.asm @@ -1,4 +1,4 @@ -CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8) +CinnabarIsland_h: db OVERWORLD ; tileset db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts diff --git a/data/mapHeaders/cinnabarmart.asm b/data/mapHeaders/cinnabarmart.asm index dd9fc116..b686713f 100755 --- a/data/mapHeaders/cinnabarmart.asm +++ b/data/mapHeaders/cinnabarmart.asm @@ -1,4 +1,4 @@ -CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172) +CinnabarMart_h: db MART ; tileset db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x) dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/cinnabarpokecenter.asm b/data/mapHeaders/cinnabarpokecenter.asm index 2d00d498..b1f002bd 100755 --- a/data/mapHeaders/cinnabarpokecenter.asm +++ b/data/mapHeaders/cinnabarpokecenter.asm @@ -1,4 +1,4 @@ -CinnabarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171) +CinnabarPokecenter_h: db POKECENTER ; tileset db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x) dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm index 94728b8d..67e1188b 100755 --- a/data/mapHeaders/colosseum.asm +++ b/data/mapHeaders/colosseum.asm @@ -1,4 +1,4 @@ -Colosseum_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240) +Colosseum_h: db CLUB ; tileset db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts diff --git a/data/mapHeaders/copycatshouse1f.asm b/data/mapHeaders/copycatshouse1f.asm index a8d171d7..bdca2189 100755 --- a/data/mapHeaders/copycatshouse1f.asm +++ b/data/mapHeaders/copycatshouse1f.asm @@ -1,4 +1,4 @@ -CopycatsHouse1F_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175) +CopycatsHouse1F_h: db REDS_HOUSE_1 ; tileset db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x) dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts diff --git a/data/mapHeaders/copycatshouse2f.asm b/data/mapHeaders/copycatshouse2f.asm index 46be1f54..3eecf718 100755 --- a/data/mapHeaders/copycatshouse2f.asm +++ b/data/mapHeaders/copycatshouse2f.asm @@ -1,4 +1,4 @@ -CopycatsHouse2F_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176) +CopycatsHouse2F_h: db REDS_HOUSE_2 ; tileset db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x) dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts diff --git a/data/mapHeaders/daycarem.asm b/data/mapHeaders/daycarem.asm index 2677b51c..1b8d4c1c 100755 --- a/data/mapHeaders/daycarem.asm +++ b/data/mapHeaders/daycarem.asm @@ -1,4 +1,4 @@ -DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72) +DayCareM_h: db HOUSE ; tileset db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x) dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts diff --git a/data/mapHeaders/diglettscave.asm b/data/mapHeaders/diglettscave.asm index 3cd5a651..0e68a55c 100755 --- a/data/mapHeaders/diglettscave.asm +++ b/data/mapHeaders/diglettscave.asm @@ -1,4 +1,4 @@ -DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197) +DiglettsCave_h: db CAVERN ; tileset db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x) dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts diff --git a/data/mapHeaders/diglettscaveroute11.asm b/data/mapHeaders/diglettscaveroute11.asm index 8d9acd49..7670c83f 100755 --- a/data/mapHeaders/diglettscaveroute11.asm +++ b/data/mapHeaders/diglettscaveroute11.asm @@ -1,4 +1,4 @@ -DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85) +DiglettsCaveEntranceRoute11_h: db CAVERN ; tileset db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x) dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts diff --git a/data/mapHeaders/diglettscaveroute2.asm b/data/mapHeaders/diglettscaveroute2.asm index b81d48a6..0499b4c3 100755 --- a/data/mapHeaders/diglettscaveroute2.asm +++ b/data/mapHeaders/diglettscaveroute2.asm @@ -1,4 +1,4 @@ -DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46) +DiglettsCaveRoute2_h: db CAVERN ; tileset db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x) dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/fanclub.asm b/data/mapHeaders/fanclub.asm index 603ec53b..8e8205b4 100755 --- a/data/mapHeaders/fanclub.asm +++ b/data/mapHeaders/fanclub.asm @@ -1,4 +1,4 @@ -FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90) +FanClub_h: db INTERIOR ; tileset db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x) dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fightingdojo.asm b/data/mapHeaders/fightingdojo.asm index d981d816..cb0a2fdb 100755 --- a/data/mapHeaders/fightingdojo.asm +++ b/data/mapHeaders/fightingdojo.asm @@ -1,4 +1,4 @@ -FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177) +FightingDojo_h: db DOJO ; tileset db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x) dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiacity.asm b/data/mapHeaders/fuchsiacity.asm index 998f7bb4..2bfd2793 100755 --- a/data/mapHeaders/fuchsiacity.asm +++ b/data/mapHeaders/fuchsiacity.asm @@ -1,4 +1,4 @@ -FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7) +FuchsiaCity_h: db OVERWORLD ; tileset db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiagym.asm b/data/mapHeaders/fuchsiagym.asm index 4c6f083f..9d16f178 100755 --- a/data/mapHeaders/fuchsiagym.asm +++ b/data/mapHeaders/fuchsiagym.asm @@ -1,4 +1,4 @@ -FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157) +FuchsiaGym_h: db GYM ; tileset db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x) dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiahouse1.asm b/data/mapHeaders/fuchsiahouse1.asm index 98974fee..c4ab2c95 100755 --- a/data/mapHeaders/fuchsiahouse1.asm +++ b/data/mapHeaders/fuchsiahouse1.asm @@ -1,4 +1,4 @@ -FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153) +FuchsiaHouse1_h: db HOUSE ; tileset db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x) dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiahouse2.asm b/data/mapHeaders/fuchsiahouse2.asm index f4d05eeb..530f44b6 100755 --- a/data/mapHeaders/fuchsiahouse2.asm +++ b/data/mapHeaders/fuchsiahouse2.asm @@ -1,4 +1,4 @@ -FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155) +FuchsiaHouse2_h: db LAB ; tileset db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x) dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiahouse3.asm b/data/mapHeaders/fuchsiahouse3.asm index 92b4d96d..e52b6b8a 100755 --- a/data/mapHeaders/fuchsiahouse3.asm +++ b/data/mapHeaders/fuchsiahouse3.asm @@ -1,4 +1,4 @@ -FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164) +FuchsiaHouse3_h: db SHIP ; tileset db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x) dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiamart.asm b/data/mapHeaders/fuchsiamart.asm index a9f00150..dcdfe8c7 100755 --- a/data/mapHeaders/fuchsiamart.asm +++ b/data/mapHeaders/fuchsiamart.asm @@ -1,4 +1,4 @@ -FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152) +FuchsiaMart_h: db MART ; tileset db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x) dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiameetingroom.asm b/data/mapHeaders/fuchsiameetingroom.asm index 48d4c7fc..b44acf29 100755 --- a/data/mapHeaders/fuchsiameetingroom.asm +++ b/data/mapHeaders/fuchsiameetingroom.asm @@ -1,4 +1,4 @@ -FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158) +FuchsiaMeetingRoom_h: db LAB ; tileset db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x) dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts diff --git a/data/mapHeaders/fuchsiapokecenter.asm b/data/mapHeaders/fuchsiapokecenter.asm index aec7f455..dc6f1e6b 100755 --- a/data/mapHeaders/fuchsiapokecenter.asm +++ b/data/mapHeaders/fuchsiapokecenter.asm @@ -1,4 +1,4 @@ -FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154) +FuchsiaPokecenter_h: db POKECENTER ; tileset db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x) dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/halloffameroom.asm b/data/mapHeaders/halloffameroom.asm index 63cd6419..a90464a8 100755 --- a/data/mapHeaders/halloffameroom.asm +++ b/data/mapHeaders/halloffameroom.asm @@ -1,4 +1,4 @@ -HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118) +HallofFameRoom_h: db GYM ; tileset db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x) dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts diff --git a/data/mapHeaders/indigoplateau.asm b/data/mapHeaders/indigoplateau.asm index 87c37501..deaf5041 100755 --- a/data/mapHeaders/indigoplateau.asm +++ b/data/mapHeaders/indigoplateau.asm @@ -1,4 +1,4 @@ -IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9) +IndigoPlateau_h: db PLATEAU ; tileset db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts diff --git a/data/mapHeaders/indigoplateaulobby.asm b/data/mapHeaders/indigoplateaulobby.asm index d0e056ac..4cf92d82 100755 --- a/data/mapHeaders/indigoplateaulobby.asm +++ b/data/mapHeaders/indigoplateaulobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobby_h: ; 0x19c4f to 0x19c5b (12 bytes) (bank=6) (id=174) +IndigoPlateauLobby_h: db MART ; tileset db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x) dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts diff --git a/data/mapHeaders/lab1.asm b/data/mapHeaders/lab1.asm index 512373c4..d0e976e7 100755 --- a/data/mapHeaders/lab1.asm +++ b/data/mapHeaders/lab1.asm @@ -1,4 +1,4 @@ -Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167) +Lab1_h: db LAB ; tileset db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x) dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lab2.asm b/data/mapHeaders/lab2.asm index a3c2ccf6..75cbcf1f 100755 --- a/data/mapHeaders/lab2.asm +++ b/data/mapHeaders/lab2.asm @@ -1,4 +1,4 @@ -Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168) +Lab2_h: db LAB ; tileset db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x) dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lab3.asm b/data/mapHeaders/lab3.asm index c9709e83..9af39022 100755 --- a/data/mapHeaders/lab3.asm +++ b/data/mapHeaders/lab3.asm @@ -1,4 +1,4 @@ -Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169) +Lab3_h: db LAB ; tileset db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x) dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lab4.asm b/data/mapHeaders/lab4.asm index 82ced4a3..e0b23c7d 100755 --- a/data/mapHeaders/lab4.asm +++ b/data/mapHeaders/lab4.asm @@ -1,4 +1,4 @@ -Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170) +Lab4_h: db LAB ; tileset db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x) dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lance.asm b/data/mapHeaders/lance.asm index 464fd0d7..13b2a343 100755 --- a/data/mapHeaders/lance.asm +++ b/data/mapHeaders/lance.asm @@ -1,4 +1,4 @@ -Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113) +Lance_h: db DOJO ; tileset db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x) dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts diff --git a/data/mapHeaders/lavenderhouse1.asm b/data/mapHeaders/lavenderhouse1.asm index e9531fff..f1750dc0 100755 --- a/data/mapHeaders/lavenderhouse1.asm +++ b/data/mapHeaders/lavenderhouse1.asm @@ -1,4 +1,4 @@ -LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149) +LavenderHouse1_h: db HOUSE ; tileset db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x) dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lavenderhouse2.asm b/data/mapHeaders/lavenderhouse2.asm index ea6c00c1..449ccf07 100755 --- a/data/mapHeaders/lavenderhouse2.asm +++ b/data/mapHeaders/lavenderhouse2.asm @@ -1,4 +1,4 @@ -LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151) +LavenderHouse2_h: db HOUSE ; tileset db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x) dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/lavendermart.asm b/data/mapHeaders/lavendermart.asm index 95f448e5..e2bd0c9c 100755 --- a/data/mapHeaders/lavendermart.asm +++ b/data/mapHeaders/lavendermart.asm @@ -1,4 +1,4 @@ -LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150) +LavenderMart_h: db MART ; tileset db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x) dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/lavenderpokecenter.asm b/data/mapHeaders/lavenderpokecenter.asm index ce6630bf..c0d41294 100755 --- a/data/mapHeaders/lavenderpokecenter.asm +++ b/data/mapHeaders/lavenderpokecenter.asm @@ -1,4 +1,4 @@ -LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141) +LavenderPokecenter_h: db POKECENTER ; tileset db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x) dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/lavendertown.asm b/data/mapHeaders/lavendertown.asm index 72952d41..74bbd7a8 100755 --- a/data/mapHeaders/lavendertown.asm +++ b/data/mapHeaders/lavendertown.asm @@ -1,4 +1,4 @@ -LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4) +LavenderTown_h: db OVERWORLD ; tileset db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts diff --git a/data/mapHeaders/lorelei.asm b/data/mapHeaders/lorelei.asm index e1261c3e..634435d3 100755 --- a/data/mapHeaders/lorelei.asm +++ b/data/mapHeaders/lorelei.asm @@ -1,4 +1,4 @@ -Lorelei_h: ; 0x7616f to 0x7617b (12 bytes) (id=245) +Lorelei_h: db GYM ; tileset db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x) dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts diff --git a/data/mapHeaders/mansion1.asm b/data/mapHeaders/mansion1.asm index e7110698..46b0a83e 100755 --- a/data/mapHeaders/mansion1.asm +++ b/data/mapHeaders/mansion1.asm @@ -1,4 +1,4 @@ -Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165) +Mansion1_h: db FACILITY ; tileset db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x) dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mansion2.asm b/data/mapHeaders/mansion2.asm index e888b243..ee4b570c 100755 --- a/data/mapHeaders/mansion2.asm +++ b/data/mapHeaders/mansion2.asm @@ -1,4 +1,4 @@ -Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214) +Mansion2_h: db FACILITY ; tileset db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x) dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mansion3.asm b/data/mapHeaders/mansion3.asm index a1b6c95f..97074347 100755 --- a/data/mapHeaders/mansion3.asm +++ b/data/mapHeaders/mansion3.asm @@ -1,4 +1,4 @@ -Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215) +Mansion3_h: db FACILITY ; tileset db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x) dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mansion4.asm b/data/mapHeaders/mansion4.asm index 63f138e7..45b1636a 100755 --- a/data/mapHeaders/mansion4.asm +++ b/data/mapHeaders/mansion4.asm @@ -1,4 +1,4 @@ -Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216) +Mansion4_h: db FACILITY ; tileset db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x) dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mtmoon1.asm b/data/mapHeaders/mtmoon1.asm index f5b52f37..da64b667 100755 --- a/data/mapHeaders/mtmoon1.asm +++ b/data/mapHeaders/mtmoon1.asm @@ -1,4 +1,4 @@ -MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59) +MtMoon1_h: db CAVERN ; tileset db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x) dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mtmoon2.asm b/data/mapHeaders/mtmoon2.asm index 5e53bc20..7121c33e 100755 --- a/data/mapHeaders/mtmoon2.asm +++ b/data/mapHeaders/mtmoon2.asm @@ -1,4 +1,4 @@ -MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60) +MtMoon2_h: db CAVERN ; tileset db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x) dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mtmoon3.asm b/data/mapHeaders/mtmoon3.asm index 95331007..643eb95d 100755 --- a/data/mapHeaders/mtmoon3.asm +++ b/data/mapHeaders/mtmoon3.asm @@ -1,4 +1,4 @@ -MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61) +MtMoon3_h: db CAVERN ; tileset db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x) dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/mtmoonpokecenter.asm b/data/mapHeaders/mtmoonpokecenter.asm index 52f002cc..ba82c478 100755 --- a/data/mapHeaders/mtmoonpokecenter.asm +++ b/data/mapHeaders/mtmoonpokecenter.asm @@ -1,4 +1,4 @@ -MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68) +MtMoonPokecenter_h: db POKECENTER ; tileset db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x) dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/museum1f.asm b/data/mapHeaders/museum1f.asm index dacdb50e..10611513 100755 --- a/data/mapHeaders/museum1f.asm +++ b/data/mapHeaders/museum1f.asm @@ -1,4 +1,4 @@ -Museum1F_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52) +Museum1F_h: db MUSEUM ; tileset db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x) dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts diff --git a/data/mapHeaders/museum2f.asm b/data/mapHeaders/museum2f.asm index 15997573..62f9f7ca 100755 --- a/data/mapHeaders/museum2f.asm +++ b/data/mapHeaders/museum2f.asm @@ -1,4 +1,4 @@ -Museum2F_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53) +Museum2F_h: db MUSEUM ; tileset db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x) dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts diff --git a/data/mapHeaders/namerater.asm b/data/mapHeaders/namerater.asm index f43493d4..3fdef0d7 100755 --- a/data/mapHeaders/namerater.asm +++ b/data/mapHeaders/namerater.asm @@ -1,4 +1,4 @@ -NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229) +NameRater_h: db HOUSE ; tileset db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x) dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/oakslab.asm b/data/mapHeaders/oakslab.asm index ab41ef4d..ba2c9d22 100755 --- a/data/mapHeaders/oakslab.asm +++ b/data/mapHeaders/oakslab.asm @@ -1,4 +1,4 @@ -OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40) +OaksLab_h: db DOJO ; tileset db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x) dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm index 69c5d978..ff5bd7b9 100755 --- a/data/mapHeaders/pewtercity.asm +++ b/data/mapHeaders/pewtercity.asm @@ -1,4 +1,4 @@ -PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2) +PewterCity_h: db OVERWORLD ; tileset db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/pewtergym.asm b/data/mapHeaders/pewtergym.asm index ac159b16..8eee73b3 100755 --- a/data/mapHeaders/pewtergym.asm +++ b/data/mapHeaders/pewtergym.asm @@ -1,4 +1,4 @@ -PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54) +PewterGym_h: db GYM ; tileset db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x) dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/pewterhouse1.asm b/data/mapHeaders/pewterhouse1.asm index b9d11d98..40209926 100755 --- a/data/mapHeaders/pewterhouse1.asm +++ b/data/mapHeaders/pewterhouse1.asm @@ -1,4 +1,4 @@ -PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55) +PewterHouse1_h: db HOUSE ; tileset db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x) dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pewterhouse2.asm b/data/mapHeaders/pewterhouse2.asm index abcb409b..25fc3e9d 100755 --- a/data/mapHeaders/pewterhouse2.asm +++ b/data/mapHeaders/pewterhouse2.asm @@ -1,4 +1,4 @@ -PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57) +PewterHouse2_h: db HOUSE ; tileset db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x) dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pewtermart.asm b/data/mapHeaders/pewtermart.asm index 673dc1cf..02481bfc 100755 --- a/data/mapHeaders/pewtermart.asm +++ b/data/mapHeaders/pewtermart.asm @@ -1,4 +1,4 @@ -PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56) +PewterMart_h: db MART ; tileset db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x) dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/pewterpokecenter.asm b/data/mapHeaders/pewterpokecenter.asm index 4fd426c5..f3abc838 100755 --- a/data/mapHeaders/pewterpokecenter.asm +++ b/data/mapHeaders/pewterpokecenter.asm @@ -1,4 +1,4 @@ -PewterPokecenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58) +PewterPokecenter_h: db POKECENTER ; tileset db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x) dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower1.asm b/data/mapHeaders/pokemontower1.asm index d7c2849e..9a799d73 100755 --- a/data/mapHeaders/pokemontower1.asm +++ b/data/mapHeaders/pokemontower1.asm @@ -1,4 +1,4 @@ -PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142) +PokemonTower1_h: db CEMETERY ; tileset db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x) dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower2.asm b/data/mapHeaders/pokemontower2.asm index 30493d08..a2c395c9 100755 --- a/data/mapHeaders/pokemontower2.asm +++ b/data/mapHeaders/pokemontower2.asm @@ -1,4 +1,4 @@ -PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143) +PokemonTower2_h: db CEMETERY ; tileset db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x) dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower3.asm b/data/mapHeaders/pokemontower3.asm index bb3f2318..af81c9e6 100755 --- a/data/mapHeaders/pokemontower3.asm +++ b/data/mapHeaders/pokemontower3.asm @@ -1,4 +1,4 @@ -PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144) +PokemonTower3_h: db CEMETERY ; tileset db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x) dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower4.asm b/data/mapHeaders/pokemontower4.asm index bf405a76..073c34c0 100755 --- a/data/mapHeaders/pokemontower4.asm +++ b/data/mapHeaders/pokemontower4.asm @@ -1,4 +1,4 @@ -PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145) +PokemonTower4_h: db CEMETERY ; tileset db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x) dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower5.asm b/data/mapHeaders/pokemontower5.asm index 662c32d2..a7636534 100755 --- a/data/mapHeaders/pokemontower5.asm +++ b/data/mapHeaders/pokemontower5.asm @@ -1,4 +1,4 @@ -PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146) +PokemonTower5_h: db CEMETERY ; tileset db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x) dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower6.asm b/data/mapHeaders/pokemontower6.asm index a6d0ff9d..a83ae0ba 100755 --- a/data/mapHeaders/pokemontower6.asm +++ b/data/mapHeaders/pokemontower6.asm @@ -1,4 +1,4 @@ -PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147) +PokemonTower6_h: db CEMETERY ; tileset db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x) dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts diff --git a/data/mapHeaders/pokemontower7.asm b/data/mapHeaders/pokemontower7.asm index c366006b..4e13bcee 100755 --- a/data/mapHeaders/pokemontower7.asm +++ b/data/mapHeaders/pokemontower7.asm @@ -1,4 +1,4 @@ -PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148) +PokemonTower7_h: db CEMETERY ; tileset db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x) dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts diff --git a/data/mapHeaders/powerplant.asm b/data/mapHeaders/powerplant.asm index 36c07d3f..9c78311d 100755 --- a/data/mapHeaders/powerplant.asm +++ b/data/mapHeaders/powerplant.asm @@ -1,4 +1,4 @@ -PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83) +PowerPlant_h: db FACILITY ; tileset db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x) dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts diff --git a/data/mapHeaders/rockethideout1.asm b/data/mapHeaders/rockethideout1.asm index 9af33f1d..a9dcf424 100755 --- a/data/mapHeaders/rockethideout1.asm +++ b/data/mapHeaders/rockethideout1.asm @@ -1,4 +1,4 @@ -RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199) +RocketHideout1_h: db FACILITY ; tileset db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x) dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rockethideout2.asm b/data/mapHeaders/rockethideout2.asm index b4629ccb..8f034360 100755 --- a/data/mapHeaders/rockethideout2.asm +++ b/data/mapHeaders/rockethideout2.asm @@ -1,4 +1,4 @@ -RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200) +RocketHideout2_h: db FACILITY ; tileset db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x) dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rockethideout3.asm b/data/mapHeaders/rockethideout3.asm index 1ec94195..5fc9fb95 100755 --- a/data/mapHeaders/rockethideout3.asm +++ b/data/mapHeaders/rockethideout3.asm @@ -1,4 +1,4 @@ -RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201) +RocketHideout3_h: db FACILITY ; tileset db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x) dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rockethideout4.asm b/data/mapHeaders/rockethideout4.asm index 9ee9ec58..0cde5bee 100755 --- a/data/mapHeaders/rockethideout4.asm +++ b/data/mapHeaders/rockethideout4.asm @@ -1,4 +1,4 @@ -RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202) +RocketHideout4_h: db FACILITY ; tileset db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x) dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rockethideoutelevator.asm b/data/mapHeaders/rockethideoutelevator.asm index 209c2ba8..d4917812 100755 --- a/data/mapHeaders/rockethideoutelevator.asm +++ b/data/mapHeaders/rockethideoutelevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203) +RocketHideoutElevator_h: db LOBBY ; tileset db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x) dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts diff --git a/data/mapHeaders/rocktunnel1.asm b/data/mapHeaders/rocktunnel1.asm index cc734b28..db67517d 100755 --- a/data/mapHeaders/rocktunnel1.asm +++ b/data/mapHeaders/rocktunnel1.asm @@ -1,4 +1,4 @@ -RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82) +RockTunnel1_h: db CAVERN ; tileset db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x) dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rocktunnel2.asm b/data/mapHeaders/rocktunnel2.asm index ec43cddc..5b85701b 100755 --- a/data/mapHeaders/rocktunnel2.asm +++ b/data/mapHeaders/rocktunnel2.asm @@ -1,4 +1,4 @@ -RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232) +RockTunnel2_h: db CAVERN ; tileset db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x) dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/rocktunnelpokecenter.asm b/data/mapHeaders/rocktunnelpokecenter.asm index 390cc20e..e1bad3bd 100755 --- a/data/mapHeaders/rocktunnelpokecenter.asm +++ b/data/mapHeaders/rocktunnelpokecenter.asm @@ -1,4 +1,4 @@ -RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81) +RockTunnelPokecenter_h: db POKECENTER ; tileset db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x) dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route1.asm b/data/mapHeaders/route1.asm index 6a8db0c4..5f6a858e 100755 --- a/data/mapHeaders/route1.asm +++ b/data/mapHeaders/route1.asm @@ -1,4 +1,4 @@ -Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12) +Route1_h: db OVERWORLD ; tileset db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route10.asm b/data/mapHeaders/route10.asm index fab0e4a5..7ee588cf 100755 --- a/data/mapHeaders/route10.asm +++ b/data/mapHeaders/route10.asm @@ -1,4 +1,4 @@ -Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21) +Route10_h: db OVERWORLD ; tileset db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route11.asm b/data/mapHeaders/route11.asm index 66c54bbe..04ae8f24 100755 --- a/data/mapHeaders/route11.asm +++ b/data/mapHeaders/route11.asm @@ -1,4 +1,4 @@ -Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22) +Route11_h: db OVERWORLD ; tileset db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route11gate.asm b/data/mapHeaders/route11gate.asm index 56b9381c..26539a19 100755 --- a/data/mapHeaders/route11gate.asm +++ b/data/mapHeaders/route11gate.asm @@ -1,4 +1,4 @@ -Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84) +Route11Gate_h: db GATE ; tileset db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x) dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route11gateupstairs.asm b/data/mapHeaders/route11gateupstairs.asm index 3428de6a..ac556804 100755 --- a/data/mapHeaders/route11gateupstairs.asm +++ b/data/mapHeaders/route11gateupstairs.asm @@ -1,4 +1,4 @@ -Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86) +Route11GateUpstairs_h: db GATE ; tileset db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x) dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route12.asm b/data/mapHeaders/route12.asm index 6132a244..b11e0128 100755 --- a/data/mapHeaders/route12.asm +++ b/data/mapHeaders/route12.asm @@ -1,4 +1,4 @@ -Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23) +Route12_h: db OVERWORLD ; tileset db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route12gate.asm b/data/mapHeaders/route12gate.asm index 0afcf06b..bcd36d73 100755 --- a/data/mapHeaders/route12gate.asm +++ b/data/mapHeaders/route12gate.asm @@ -1,4 +1,4 @@ -Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87) +Route12Gate_h: db GATE ; tileset db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x) dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route12gateupstairs.asm b/data/mapHeaders/route12gateupstairs.asm index acad7e9f..96109a38 100755 --- a/data/mapHeaders/route12gateupstairs.asm +++ b/data/mapHeaders/route12gateupstairs.asm @@ -1,4 +1,4 @@ -Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195) +Route12GateUpstairs_h: db GATE ; tileset db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x) dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route12house.asm b/data/mapHeaders/route12house.asm index 0116270c..11f45d24 100755 --- a/data/mapHeaders/route12house.asm +++ b/data/mapHeaders/route12house.asm @@ -1,4 +1,4 @@ -Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189) +Route12House_h: db HOUSE ; tileset db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x) dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route13.asm b/data/mapHeaders/route13.asm index 9a821208..53a88633 100755 --- a/data/mapHeaders/route13.asm +++ b/data/mapHeaders/route13.asm @@ -1,4 +1,4 @@ -Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24) +Route13_h: db OVERWORLD ; tileset db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route14.asm b/data/mapHeaders/route14.asm index e4163126..f860d332 100755 --- a/data/mapHeaders/route14.asm +++ b/data/mapHeaders/route14.asm @@ -1,4 +1,4 @@ -Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25) +Route14_h: db OVERWORLD ; tileset db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route15.asm b/data/mapHeaders/route15.asm index 6d2e8859..48d5ff20 100755 --- a/data/mapHeaders/route15.asm +++ b/data/mapHeaders/route15.asm @@ -1,4 +1,4 @@ -Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26) +Route15_h: db OVERWORLD ; tileset db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route15gate.asm b/data/mapHeaders/route15gate.asm index 55ee5cc9..072d8f72 100755 --- a/data/mapHeaders/route15gate.asm +++ b/data/mapHeaders/route15gate.asm @@ -1,4 +1,4 @@ -Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184) +Route15Gate_h: db GATE ; tileset db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x) dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route16.asm b/data/mapHeaders/route16.asm index 42678ed3..eee71ba2 100755 --- a/data/mapHeaders/route16.asm +++ b/data/mapHeaders/route16.asm @@ -1,4 +1,4 @@ -Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27) +Route16_h: db OVERWORLD ; tileset db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route16gate.asm b/data/mapHeaders/route16gate.asm index a155125e..b3381258 100755 --- a/data/mapHeaders/route16gate.asm +++ b/data/mapHeaders/route16gate.asm @@ -1,4 +1,4 @@ -Route16Gate_h: ; 0x496b2 to 0x496be (12 bytes) (id=186) +Route16Gate_h: db GATE ; tileset db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x) dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route16gateupstairs.asm b/data/mapHeaders/route16gateupstairs.asm index 878c4eca..e8dd7d45 100755 --- a/data/mapHeaders/route16gateupstairs.asm +++ b/data/mapHeaders/route16gateupstairs.asm @@ -1,4 +1,4 @@ -Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187) +Route16GateUpstairs_h: db GATE ; tileset db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x) dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route16house.asm b/data/mapHeaders/route16house.asm index c3649b84..5945e11b 100755 --- a/data/mapHeaders/route16house.asm +++ b/data/mapHeaders/route16house.asm @@ -1,4 +1,4 @@ -Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188) +Route16House_h: db HOUSE ; tileset db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x) dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route17.asm b/data/mapHeaders/route17.asm index 577fe009..82a5d0f4 100755 --- a/data/mapHeaders/route17.asm +++ b/data/mapHeaders/route17.asm @@ -1,4 +1,4 @@ -Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28) +Route17_h: db OVERWORLD ; tileset db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route18.asm b/data/mapHeaders/route18.asm index 8fb1b3bc..180111b5 100755 --- a/data/mapHeaders/route18.asm +++ b/data/mapHeaders/route18.asm @@ -1,4 +1,4 @@ -Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29) +Route18_h: db OVERWORLD ; tileset db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route18gate.asm b/data/mapHeaders/route18gate.asm index a0e463e8..090d43df 100755 --- a/data/mapHeaders/route18gate.asm +++ b/data/mapHeaders/route18gate.asm @@ -1,4 +1,4 @@ -Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190) +Route18Gate_h: db GATE ; tileset db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x) dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route18gateupstairs.asm b/data/mapHeaders/route18gateupstairs.asm index 2043c2ef..ac9e3d0a 100755 --- a/data/mapHeaders/route18gateupstairs.asm +++ b/data/mapHeaders/route18gateupstairs.asm @@ -1,4 +1,4 @@ -Route18GateUpstairs_h: ; 0x49969 to 0x49975 (12 bytes) (id=191) +Route18GateUpstairs_h: db GATE ; tileset db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route19.asm b/data/mapHeaders/route19.asm index 2ca85cc1..1de353f8 100755 --- a/data/mapHeaders/route19.asm +++ b/data/mapHeaders/route19.asm @@ -1,4 +1,4 @@ -Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30) +Route19_h: db OVERWORLD ; tileset db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route20.asm b/data/mapHeaders/route20.asm index d4f645d8..f871179f 100755 --- a/data/mapHeaders/route20.asm +++ b/data/mapHeaders/route20.asm @@ -1,4 +1,4 @@ -Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31) +Route20_h: db OVERWORLD ; tileset db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route21.asm b/data/mapHeaders/route21.asm index 7f3e0a2f..a2c06868 100755 --- a/data/mapHeaders/route21.asm +++ b/data/mapHeaders/route21.asm @@ -1,4 +1,4 @@ -Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32) +Route21_h: db OVERWORLD ; tileset db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route22.asm b/data/mapHeaders/route22.asm index 598e9224..c227d433 100755 --- a/data/mapHeaders/route22.asm +++ b/data/mapHeaders/route22.asm @@ -1,4 +1,4 @@ -Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33) +Route22_h: db OVERWORLD ; tileset db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route22gate.asm b/data/mapHeaders/route22gate.asm index 3daa30a3..7b8963ba 100755 --- a/data/mapHeaders/route22gate.asm +++ b/data/mapHeaders/route22gate.asm @@ -1,4 +1,4 @@ -Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193) +Route22Gate_h: db GATE ; tileset db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x) dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route23.asm b/data/mapHeaders/route23.asm index 32dc36fd..bec192c2 100755 --- a/data/mapHeaders/route23.asm +++ b/data/mapHeaders/route23.asm @@ -1,4 +1,4 @@ -Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34) +Route23_h: db PLATEAU ; tileset db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route24.asm b/data/mapHeaders/route24.asm index a445c144..9a313aba 100755 --- a/data/mapHeaders/route24.asm +++ b/data/mapHeaders/route24.asm @@ -1,4 +1,4 @@ -Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35) +Route24_h: db OVERWORLD ; tileset db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route25.asm b/data/mapHeaders/route25.asm index a6e62a00..39ffa45d 100755 --- a/data/mapHeaders/route25.asm +++ b/data/mapHeaders/route25.asm @@ -1,4 +1,4 @@ -Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36) +Route25_h: db OVERWORLD ; tileset db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route2gate.asm b/data/mapHeaders/route2gate.asm index 343c0f09..5cb7bcbc 100755 --- a/data/mapHeaders/route2gate.asm +++ b/data/mapHeaders/route2gate.asm @@ -1,4 +1,4 @@ -Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49) +Route2Gate_h: db GATE ; tileset db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x) dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route2house.asm b/data/mapHeaders/route2house.asm index f99a365d..c7c140f6 100755 --- a/data/mapHeaders/route2house.asm +++ b/data/mapHeaders/route2house.asm @@ -1,4 +1,4 @@ -Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48) +Route2House_h: db HOUSE ; tileset db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x) dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route3.asm b/data/mapHeaders/route3.asm index 0003b90a..19adfea8 100755 --- a/data/mapHeaders/route3.asm +++ b/data/mapHeaders/route3.asm @@ -1,4 +1,4 @@ -Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14) +Route3_h: db OVERWORLD ; tileset db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route4.asm b/data/mapHeaders/route4.asm index 6e8724c9..a322f23c 100755 --- a/data/mapHeaders/route4.asm +++ b/data/mapHeaders/route4.asm @@ -1,4 +1,4 @@ -Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15) +Route4_h: db OVERWORLD ; tileset db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts diff --git a/data/mapHeaders/route5.asm b/data/mapHeaders/route5.asm index d35a8dab..b982c02d 100755 --- a/data/mapHeaders/route5.asm +++ b/data/mapHeaders/route5.asm @@ -1,4 +1,4 @@ -Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16) +Route5_h: db OVERWORLD ; tileset db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route5gate.asm b/data/mapHeaders/route5gate.asm index 79a44874..68810da1 100755 --- a/data/mapHeaders/route5gate.asm +++ b/data/mapHeaders/route5gate.asm @@ -1,4 +1,4 @@ -Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70) +Route5Gate_h: db GATE ; tileset db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x) dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route6.asm b/data/mapHeaders/route6.asm index 21dd0872..6ed13d4e 100755 --- a/data/mapHeaders/route6.asm +++ b/data/mapHeaders/route6.asm @@ -1,4 +1,4 @@ -Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17) +Route6_h: db OVERWORLD ; tileset db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route6gate.asm b/data/mapHeaders/route6gate.asm index 3bafb448..f689240c 100755 --- a/data/mapHeaders/route6gate.asm +++ b/data/mapHeaders/route6gate.asm @@ -1,4 +1,4 @@ -Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73) +Route6Gate_h: db GATE ; tileset db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x) dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route7.asm b/data/mapHeaders/route7.asm index 38fd1e15..62f3bedf 100755 --- a/data/mapHeaders/route7.asm +++ b/data/mapHeaders/route7.asm @@ -1,4 +1,4 @@ -Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18) +Route7_h: db OVERWORLD ; tileset db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route7gate.asm b/data/mapHeaders/route7gate.asm index b5d26672..9e01914f 100755 --- a/data/mapHeaders/route7gate.asm +++ b/data/mapHeaders/route7gate.asm @@ -1,4 +1,4 @@ -Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76) +Route7Gate_h: db GATE ; tileset db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x) dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route8.asm b/data/mapHeaders/route8.asm index 14c867ea..5187fd8f 100755 --- a/data/mapHeaders/route8.asm +++ b/data/mapHeaders/route8.asm @@ -1,4 +1,4 @@ -Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19) +Route8_h: db OVERWORLD ; tileset db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts diff --git a/data/mapHeaders/route8gate.asm b/data/mapHeaders/route8gate.asm index 2bd505a2..d206e978 100755 --- a/data/mapHeaders/route8gate.asm +++ b/data/mapHeaders/route8gate.asm @@ -1,4 +1,4 @@ -Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79) +Route8Gate_h: db GATE ; tileset db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x) dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts diff --git a/data/mapHeaders/route9.asm b/data/mapHeaders/route9.asm index 30982dd4..044a4ec0 100755 --- a/data/mapHeaders/route9.asm +++ b/data/mapHeaders/route9.asm @@ -1,4 +1,4 @@ -Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20) +Route9_h: db OVERWORLD ; tileset db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizonecenter.asm b/data/mapHeaders/safarizonecenter.asm index a1388fa1..6da27c12 100755 --- a/data/mapHeaders/safarizonecenter.asm +++ b/data/mapHeaders/safarizonecenter.asm @@ -1,4 +1,4 @@ -SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220) +SafariZoneCenter_h: db FOREST ; tileset db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x) dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneeast.asm b/data/mapHeaders/safarizoneeast.asm index dec95d2a..089620dc 100755 --- a/data/mapHeaders/safarizoneeast.asm +++ b/data/mapHeaders/safarizoneeast.asm @@ -1,4 +1,4 @@ -SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217) +SafariZoneEast_h: db FOREST ; tileset db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x) dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneentrance.asm b/data/mapHeaders/safarizoneentrance.asm index e7340c4a..1122d5a3 100755 --- a/data/mapHeaders/safarizoneentrance.asm +++ b/data/mapHeaders/safarizoneentrance.asm @@ -1,4 +1,4 @@ -SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156) +SafariZoneEntrance_h: db GATE ; tileset db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x) dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizonenorth.asm b/data/mapHeaders/safarizonenorth.asm index 310ead4c..a3a46769 100755 --- a/data/mapHeaders/safarizonenorth.asm +++ b/data/mapHeaders/safarizonenorth.asm @@ -1,4 +1,4 @@ -SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218) +SafariZoneNorth_h: db FOREST ; tileset db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x) dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneresthouse1.asm b/data/mapHeaders/safarizoneresthouse1.asm index f788b6c4..b2988b47 100755 --- a/data/mapHeaders/safarizoneresthouse1.asm +++ b/data/mapHeaders/safarizoneresthouse1.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221) +SafariZoneRestHouse1_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneresthouse2.asm b/data/mapHeaders/safarizoneresthouse2.asm index 5ccdb947..589d9850 100755 --- a/data/mapHeaders/safarizoneresthouse2.asm +++ b/data/mapHeaders/safarizoneresthouse2.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223) +SafariZoneRestHouse2_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneresthouse3.asm b/data/mapHeaders/safarizoneresthouse3.asm index acf87854..21ffd3b6 100755 --- a/data/mapHeaders/safarizoneresthouse3.asm +++ b/data/mapHeaders/safarizoneresthouse3.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224) +SafariZoneRestHouse3_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizoneresthouse4.asm b/data/mapHeaders/safarizoneresthouse4.asm index 8a1ad30f..fa7de7ad 100755 --- a/data/mapHeaders/safarizoneresthouse4.asm +++ b/data/mapHeaders/safarizoneresthouse4.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225) +SafariZoneRestHouse4_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizonesecrethouse.asm b/data/mapHeaders/safarizonesecrethouse.asm index 7fa71fe4..6b081b1a 100755 --- a/data/mapHeaders/safarizonesecrethouse.asm +++ b/data/mapHeaders/safarizonesecrethouse.asm @@ -1,4 +1,4 @@ -SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222) +SafariZoneSecretHouse_h: db LAB ; tileset db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x) dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/safarizonewest.asm b/data/mapHeaders/safarizonewest.asm index 590ae21d..c1c54d13 100755 --- a/data/mapHeaders/safarizonewest.asm +++ b/data/mapHeaders/safarizonewest.asm @@ -1,4 +1,4 @@ -SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219) +SafariZoneWest_h: db FOREST ; tileset db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x) dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts diff --git a/data/mapHeaders/saffroncity.asm b/data/mapHeaders/saffroncity.asm index 3a39b396..8f4ea922 100755 --- a/data/mapHeaders/saffroncity.asm +++ b/data/mapHeaders/saffroncity.asm @@ -1,4 +1,4 @@ -SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10) +SaffronCity_h: db OVERWORLD ; tileset db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/saffrongym.asm b/data/mapHeaders/saffrongym.asm index 23601c75..da3b4c04 100755 --- a/data/mapHeaders/saffrongym.asm +++ b/data/mapHeaders/saffrongym.asm @@ -1,4 +1,4 @@ -SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178) +SaffronGym_h: db FACILITY ; tileset db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x) dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/saffronhouse1.asm b/data/mapHeaders/saffronhouse1.asm index 71cd5395..9e22b03b 100755 --- a/data/mapHeaders/saffronhouse1.asm +++ b/data/mapHeaders/saffronhouse1.asm @@ -1,4 +1,4 @@ -SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179) +SaffronHouse1_h: db HOUSE ; tileset db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x) dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/saffronhouse2.asm b/data/mapHeaders/saffronhouse2.asm index a91bcaec..c38d0231 100755 --- a/data/mapHeaders/saffronhouse2.asm +++ b/data/mapHeaders/saffronhouse2.asm @@ -1,4 +1,4 @@ -SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183) +SaffronHouse2_h: db HOUSE ; tileset db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x) dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/saffronmart.asm b/data/mapHeaders/saffronmart.asm index 0c6fc1d8..747e4da9 100755 --- a/data/mapHeaders/saffronmart.asm +++ b/data/mapHeaders/saffronmart.asm @@ -1,4 +1,4 @@ -SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180) +SaffronMart_h: db MART ; tileset db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x) dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/saffronpokecenter.asm b/data/mapHeaders/saffronpokecenter.asm index 341b415a..aa972289 100755 --- a/data/mapHeaders/saffronpokecenter.asm +++ b/data/mapHeaders/saffronpokecenter.asm @@ -1,4 +1,4 @@ -SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182) +SaffronPokecenter_h: db POKECENTER ; tileset db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x) dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/school.asm b/data/mapHeaders/school.asm index 336ce26e..8ace4fba 100755 --- a/data/mapHeaders/school.asm +++ b/data/mapHeaders/school.asm @@ -1,4 +1,4 @@ -School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43) +School_h: db HOUSE ; tileset db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x) dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts diff --git a/data/mapHeaders/seafoamislands1.asm b/data/mapHeaders/seafoamislands1.asm index 8cb1c847..f52a65a8 100755 --- a/data/mapHeaders/seafoamislands1.asm +++ b/data/mapHeaders/seafoamislands1.asm @@ -1,4 +1,4 @@ -SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192) +SeafoamIslands1_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x) dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/seafoamislands2.asm b/data/mapHeaders/seafoamislands2.asm index 9edbcc72..08ec4bfa 100755 --- a/data/mapHeaders/seafoamislands2.asm +++ b/data/mapHeaders/seafoamislands2.asm @@ -1,4 +1,4 @@ -SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159) +SeafoamIslands2_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x) dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/seafoamislands3.asm b/data/mapHeaders/seafoamislands3.asm index 6ff1d8ff..4050cd71 100755 --- a/data/mapHeaders/seafoamislands3.asm +++ b/data/mapHeaders/seafoamislands3.asm @@ -1,4 +1,4 @@ -SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160) +SeafoamIslands3_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x) dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/seafoamislands4.asm b/data/mapHeaders/seafoamislands4.asm index d3b6fca0..d3912ce0 100755 --- a/data/mapHeaders/seafoamislands4.asm +++ b/data/mapHeaders/seafoamislands4.asm @@ -1,4 +1,4 @@ -SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161) +SeafoamIslands4_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x) dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/seafoamislands5.asm b/data/mapHeaders/seafoamislands5.asm index 330b1d0e..2ae6d4b7 100755 --- a/data/mapHeaders/seafoamislands5.asm +++ b/data/mapHeaders/seafoamislands5.asm @@ -1,4 +1,4 @@ -SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162) +SeafoamIslands5_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x) dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco1.asm b/data/mapHeaders/silphco1.asm index eecb49b6..203f08b7 100755 --- a/data/mapHeaders/silphco1.asm +++ b/data/mapHeaders/silphco1.asm @@ -1,4 +1,4 @@ -SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181) +SilphCo1_h: db FACILITY ; tileset db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x) dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco10.asm b/data/mapHeaders/silphco10.asm index efef2235..a16a6323 100755 --- a/data/mapHeaders/silphco10.asm +++ b/data/mapHeaders/silphco10.asm @@ -1,4 +1,4 @@ -SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234) +SilphCo10_h: db FACILITY ; tileset db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x) dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco11.asm b/data/mapHeaders/silphco11.asm index 829fc9de..a5d2f1b0 100755 --- a/data/mapHeaders/silphco11.asm +++ b/data/mapHeaders/silphco11.asm @@ -1,4 +1,4 @@ -SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235) +SilphCo11_h: db INTERIOR ; tileset db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x) dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco2.asm b/data/mapHeaders/silphco2.asm index 1f345127..f0783e98 100755 --- a/data/mapHeaders/silphco2.asm +++ b/data/mapHeaders/silphco2.asm @@ -1,4 +1,4 @@ -SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207) +SilphCo2_h: db FACILITY ; tileset db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x) dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco3.asm b/data/mapHeaders/silphco3.asm index 56119f41..b89a3802 100755 --- a/data/mapHeaders/silphco3.asm +++ b/data/mapHeaders/silphco3.asm @@ -1,4 +1,4 @@ -SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208) +SilphCo3_h: db FACILITY ; tileset db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x) dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco4.asm b/data/mapHeaders/silphco4.asm index 3d6289cf..3c03a771 100755 --- a/data/mapHeaders/silphco4.asm +++ b/data/mapHeaders/silphco4.asm @@ -1,4 +1,4 @@ -SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209) +SilphCo4_h: db FACILITY ; tileset db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x) dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco5.asm b/data/mapHeaders/silphco5.asm index aa40ca2f..42704025 100755 --- a/data/mapHeaders/silphco5.asm +++ b/data/mapHeaders/silphco5.asm @@ -1,4 +1,4 @@ -SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210) +SilphCo5_h: db FACILITY ; tileset db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x) dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco6.asm b/data/mapHeaders/silphco6.asm index af9b3d6b..c204360a 100755 --- a/data/mapHeaders/silphco6.asm +++ b/data/mapHeaders/silphco6.asm @@ -1,4 +1,4 @@ -SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211) +SilphCo6_h: db FACILITY ; tileset db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x) dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco7.asm b/data/mapHeaders/silphco7.asm index 335d3b6b..bc31b335 100755 --- a/data/mapHeaders/silphco7.asm +++ b/data/mapHeaders/silphco7.asm @@ -1,4 +1,4 @@ -SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212) +SilphCo7_h: db FACILITY ; tileset db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x) dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco8.asm b/data/mapHeaders/silphco8.asm index 31c9617c..aa3e0317 100755 --- a/data/mapHeaders/silphco8.asm +++ b/data/mapHeaders/silphco8.asm @@ -1,4 +1,4 @@ -SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213) +SilphCo8_h: db FACILITY ; tileset db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x) dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphco9.asm b/data/mapHeaders/silphco9.asm index 1cc8b3f2..97427fa3 100755 --- a/data/mapHeaders/silphco9.asm +++ b/data/mapHeaders/silphco9.asm @@ -1,4 +1,4 @@ -SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233) +SilphCo9_h: db FACILITY ; tileset db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x) dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts diff --git a/data/mapHeaders/silphcoelevator.asm b/data/mapHeaders/silphcoelevator.asm index b8a59b7a..8a6ae1ca 100755 --- a/data/mapHeaders/silphcoelevator.asm +++ b/data/mapHeaders/silphcoelevator.asm @@ -1,4 +1,4 @@ -SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236) +SilphCoElevator_h: db LOBBY ; tileset db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x) dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne1.asm b/data/mapHeaders/ssanne1.asm index c31de5d4..e6b48564 100755 --- a/data/mapHeaders/ssanne1.asm +++ b/data/mapHeaders/ssanne1.asm @@ -1,4 +1,4 @@ -SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95) +SSAnne1_h: db SHIP ; tileset db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x) dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne10.asm b/data/mapHeaders/ssanne10.asm index e0e5c6a7..ef07424b 100755 --- a/data/mapHeaders/ssanne10.asm +++ b/data/mapHeaders/ssanne10.asm @@ -1,4 +1,4 @@ -SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104) +SSAnne10_h: db SHIP ; tileset db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x) dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne2.asm b/data/mapHeaders/ssanne2.asm index 50ca0562..cd5f3aa4 100755 --- a/data/mapHeaders/ssanne2.asm +++ b/data/mapHeaders/ssanne2.asm @@ -1,4 +1,4 @@ -SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96) +SSAnne2_h: db SHIP ; tileset db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x) dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne3.asm b/data/mapHeaders/ssanne3.asm index acde90a2..ffa57ddd 100755 --- a/data/mapHeaders/ssanne3.asm +++ b/data/mapHeaders/ssanne3.asm @@ -1,4 +1,4 @@ -SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97) +SSAnne3_h: db SHIP ; tileset db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x) dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne4.asm b/data/mapHeaders/ssanne4.asm index 7f3e9ab2..492b4b8d 100755 --- a/data/mapHeaders/ssanne4.asm +++ b/data/mapHeaders/ssanne4.asm @@ -1,4 +1,4 @@ -SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98) +SSAnne4_h: db SHIP ; tileset db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x) dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne5.asm b/data/mapHeaders/ssanne5.asm index 7da4a6bf..29ffb6b9 100755 --- a/data/mapHeaders/ssanne5.asm +++ b/data/mapHeaders/ssanne5.asm @@ -1,4 +1,4 @@ -SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99) +SSAnne5_h: db SHIP ; tileset db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x) dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne6.asm b/data/mapHeaders/ssanne6.asm index 6d27509e..e347528a 100755 --- a/data/mapHeaders/ssanne6.asm +++ b/data/mapHeaders/ssanne6.asm @@ -1,4 +1,4 @@ -SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100) +SSAnne6_h: db SHIP ; tileset db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x) dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne7.asm b/data/mapHeaders/ssanne7.asm index 66da59c0..9b437688 100755 --- a/data/mapHeaders/ssanne7.asm +++ b/data/mapHeaders/ssanne7.asm @@ -1,4 +1,4 @@ -SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101) +SSAnne7_h: db SHIP ; tileset db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x) dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne8.asm b/data/mapHeaders/ssanne8.asm index dcb12993..64b5c565 100755 --- a/data/mapHeaders/ssanne8.asm +++ b/data/mapHeaders/ssanne8.asm @@ -1,4 +1,4 @@ -SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102) +SSAnne8_h: db SHIP ; tileset db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x) dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts diff --git a/data/mapHeaders/ssanne9.asm b/data/mapHeaders/ssanne9.asm index 5a293576..c8e6e16f 100755 --- a/data/mapHeaders/ssanne9.asm +++ b/data/mapHeaders/ssanne9.asm @@ -1,4 +1,4 @@ -SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103) +SSAnne9_h: db SHIP ; tileset db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x) dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm index b9759bbb..09217ff0 100755 --- a/data/mapHeaders/tradecenter.asm +++ b/data/mapHeaders/tradecenter.asm @@ -1,4 +1,4 @@ -TradeCenter_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239) +TradeCenter_h: db CLUB ; tileset db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathentranceroute5.asm b/data/mapHeaders/undergroundpathentranceroute5.asm index 75e881ba..6e2c5727 100755 --- a/data/mapHeaders/undergroundpathentranceroute5.asm +++ b/data/mapHeaders/undergroundpathentranceroute5.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71) +UndergroundPathEntranceRoute5_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathentranceroute6.asm b/data/mapHeaders/undergroundpathentranceroute6.asm index 91835507..bb22e93e 100755 --- a/data/mapHeaders/undergroundpathentranceroute6.asm +++ b/data/mapHeaders/undergroundpathentranceroute6.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74) +UndergroundPathEntranceRoute6_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathentranceroute7.asm b/data/mapHeaders/undergroundpathentranceroute7.asm index 1ad53899..49b03415 100755 --- a/data/mapHeaders/undergroundpathentranceroute7.asm +++ b/data/mapHeaders/undergroundpathentranceroute7.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77) +UndergroundPathEntranceRoute7_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathentranceroute8.asm b/data/mapHeaders/undergroundpathentranceroute8.asm index ac6fd87d..c70cb697 100755 --- a/data/mapHeaders/undergroundpathentranceroute8.asm +++ b/data/mapHeaders/undergroundpathentranceroute8.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute8_h: ; 0x1e27d to 0x1e289 (12 bytes) (bank=7) (id=80) +UndergroundPathEntranceRoute8_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathns.asm b/data/mapHeaders/undergroundpathns.asm index 78a02053..4dc86647 100755 --- a/data/mapHeaders/undergroundpathns.asm +++ b/data/mapHeaders/undergroundpathns.asm @@ -1,4 +1,4 @@ -UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119) +UndergroundPathNS_h: db UNDERGROUND ; tileset db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x) dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts diff --git a/data/mapHeaders/undergroundpathwe.asm b/data/mapHeaders/undergroundpathwe.asm index e5561767..df2f98e1 100755 --- a/data/mapHeaders/undergroundpathwe.asm +++ b/data/mapHeaders/undergroundpathwe.asm @@ -1,4 +1,4 @@ -UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121) +UndergroundPathWE_h: db UNDERGROUND ; tileset db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x) dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts diff --git a/data/mapHeaders/unknowndungeon1.asm b/data/mapHeaders/unknowndungeon1.asm index 8bac389a..e784ffac 100755 --- a/data/mapHeaders/unknowndungeon1.asm +++ b/data/mapHeaders/unknowndungeon1.asm @@ -1,4 +1,4 @@ -UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228) +UnknownDungeon1_h: db CAVERN ; tileset db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x) dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/unknowndungeon2.asm b/data/mapHeaders/unknowndungeon2.asm index 0bea5b16..3c4c8d4e 100755 --- a/data/mapHeaders/unknowndungeon2.asm +++ b/data/mapHeaders/unknowndungeon2.asm @@ -1,4 +1,4 @@ -UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226) +UnknownDungeon2_h: db CAVERN ; tileset db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x) dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/unknowndungeon3.asm b/data/mapHeaders/unknowndungeon3.asm index a29d39dd..2e01c079 100755 --- a/data/mapHeaders/unknowndungeon3.asm +++ b/data/mapHeaders/unknowndungeon3.asm @@ -1,4 +1,4 @@ -UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227) +UnknownDungeon3_h: db CAVERN ; tileset db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x) dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilioncity.asm b/data/mapHeaders/vermilioncity.asm index a4118084..c162ab24 100755 --- a/data/mapHeaders/vermilioncity.asm +++ b/data/mapHeaders/vermilioncity.asm @@ -1,4 +1,4 @@ -VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5) +VermilionCity_h: db OVERWORLD ; tileset db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/vermiliondock.asm b/data/mapHeaders/vermiliondock.asm index d8d2993c..16b1c7d8 100755 --- a/data/mapHeaders/vermiliondock.asm +++ b/data/mapHeaders/vermiliondock.asm @@ -1,4 +1,4 @@ -VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94) +VermilionDock_h: db SHIP_PORT ; tileset db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x) dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts diff --git a/data/mapHeaders/vermiliongym.asm b/data/mapHeaders/vermiliongym.asm index 5627257e..7624ed75 100755 --- a/data/mapHeaders/vermiliongym.asm +++ b/data/mapHeaders/vermiliongym.asm @@ -1,4 +1,4 @@ -VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92) +VermilionGym_h: db GYM ; tileset db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x) dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilionhouse1.asm b/data/mapHeaders/vermilionhouse1.asm index 34f99023..94aac1d0 100755 --- a/data/mapHeaders/vermilionhouse1.asm +++ b/data/mapHeaders/vermilionhouse1.asm @@ -1,4 +1,4 @@ -VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93) +VermilionHouse1_h: db HOUSE ; tileset db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x) dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilionhouse2.asm b/data/mapHeaders/vermilionhouse2.asm index ce810bb4..b4124088 100755 --- a/data/mapHeaders/vermilionhouse2.asm +++ b/data/mapHeaders/vermilionhouse2.asm @@ -1,4 +1,4 @@ -VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163) +VermilionHouse2_h: db HOUSE ; tileset db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x) dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilionhouse3.asm b/data/mapHeaders/vermilionhouse3.asm index 62651a4f..01683532 100755 --- a/data/mapHeaders/vermilionhouse3.asm +++ b/data/mapHeaders/vermilionhouse3.asm @@ -1,4 +1,4 @@ -VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196) +VermilionHouse3_h: db HOUSE ; tileset db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x) dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilionmart.asm b/data/mapHeaders/vermilionmart.asm index ecf71946..97fccc4d 100755 --- a/data/mapHeaders/vermilionmart.asm +++ b/data/mapHeaders/vermilionmart.asm @@ -1,4 +1,4 @@ -VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91) +VermilionMart_h: db MART ; tileset db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x) dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/vermilionpokecenter.asm b/data/mapHeaders/vermilionpokecenter.asm index 6033585f..e1a63f9e 100755 --- a/data/mapHeaders/vermilionpokecenter.asm +++ b/data/mapHeaders/vermilionpokecenter.asm @@ -1,4 +1,4 @@ -VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89) +VermilionPokecenter_h: db POKECENTER ; tileset db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x) dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts diff --git a/data/mapHeaders/victoryroad1.asm b/data/mapHeaders/victoryroad1.asm index 972d3866..6d2f4338 100755 --- a/data/mapHeaders/victoryroad1.asm +++ b/data/mapHeaders/victoryroad1.asm @@ -1,4 +1,4 @@ -VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108) +VictoryRoad1_h: db CAVERN ; tileset db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x) dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts diff --git a/data/mapHeaders/victoryroad2.asm b/data/mapHeaders/victoryroad2.asm index 3fb24eee..fa9803b2 100755 --- a/data/mapHeaders/victoryroad2.asm +++ b/data/mapHeaders/victoryroad2.asm @@ -1,4 +1,4 @@ -VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194) +VictoryRoad2_h: db CAVERN ; tileset db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x) dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts diff --git a/data/mapHeaders/victoryroad3.asm b/data/mapHeaders/victoryroad3.asm index e35c32c1..4202bfb6 100755 --- a/data/mapHeaders/victoryroad3.asm +++ b/data/mapHeaders/victoryroad3.asm @@ -1,4 +1,4 @@ -VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198) +VictoryRoad3_h: db CAVERN ; tileset db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x) dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts diff --git a/data/mapHeaders/viridiancity.asm b/data/mapHeaders/viridiancity.asm index f7faa568..79b19368 100755 --- a/data/mapHeaders/viridiancity.asm +++ b/data/mapHeaders/viridiancity.asm @@ -1,4 +1,4 @@ -ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1) +ViridianCity_h: db OVERWORLD ; tileset db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianforest.asm b/data/mapHeaders/viridianforest.asm index 43433c9e..ef7905b0 100755 --- a/data/mapHeaders/viridianforest.asm +++ b/data/mapHeaders/viridianforest.asm @@ -1,4 +1,4 @@ -ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51) +ViridianForest_h: db FOREST ; tileset db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x) dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianforestentrance.asm b/data/mapHeaders/viridianforestentrance.asm index 21fdc56b..6e861c58 100755 --- a/data/mapHeaders/viridianforestentrance.asm +++ b/data/mapHeaders/viridianforestentrance.asm @@ -1,4 +1,4 @@ -ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50) +ViridianForestEntrance_h: db FOREST_GATE ; tileset db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x) dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianforestexit.asm b/data/mapHeaders/viridianforestexit.asm index 285e6416..8e1dd25e 100755 --- a/data/mapHeaders/viridianforestexit.asm +++ b/data/mapHeaders/viridianforestexit.asm @@ -1,4 +1,4 @@ -ViridianForestExit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47) +ViridianForestExit_h: db FOREST_GATE ; tileset db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x) dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridiangym.asm b/data/mapHeaders/viridiangym.asm index c983ab71..40b0d69f 100755 --- a/data/mapHeaders/viridiangym.asm +++ b/data/mapHeaders/viridiangym.asm @@ -1,4 +1,4 @@ -ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45) +ViridianGym_h: db GYM ; tileset db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x) dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm index 392c6a20..c8724b4e 100755 --- a/data/mapHeaders/viridianhouse.asm +++ b/data/mapHeaders/viridianhouse.asm @@ -1,4 +1,4 @@ -ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44) +ViridianHouse_h: db HOUSE ; tileset db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x) dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianmart.asm b/data/mapHeaders/viridianmart.asm index 1bbe80f0..3d799a5b 100755 --- a/data/mapHeaders/viridianmart.asm +++ b/data/mapHeaders/viridianmart.asm @@ -1,4 +1,4 @@ -ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42) +ViridianMart_h: db MART ; tileset db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x) dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts diff --git a/data/mapHeaders/viridianpokecenter.asm b/data/mapHeaders/viridianpokecenter.asm index 673be44e..3218e89d 100755 --- a/data/mapHeaders/viridianpokecenter.asm +++ b/data/mapHeaders/viridianpokecenter.asm @@ -1,4 +1,4 @@ -ViridianPokecenter_h: ; 0x44251 to 0x4425d (12 bytes) (bank=11) (id=41) +ViridianPokecenter_h: db POKECENTER ; tileset db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x) dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index e33172ae..22000dde 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -1,4 +1,4 @@ -AgathaObject: ; 0x76534 (size=44) +AgathaObject: db $0 ; border block db $4 ; warps diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index ab763bc3..5a7e832c 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -1,4 +1,4 @@ -BikeShopObject: ; 0x1d866 (size=38) +BikeShopObject: db $e ; border block db $2 ; warps diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index 9da1efd1..ef52e1dd 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/billshouse.asm @@ -1,4 +1,4 @@ -BillsHouseObject: ; 0x1e8df (size=38) +BillsHouseObject: db $d ; border block db $2 ; warps diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index 8d55461f..a734b07b 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -1,4 +1,4 @@ -BrunoObject: ; 0x763d7 (size=44) +BrunoObject: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index 0e420221..c2a7fd78 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -1,4 +1,4 @@ -CeladonCityObject: ; 0x18022 (size=189) +CeladonCityObject: db $f ; border block db $d ; warps diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index 74141df9..fd202a96 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -1,4 +1,4 @@ -CeladonDinerObject: ; 0x491bc (size=50) +CeladonDinerObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index 1169e1da..46b1c906 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -1,4 +1,4 @@ -CeladonGameCornerObject: ; 0x48fa0 (size=99) +CeladonGameCornerObject: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index a38dd535..212c389e 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -1,4 +1,4 @@ -CeladonGymObject: ; 0x48b30 (size=84) +CeladonGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index 33c442c2..8d7dcb03 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/celadonhotel.asm @@ -1,4 +1,4 @@ -CeladonHotelObject: ; 0x49281 (size=38) +CeladonHotelObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 0fcb08f5..6bd847a4 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/celadonhouse.asm @@ -1,4 +1,4 @@ -CeladonHouseObject: ; 0x49227 (size=38) +CeladonHouseObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index a308e8bc..47fbb0e5 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -1,4 +1,4 @@ -CeladonMansion1Object: ; 0x486cf (size=71) +CeladonMansion1Object: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index 9271c22d..883cae36 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -1,4 +1,4 @@ -CeladonMansion2Object: ; 0x48745 (size=39) +CeladonMansion2Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index 36bf36d5..0564b1cb 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/celadonmansion3.asm @@ -1,4 +1,4 @@ -CeladonMansion3Object: ; 0x487ff (size=72) +CeladonMansion3Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index 0241725d..c4f667fa 100755 --- a/data/mapObjects/celadonmansion4.asm +++ b/data/mapObjects/celadonmansion4.asm @@ -1,4 +1,4 @@ -CeladonMansion4Object: ; 0x48875 (size=31) +CeladonMansion4Object: db $9 ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index 2f20323d..243e345b 100755 --- a/data/mapObjects/celadonmansion5.asm +++ b/data/mapObjects/celadonmansion5.asm @@ -1,4 +1,4 @@ -CeladonMansion5Object: ; 0x1dd5c (size=32) +CeladonMansion5Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index dbbc0a36..af647cf2 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/celadonmart1.asm @@ -1,4 +1,4 @@ -CeladonMart1Object: ; 0x60f9e (size=64) +CeladonMart1Object: db $f ; border block db $6 ; warps diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index 061ac6e0..a6c9af59 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -1,4 +1,4 @@ -CeladonMart2Object: ; 0x56111 (size=55) +CeladonMart2Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 5e11a62c..41054371 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -1,4 +1,4 @@ -CeladonMart3Object: ; 0x482c4 (size=94) +CeladonMart3Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 7dce43dc..386dba8c 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -1,4 +1,4 @@ -CeladonMart4Object: ; 0x48370 (size=49) +CeladonMart4Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index 23b7cf4f..df47a70d 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/celadonmart5.asm @@ -1,4 +1,4 @@ -CeladonMart5Object: ; 0x49085 (size=55) +CeladonMart5Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm index 6b778043..2db8635a 100755 --- a/data/mapObjects/celadonmartelevator.asm +++ b/data/mapObjects/celadonmartelevator.asm @@ -1,4 +1,4 @@ -CeladonMartElevatorObject: ; 0x4866d (size=23) +CeladonMartElevatorObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 82830cf2..63a1b4d7 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -1,4 +1,4 @@ -CeladonMartRoofObject: ; 0x485a8 (size=36) +CeladonMartRoofObject: db $42 ; border block db $1 ; warps diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index ccc30ce7..c4ce1700 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -1,4 +1,4 @@ -CeladonPokecenterObject: ; 0x488d2 (size=44) +CeladonPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index 73ca7598..c440bad5 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -1,4 +1,4 @@ -CeladonPrizeRoomObject: ; 0x49108 (size=41) +CeladonPrizeRoomObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 248a8e83..b6317e2c 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -1,4 +1,4 @@ -CeruleanCityObject: ; 0x18786 (size=170) +CeruleanCityObject: db $f ; border block db $a ; warps diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 68d74547..66d22260 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -1,4 +1,4 @@ -CeruleanGymObject: ; 0x5c834 (size=50) +CeruleanGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index db0be014..27373825 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -1,4 +1,4 @@ -CeruleanHouse1Object: ; 0x1d710 (size=32) +CeruleanHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index 24fe3a5e..669cd098 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -1,4 +1,4 @@ -CeruleanHouse2Object: ; 0x74ebe (size=34) +CeruleanHouse2Object: db $c ; border block db $3 ; warps diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index 0c896120..4f154191 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -1,4 +1,4 @@ -CeruleanHouseTrashedObject: ; 0x1d6bf (size=43) +CeruleanHouseTrashedObject: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index fc400e73..301d11a2 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -1,4 +1,4 @@ -CeruleanMartObject: ; 0x5c8a8 (size=38) +CeruleanMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 930995dd..1e92ec07 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -1,4 +1,4 @@ -CeruleanPokecenterObject: ; 0x5c65f (size=44) +CeruleanPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index d9b69192..24bdba3d 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -1,4 +1,4 @@ -CinnabarGymObject: ; 0x75acc (size=90) +CinnabarGymObject: db $2e ; border block db $2 ; warps diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 7c8e80fb..05f4c06c 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -1,4 +1,4 @@ -CinnabarIslandObject: ; 0x1c022 (size=71) +CinnabarIslandObject: db $43 ; border block db $5 ; warps diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index 057ce048..79494686 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -1,4 +1,4 @@ -CinnabarMartObject: ; 0x75e91 (size=38) +CinnabarMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index f144db96..7d15f050 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -1,4 +1,4 @@ -CinnabarPokecenterObject: ; 0x75e46 (size=44) +CinnabarPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm index 5be02b44..91fea6b9 100755 --- a/data/mapObjects/colosseum.asm +++ b/data/mapObjects/colosseum.asm @@ -1,4 +1,4 @@ -ColosseumObject: ; 0x4fd87 (size=10) +ColosseumObject: db $e ; border block db $0 ; warps diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 96787714..7d842cad 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -1,4 +1,4 @@ -CopycatsHouse1FObject: ; 0x75ee3 (size=46) +CopycatsHouse1FObject: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 204c429f..0d53965a 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -1,4 +1,4 @@ -CopycatsHouse2FObject: ; 0x5cd21 (size=48) +CopycatsHouse2FObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index 7fbbf13b..98d4c184 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/daycarem.asm @@ -1,4 +1,4 @@ -DayCareMObject: ; 0x56459 (size=26) +DayCareMObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm index 74bbf775..cdcffce0 100755 --- a/data/mapObjects/diglettscave.asm +++ b/data/mapObjects/diglettscave.asm @@ -1,4 +1,4 @@ -DiglettsCaveObject: ; 0x61f72 (size=20) +DiglettsCaveObject: db $19 ; border block db $2 ; warps diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index d77e649d..e5d6b69f 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/diglettscaveroute11.asm @@ -1,4 +1,4 @@ -DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34) +DiglettsCaveEntranceRoute11Object: db $7d ; border block db $3 ; warps diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index a905305b..f1310cce 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/diglettscaveroute2.asm @@ -1,4 +1,4 @@ -DiglettsCaveRoute2Object: ; 0x1debf (size=34) +DiglettsCaveRoute2Object: db $7d ; border block db $3 ; warps diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index 6f65b287..f0f544ef 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -1,4 +1,4 @@ -FanClubObject: ; 0x59c97 (size=62) +FanClubObject: db $d ; border block db $2 ; warps diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index aa9c0bd7..44fed88f 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -1,4 +1,4 @@ -FightingDojoObject: ; 0x5cf9b (size=72) +FightingDojoObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index 85f801d9..bcca4004 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -1,4 +1,4 @@ -FuchsiaCityObject: ; 0x18bd4 (size=178) +FuchsiaCityObject: db $f ; border block db $9 ; warps diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index ded17031..023c23d3 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -1,4 +1,4 @@ -FuchsiaGymObject: ; 0x75658 (size=82) +FuchsiaGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index 0789ea2c..4d3c3b6e 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/fuchsiahouse1.asm @@ -1,4 +1,4 @@ -FuchsiaHouse1Object: ; 0x75031 (size=38) +FuchsiaHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index f3aa5e7c..3a3d07c3 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -1,4 +1,4 @@ -FuchsiaHouse2Object: ; 0x75180 (size=45) +FuchsiaHouse2Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index 3fd056e9..aaf05bd6 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/fuchsiahouse3.asm @@ -1,4 +1,4 @@ -FuchsiaHouse3Object: ; 0x56221 (size=34) +FuchsiaHouse3Object: db $c ; border block db $3 ; warps diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index eb85d110..431e7c2f 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/fuchsiamart.asm @@ -1,4 +1,4 @@ -FuchsiaMartObject: ; 0x1dd9b (size=38) +FuchsiaMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index 36afcfd8..8106b9ec 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -1,4 +1,4 @@ -FuchsiaMeetingRoomObject: ; 0x756fc (size=38) +FuchsiaMeetingRoomObject: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 19b2c950..8cf103fa 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -1,4 +1,4 @@ -FuchsiaPokecenterObject: ; 0x7507d (size=44) +FuchsiaPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index c14efcf0..e0f37b91 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -1,4 +1,4 @@ -GaryObject: ; 0x7612f (size=48) +GaryObject: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index b21b1f4e..8e245c2c 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/halloffameroom.asm @@ -1,4 +1,4 @@ -HallofFameRoomObject: ; 0x5a571 (size=26) +HallofFameRoomObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm index a30cfbfe..145f2f39 100755 --- a/data/mapObjects/indigoplateau.asm +++ b/data/mapObjects/indigoplateau.asm @@ -1,4 +1,4 @@ -IndigoPlateauObject: ; 0x50936 (size=20) +IndigoPlateauObject: db $e ; border block db $2 ; warps diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index dfcd97b7..13438153 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobbyObject: ; 0x19c95 (size=58) +IndigoPlateauLobbyObject: db $0 ; border block db $3 ; warps diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index a2e05e14..e0adaedc 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -1,4 +1,4 @@ -Lab1Object: ; 0x75bb3 (size=62) +Lab1Object: db $17 ; border block db $5 ; warps diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 89ed5f2c..ed541ada 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -1,4 +1,4 @@ -Lab2Object: ; 0x75c45 (size=38) +Lab2Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index 8aca194b..c5ee01c3 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -1,4 +1,4 @@ -Lab3Object: ; 0x75cec (size=41) +Lab3Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index 47f301c9..361f9533 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -1,4 +1,4 @@ -Lab4Object: ; 0x75df0 (size=32) +Lab4Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index cdfbc7a6..e7bf0ad6 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -1,4 +1,4 @@ -LanceObject: ; 0x5a3c5 (size=36) +LanceObject: db $3 ; border block db $3 ; warps diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index 45707121..54f57270 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/lavenderhouse1.asm @@ -1,4 +1,4 @@ -LavenderHouse1Object: ; 0x1d96a (size=56) +LavenderHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index a8641204..7638ff66 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/lavenderhouse2.asm @@ -1,4 +1,4 @@ -LavenderHouse2Object: ; 0x1d9e6 (size=32) +LavenderHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index d23f21ae..2d8e7636 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/lavendermart.asm @@ -1,4 +1,4 @@ -LavenderMartObject: ; 0x5c95d (size=38) +LavenderMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index b421c3a4..617e7fb8 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -1,4 +1,4 @@ -LavenderPokecenterObject: ; 0x5c8f4 (size=44) +LavenderPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index fb78f139..49347aba 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/lavendertown.asm @@ -1,4 +1,4 @@ -LavenderTownObject: ; 0x4402d (size=88) +LavenderTownObject: db $2c ; border block db $6 ; warps diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 4ce080f7..5b985369 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -1,4 +1,4 @@ -LoreleiObject: ; 0x76280 (size=44) +LoreleiObject: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 0bb168bb..ed6529f2 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -1,4 +1,4 @@ -Mansion1Object: ; 0x443a4 (size=90) +Mansion1Object: db $2e ; border block db $8 ; warps diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index 2cb45879..bda2ad27 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -1,4 +1,4 @@ -Mansion2Object: ; 0x520d1 (size=63) +Mansion2Object: db $1 ; border block db $4 ; warps diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index 288b4753..72431402 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -1,4 +1,4 @@ -Mansion3Object: ; 0x522e6 (size=64) +Mansion3Object: db $1 ; border block db $3 ; warps diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index eddbda8e..94a6f612 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -1,4 +1,4 @@ -Mansion4Object: ; 0x52498 (size=69) +Mansion4Object: db $1 ; border block db $1 ; warps diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index a59f2a20..42c45016 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -1,4 +1,4 @@ -MtMoon1Object: ; 0x49b06 (size=145) +MtMoon1Object: db $3 ; border block db $5 ; warps diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index 2cf6be6b..f39cd4a5 100755 --- a/data/mapObjects/mtmoon2.asm +++ b/data/mapObjects/mtmoon2.asm @@ -1,4 +1,4 @@ -MtMoon2Object: ; 0x51a4d (size=68) +MtMoon2Object: db $3 ; border block db $8 ; warps diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 4f8f911c..7fe29180 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -1,4 +1,4 @@ -MtMoon3Object: ; 0x49fdb (size=102) +MtMoon3Object: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index d6cd35ba..1e168895 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -1,4 +1,4 @@ -MtMoonPokecenterObject: ; 0x49376 (size=56) +MtMoonPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index 208a19c8..56932af8 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -1,4 +1,4 @@ -Museum1FObject: ; 0x5c2c1 (size=74) +Museum1FObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index 77ea061b..689391d9 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -1,4 +1,4 @@ -Museum2FObject: ; 0x5c34b (size=48) +Museum2FObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index 28dcf48f..0118b2f7 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/namerater.asm @@ -1,4 +1,4 @@ -NameRaterObject: ; 0x1dad6 (size=26) +NameRaterObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 53d6b85b..3834c49a 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -1,4 +1,4 @@ -OaksLabObject: ; 0x1d40a (size=88) +OaksLabObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index 4832246f..d02cbae2 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -1,4 +1,4 @@ -PalletTownObject: ; 0x182c3 (size=58) +PalletTownObject: db $b ; border block db $3 ; warps diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index 27a559fc..7b389bd2 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -1,4 +1,4 @@ -PewterCityObject: ; 0x18577 (size=111) +PewterCityObject: db $a ; border block db $7 ; warps diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index b0224a11..280f1a7e 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -1,4 +1,4 @@ -PewterGymObject: ; 0x5c52e (size=42) +PewterGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index 8dcac05c..d973e53b 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/pewterhouse1.asm @@ -1,4 +1,4 @@ -PewterHouse1Object: ; 0x1d616 (size=38) +PewterHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index b4b8f2e7..6c111acb 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/pewterhouse2.asm @@ -1,4 +1,4 @@ -PewterHouse2Object: ; 0x1d659 (size=32) +PewterHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index 2ef08e29..50ccd288 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/pewtermart.asm @@ -1,4 +1,4 @@ -PewterMartObject: ; 0x74cda (size=38) +PewterMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index 86757244..44e10ed6 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -1,4 +1,4 @@ -PewterPokecenterObject: ; 0x5c60d (size=44) +PewterPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index eb71be9e..54af9efc 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -1,4 +1,4 @@ -PokemonTower1Object: ; 0x60452 (size=58) +PokemonTower1Object: db $1 ; border block db $3 ; warps diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index 57ba7363..33bc048d 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -1,4 +1,4 @@ -PokemonTower2Object: ; 0x60646 (size=32) +PokemonTower2Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index 4591cbe3..9899276a 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -1,4 +1,4 @@ -PokemonTower3Object: ; 0x6075d (size=51) +PokemonTower3Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index 722f6e08..19f4f4e3 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -1,4 +1,4 @@ -PokemonTower4Object: ; 0x6088b (size=65) +PokemonTower4Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index 1d23abbf..5a73825c 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -1,4 +1,4 @@ -PokemonTower5Object: ; 0x60a48 (size=65) +PokemonTower5Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index cd7453d8..d0035faa 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -1,4 +1,4 @@ -PokemonTower6Object: ; 0x60c5b (size=58) +PokemonTower6Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index b7826b73..6ee1e8fd 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -1,4 +1,4 @@ -PokemonTower7Object: ; 0x60ef6 (size=42) +PokemonTower7Object: db $1 ; border block db $1 ; warps diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index a4c5d8ea..a04cb657 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -1,4 +1,4 @@ -PowerPlantObject: ; 0x1e3bf (size=135) +PowerPlantObject: db $2e ; border block db $3 ; warps diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index d668d441..ebd57e59 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -1,4 +1,4 @@ -RedsHouse2FObject: ; 0x5c0d0 +RedsHouse2FObject: db $0A ; border block db $1 ; warps diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index 55c0c101..0b2bf374 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -1,4 +1,4 @@ -RocketHideout1Object: ; 0x44ce7 (size=98) +RocketHideout1Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index b14dc0e6..6689110c 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -1,4 +1,4 @@ -RocketHideout2Object: ; 0x450f7 (size=80) +RocketHideout2Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index d7933ddf..90bfbb57 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -1,4 +1,4 @@ -RocketHideout3Object: ; 0x4534d (size=50) +RocketHideout3Object: db $2e ; border block db $2 ; warps diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index 5441f9cd..b4e98d04 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -1,4 +1,4 @@ -RocketHideout4Object: ; 0x455f1 (size=95) +RocketHideout4Object: db $2e ; border block db $3 ; warps diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm index 477e62c9..c1dfe961 100755 --- a/data/mapObjects/rockethideoutelevator.asm +++ b/data/mapObjects/rockethideoutelevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevatorObject: ; 0x45791 (size=23) +RocketHideoutElevatorObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 70ffa438..932efb87 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -1,4 +1,4 @@ -RockTunnel1Object: ; 0x445f6 (size=127) +RockTunnel1Object: db $3 ; border block db $8 ; warps diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index e343fc0b..3589ec60 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -1,4 +1,4 @@ -RockTunnel2Object: ; 0x4613d (size=100) +RockTunnel2Object: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index d2645165..90efc3ea 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -1,4 +1,4 @@ -RockTunnelPokecenterObject: ; 0x493d4 (size=44) +RockTunnelPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index d2abf51f..0e6237e7 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/route1.asm @@ -1,4 +1,4 @@ -Route1Object: ; 0x1c0e5 (size=19) +Route1Object: db $b ; border block db $0 ; warps diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index 3623b79f..a1590ded 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -1,4 +1,4 @@ -Route10Object: ; 0x582f6 (size=96) +Route10Object: db $2c ; border block db $4 ; warps diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 4e196b20..0c7828f2 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -1,4 +1,4 @@ -Route11Object: ; 0x584e0 (size=127) +Route11Object: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index 351b922c..d8e6bff1 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -1,4 +1,4 @@ -Route11GateObject: ; 0x49416 (size=50) +Route11GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index 421de945..6228851d 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/route11gateupstairs.asm @@ -1,4 +1,4 @@ -Route11GateUpstairsObject: ; 0x494da (size=30) +Route11GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 8ed43ff4..dd461e6c 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -1,4 +1,4 @@ -Route12Object: ; 0x5869a (size=118) +Route12Object: db $43 ; border block db $4 ; warps diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index 1e2fe3f9..27e8532a 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -1,4 +1,4 @@ -Route12GateObject: ; 0x4950e (size=50) +Route12GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm index 9a8e4d4a..f1221c44 100755 --- a/data/mapObjects/route12gateupstairs.asm +++ b/data/mapObjects/route12gateupstairs.asm @@ -1,4 +1,4 @@ -Route12GateUpstairsObject: ; 0x495de (size=24) +Route12GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index fad89578..104b01f7 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/route12house.asm @@ -1,4 +1,4 @@ -Route12HouseObject: ; 0x564de (size=26) +Route12HouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index e6fdf8e6..a01e25a3 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -1,4 +1,4 @@ -Route13Object: ; 0x5482e (size=93) +Route13Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index ce6d52b0..48edd284 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -1,4 +1,4 @@ -Route14Object: ; 0x549bb (size=87) +Route14Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index e0d19e5c..1d83b20d 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -1,4 +1,4 @@ -Route15Object: ; 0x5894e (size=126) +Route15Object: db $43 ; border block db $4 ; warps diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index f571ee03..06a6790a 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -1,4 +1,4 @@ -Route15GateObject: ; 0x4960c (size=50) +Route15GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index 600dbbf1..a342d106 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -1,4 +1,4 @@ -Route16Object: ; 0x58afc (size=136) +Route16Object: db $f ; border block db $9 ; warps diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index e1da990d..fce6c292 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/route16gate.asm @@ -1,4 +1,4 @@ -Route16GateObject: ; 0x4978b (size=88) +Route16GateObject: db $a ; border block db $9 ; warps diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index d8c2db12..9119bf5e 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -1,4 +1,4 @@ -Route16GateUpstairsObject: ; 0x4984c (size=30) +Route16GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index 12a846c6..e1e4244d 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/route16house.asm @@ -1,4 +1,4 @@ -Route16HouseObject: ; 0x1e657 (size=32) +Route16HouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index c496373e..3c8e3bce 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -1,4 +1,4 @@ -Route17Object: ; 0x54b42 (size=102) +Route17Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 88547941..8b36ab7c 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -1,4 +1,4 @@ -Route18Object: ; 0x58c5a (size=66) +Route18Object: db $43 ; border block db $4 ; warps diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index d42026da..08b10050 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/route18gate.asm @@ -1,4 +1,4 @@ -Route18GateObject: ; 0x49937 (size=50) +Route18GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index c611e0c3..671b3215 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -1,4 +1,4 @@ -Route18GateUpstairsObject: ; 0x499a4 (size=24) +Route18GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 1b99d90e..956caa6e 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,4 +1,4 @@ -Route19Object: ; 0x54e9a (size=87) +Route19Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 0e6784b2..7db8fe09 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -1,4 +1,4 @@ -Route2Object: ; 0x54022 (size=72) +Route2Object: db $f ; border block db $6 ; warps diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 6939ffad..a3527525 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -1,4 +1,4 @@ -Route20Object: ; 0x50113 (size=106) +Route20Object: db $43 ; border block db $2 ; warps diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index e98c8425..1ed7b1cb 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -1,4 +1,4 @@ -Route21Object: ; 0x55021 (size=76) +Route21Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index 999b9d8a..ef568ae8 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -1,4 +1,4 @@ -Route22Object: ; 0x50022 (size=27) +Route22Object: db $2c ; border block db $1 ; warps diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 604a8730..2798311b 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -1,4 +1,4 @@ -Route22GateObject: ; 0x1e720 (size=42) +Route22GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index af8c8dab..3995e510 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/route23.asm @@ -1,4 +1,4 @@ -Route23Object: ; 0x50361 (size=81) +Route23Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index f8173c9d..5af90a4b 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -1,4 +1,4 @@ -Route24Object: ; 0x506a4 (size=67) +Route24Object: db $2c ; border block db $0 ; warps diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index 5c6811f3..b26f62ef 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -1,4 +1,4 @@ -Route25Object: ; 0x507b2 (size=94) +Route25Object: db $2c ; border block db $1 ; warps diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index 9a0b79e0..53590f69 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -1,4 +1,4 @@ -Route2GateObject: ; 0x5d620 (size=48) +Route2GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index b8d6d20f..d6665020 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -1,4 +1,4 @@ -Route2HouseObject: ; 0x1df07 (size=32) +Route2HouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index a2df6925..ba446dca 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -1,4 +1,4 @@ -Route3Object: ; 0x54208 (size=77) +Route3Object: db $2c ; border block db $0 ; warps diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index 14e59684..e52f4909 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -1,4 +1,4 @@ -Route4Object: ; 0x543b2 (size=58) +Route4Object: db $2c ; border block db $3 ; warps diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index d11f8417..6065f599 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -1,4 +1,4 @@ -Route5Object: ; 0x545a3 (size=47) +Route5Object: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index db2f4564..9588f511 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/route5gate.asm @@ -1,4 +1,4 @@ -Route5GateObject: ; 0x1dffb (size=42) +Route5GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index 19ac2a8a..bfd88fac 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -1,4 +1,4 @@ -Route6Object: ; 0x58022 (size=87) +Route6Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index 59d08e57..79f17007 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/route6gate.asm @@ -1,4 +1,4 @@ -Route6GateObject: ; 0x1e0be (size=42) +Route6GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index 485a8694..d039cb3c 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -1,4 +1,4 @@ -Route7Object: ; 0x48022 (size=47) +Route7Object: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 8c618fc1..3aea6a88 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -1,4 +1,4 @@ -Route7GateObject: ; 0x1e185 (size=42) +Route7GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 5863129b..8aa16b82 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -1,4 +1,4 @@ -Route8Object: ; 0x5814f (size=119) +Route8Object: db $2c ; border block db $5 ; warps diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index 8c3fb54f..b059fb36 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -1,4 +1,4 @@ -Route8GateObject: ; 0x1e247 (size=42) +Route8GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 79d0d5ed..9e079eab 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -1,4 +1,4 @@ -Route9Object: ; 0x546a8 (size=86) +Route9Object: db $2c ; border block db $0 ; warps diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index 41886e9f..b5fa0107 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/safarizonecenter.asm @@ -1,4 +1,4 @@ -SafariZoneCenterObject: ; 0x45bc5 (size=89) +SafariZoneCenterObject: db $0 ; border block db $9 ; warps diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index 4cb1e0ae..6c2f8138 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/safarizoneeast.asm @@ -1,4 +1,4 @@ -SafariZoneEastObject: ; 0x4588b (size=81) +SafariZoneEastObject: db $0 ; border block db $5 ; warps diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index 543cf7dc..9d26aa17 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/safarizoneentrance.asm @@ -1,4 +1,4 @@ -SafariZoneEntranceObject: ; 0x753f5 (size=48) +SafariZoneEntranceObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index e3c4cddb..d0305507 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -1,4 +1,4 @@ -SafariZoneNorthObject: ; 0x459d5 (size=105) +SafariZoneNorthObject: db $0 ; border block db $9 ; warps diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index d27a967f..79156825 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/safarizoneresthouse1.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse1Object: ; 0x45cfe (size=32) +SafariZoneRestHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index eb6c7a25..82f04f9d 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse2Object: ; 0x45d43 (size=38) +SafariZoneRestHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index 4d698782..ae973fa8 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/safarizoneresthouse3.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse3Object: ; 0x45d8e (size=38) +SafariZoneRestHouse3Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 1d928420..7502732c 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/safarizoneresthouse4.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse4Object: ; 0x45dd9 (size=38) +SafariZoneRestHouse4Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index 471ec40b..a96115b8 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -1,4 +1,4 @@ -SafariZoneSecretHouseObject: ; 0x4a365 (size=26) +SafariZoneSecretHouseObject: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index 724476ae..64ed0876 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/safarizonewest.asm @@ -1,4 +1,4 @@ -SafariZoneWestObject: ; 0x4a1dc (size=108) +SafariZoneWestObject: db $0 ; border block db $8 ; warps diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 69e76ee7..7275800a 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -1,4 +1,4 @@ -SaffronCityObject: ; 0x509dc (size=188) +SaffronCityObject: db $f ; border block db $8 ; warps diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 63676905..6a770fdc 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -1,4 +1,4 @@ -SaffronGymObject: ; 0x5d259 (size=330) +SaffronGymObject: db $2e ; border block db $20 ; warps diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index 0480cbd9..9f6d7750 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -1,4 +1,4 @@ -SaffronHouse1Object: ; 0x1de04 (size=44) +SaffronHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index ffcbd64d..e57bdbb7 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/saffronhouse2.asm @@ -1,4 +1,4 @@ -SaffronHouse2Object: ; 0x1de8a (size=26) +SaffronHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index be3803af..113a1ea9 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -1,4 +1,4 @@ -SaffronMartObject: ; 0x5d41c (size=38) +SaffronMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index 8487bb01..896b550a 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -1,4 +1,4 @@ -SaffronPokecenterObject: ; 0x5d54f (size=44) +SaffronPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index b60be6c0..53f7fc00 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -1,4 +1,4 @@ -SchoolObject: ; 0x1d55d (size=32) +SchoolObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 287f67ce..4f7f7a8e 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -1,4 +1,4 @@ -SeafoamIslands1Object: ; 0x4484f (size=72) +SeafoamIslands1Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index 29cdfa59..d25e5375 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -1,4 +1,4 @@ -SeafoamIslands2Object: ; 0x46376 (size=72) +SeafoamIslands2Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index 28a5e67b..a660f2ed 100755 --- a/data/mapObjects/seafoamislands3.asm +++ b/data/mapObjects/seafoamislands3.asm @@ -1,4 +1,4 @@ -SeafoamIslands3Object: ; 0x464b2 (size=72) +SeafoamIslands3Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index e90b3865..c7043a93 100755 --- a/data/mapObjects/seafoamislands4.asm +++ b/data/mapObjects/seafoamislands4.asm @@ -1,4 +1,4 @@ -SeafoamIslands4Object: ; 0x466a6 (size=96) +SeafoamIslands4Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index e5fbaecd..a05c00cc 100755 --- a/data/mapObjects/seafoamislands5.asm +++ b/data/mapObjects/seafoamislands5.asm @@ -1,4 +1,4 @@ -SeafoamIslands5Object: ; 0x468bc (size=62) +SeafoamIslands5Object: db $7d ; border block db $4 ; warps diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index a953f376..fe779393 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -1,4 +1,4 @@ -SilphCo1Object: ; 0x5d470 (size=50) +SilphCo1Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index cc608e64..185a23c9 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -1,4 +1,4 @@ -SilphCo10Object: ; 0x5a1fb (size=95) +SilphCo10Object: db $2e ; border block db $6 ; warps diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index 8cba618e..95712629 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -1,4 +1,4 @@ -SilphCo11Object: ; 0x62380 (size=72) +SilphCo11Object: db $d ; border block db $4 ; warps diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index 44271d70..ae3aca74 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -1,4 +1,4 @@ -SilphCo2Object: ; 0x59e66 (size=98) +SilphCo2Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index 48bb8c1a..ddea9062 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -1,4 +1,4 @@ -SilphCo3Object: ; 0x5a035 (size=113) +SilphCo3Object: db $2e ; border block db $a ; warps diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index 762ca7f8..a2320112 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -1,4 +1,4 @@ -SilphCo4Object: ; 0x19e35 (size=111) +SilphCo4Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index 0c956cd3..62e30fac 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -1,4 +1,4 @@ -SilphCo5Object: ; 0x1a08d (size=137) +SilphCo5Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index 66372f57..19d66e50 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -1,4 +1,4 @@ -SilphCo6Object: ; 0x1a2fb (size=112) +SilphCo6Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index ef665ac0..47e881fe 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -1,4 +1,4 @@ -SilphCo7Object: ; 0x51ed7 (size=128) +SilphCo7Object: db $2e ; border block db $6 ; warps diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index a4b97a91..188b27b6 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -1,4 +1,4 @@ -SilphCo8Object: ; 0x56613 (size=90) +SilphCo8Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 204f0d1d..76d82895 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -1,4 +1,4 @@ -SilphCo9Object: ; 0x5d93f (size=74) +SilphCo9Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm index 0e0f03c6..2de795ae 100755 --- a/data/mapObjects/silphcoelevator.asm +++ b/data/mapObjects/silphcoelevator.asm @@ -1,4 +1,4 @@ -SilphCoElevatorObject: ; 0x45844 (size=23) +SilphCoElevatorObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index c631074c..7f6a826c 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -1,4 +1,4 @@ -SSAnne1Object: ; 0x61277 (size=104) +SSAnne1Object: db $c ; border block db $b ; warps diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index c57925f1..a8f49cf7 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -1,4 +1,4 @@ -SSAnne10Object: ; 0x61e75 (size=165) +SSAnne10Object: db $c ; border block db $a ; warps diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index 9f3691cf..eb761685 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -1,4 +1,4 @@ -SSAnne2Object: ; 0x61514 (size=90) +SSAnne2Object: db $c ; border block db $9 ; warps diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index 1037d118..567f0363 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -1,4 +1,4 @@ -SSAnne3Object: ; 0x4493c (size=26) +SSAnne3Object: db $c ; border block db $2 ; warps diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index 9d752480..fbd1df5b 100755 --- a/data/mapObjects/ssanne4.asm +++ b/data/mapObjects/ssanne4.asm @@ -1,4 +1,4 @@ -SSAnne4Object: ; 0x61632 (size=52) +SSAnne4Object: db $c ; border block db $6 ; warps diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index e18f1074..6031327e 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -1,4 +1,4 @@ -SSAnne5Object: ; 0x6172b (size=54) +SSAnne5Object: db $23 ; border block db $2 ; warps diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 159a3ed2..8c2444f8 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -1,4 +1,4 @@ -SSAnne6Object: ; 0x6181b (size=54) +SSAnne6Object: db $c ; border block db $1 ; warps diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index 6179a28e..6002e85b 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -1,4 +1,4 @@ -SSAnne7Object: ; 0x61946 (size=24) +SSAnne7Object: db $c ; border block db $1 ; warps diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index 992230d8..37c8cf61 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -1,4 +1,4 @@ -SSAnne8Object: ; 0x61a60 (size=127) +SSAnne8Object: db $c ; border block db $6 ; warps diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index 7fddc058..6b5e4b7d 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -1,4 +1,4 @@ -SSAnne9Object: ; 0x61c8d (size=188) +SSAnne9Object: db $c ; border block db $c ; warps diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm index 57a3eee5..f482fc4f 100755 --- a/data/mapObjects/tradecenter.asm +++ b/data/mapObjects/tradecenter.asm @@ -1,4 +1,4 @@ -TradeCenterObject: ; 0x4fd53 (size=10) +TradeCenterObject: db $e ; border block db $0 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index a2f18179..14d7232e 100755 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ b/data/mapObjects/undergroundpathentranceroute5.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute5Object: ; 0x5d6c1 (size=34) +UndergroundPathEntranceRoute5Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index 834263b5..7bce8774 100755 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ b/data/mapObjects/undergroundpathentranceroute6.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute6Object: ; 0x5d6fe (size=34) +UndergroundPathEntranceRoute6Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index 909ff4a0..51b4bcda 100755 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ b/data/mapObjects/undergroundpathentranceroute7.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34) +UndergroundPathEntranceRoute7Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index 9a1d9d37..9e98c987 100755 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ b/data/mapObjects/undergroundpathentranceroute8.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34) +UndergroundPathEntranceRoute8Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm index d9ae7499..d0188a76 100755 --- a/data/mapObjects/undergroundpathns.asm +++ b/data/mapObjects/undergroundpathns.asm @@ -1,4 +1,4 @@ -UndergroundPathNSObject: ; 0x61f2a (size=20) +UndergroundPathNSObject: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm index 303f60b9..42bbb9bf 100755 --- a/data/mapObjects/undergroundpathwe.asm +++ b/data/mapObjects/undergroundpathwe.asm @@ -1,4 +1,4 @@ -UndergroundPathWEObject: ; 0x61f4e (size=20) +UndergroundPathWEObject: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index c55711b4..e0393f2e 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -1,4 +1,4 @@ -UnknownDungeon1Object: ; 0x74d15 (size=97) +UnknownDungeon1Object: db $7d ; border block db $9 ; warps diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index e5ebca56..e1a443bb 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -1,4 +1,4 @@ -UnknownDungeon2Object: ; 0x45e14 (size=73) +UnknownDungeon2Object: db $7d ; border block db $6 ; warps diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index 8b733e6b..84fe5e5d 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -1,4 +1,4 @@ -UnknownDungeon3Object: ; 0x45f36 (size=34) +UnknownDungeon3Object: db $7d ; border block db $1 ; warps diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index c5602be1..8f64e894 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -1,4 +1,4 @@ -VermilionCityObject: ; 0x189ba (size=133) +VermilionCityObject: db $43 ; border block db $9 ; warps diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index b8aa659d..54d6790a 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/vermiliondock.asm @@ -1,4 +1,4 @@ -VermilionDockObject: ; 0x1dcc6 (size=20) +VermilionDockObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 892403a3..9058ec4c 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -1,4 +1,4 @@ -VermilionGymObject: ; 0x5cbfe (size=58) +VermilionGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index 952661cc..199489ba 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/vermilionhouse1.asm @@ -1,4 +1,4 @@ -VermilionHouse1Object: ; 0x1db20 (size=38) +VermilionHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index 03c3c1a2..0108233b 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/vermilionhouse2.asm @@ -1,4 +1,4 @@ -VermilionHouse2Object: ; 0x560cf (size=26) +VermilionHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index ab955a20..2b8e007b 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -1,4 +1,4 @@ -VermilionHouse3Object: ; 0x19c25 (size=26) +VermilionHouse3Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index 56c52944..01df824e 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/vermilionmart.asm @@ -1,4 +1,4 @@ -VermilionMartObject: ; 0x5c9f4 (size=38) +VermilionMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index e5d1d147..727af039 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -1,4 +1,4 @@ -VermilionPokecenterObject: ; 0x5c9a9 (size=44) +VermilionPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 9e66e95b..05680b9f 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -1,4 +1,4 @@ -VictoryRoad1Object: ; 0x5dab8 (size=76) +VictoryRoad1Object: db $7d ; border block db $3 ; warps diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 348cae03..1bada62a 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -1,4 +1,4 @@ -VictoryRoad2Object: ; 0x51915 (size=154) +VictoryRoad2Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 19a06c65..20e43583 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -1,4 +1,4 @@ -VictoryRoad3Object: ; 0x44acd (size=106) +VictoryRoad3Object: db $7d ; border block db $4 ; warps diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index a2d2815f..ca40cc4f 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -1,4 +1,4 @@ -ViridianCityObject: ; 0x18384 (size=104) +ViridianCityObject: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index a1d52cfe..0e466a70 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -1,4 +1,4 @@ -ViridianForestObject: ; 0x611da (size=127) +ViridianForestObject: db $3 ; border block db $6 ; warps diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index fc676a6d..06faad72 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -1,4 +1,4 @@ -ViridianForestEntranceObject: ; 0x5d66d (size=48) +ViridianForestEntranceObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index be8b65ea..0f48fd1c 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -1,4 +1,4 @@ -ViridianForestExitObject: ; 0x5d598 (size=48) +ViridianForestExitObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index 468b9022..8efa5e22 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -1,4 +1,4 @@ -ViridianGymObject: ; 0x74bde (size=105) +ViridianGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index ba45adac..c06bb9c8 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/viridianhouse.asm @@ -1,4 +1,4 @@ -ViridianHouseObject: ; 0x1d5bb (size=44) +ViridianHouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index ed2642f9..4b90bee3 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -1,4 +1,4 @@ -ViridianMartObject: ; 0x1d50a (size=38) +ViridianMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 652efb97..2e96ca58 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -1,4 +1,4 @@ -ViridianPokecenterObject: ; 0x44277 (size=44) +ViridianPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index d6392522..2578ee28 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -253,7 +253,7 @@ PlayAnimation: .nextAnimationCommand pop hl jr .animationLoop -.AnimationOver ; 417B +.AnimationOver ret LoadSubanimation: @@ -926,7 +926,7 @@ BallMoveDistances1: db $ff ; terminator ; function to make the pokeball jump up -TradeJumpPokeball: ; 507C +TradeJumpPokeball: ld de,BallMoveDistances2 .loop ld hl,wOAMBuffer ; OAM buffer @@ -2996,7 +2996,7 @@ TossBallAnimation: ; sequence of animations that make up the Poké Ball toss db POOF_ANIM,HIDEPIC_ANIM,SHAKE_ANIM,POOF_ANIM,SHOWPIC_ANIM -.BlockBall ; 5E55 +.BlockBall ld a,TOSS_ANIM ld [wAnimationID],a call PlayAnimation diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f8053a9e..3b474584 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -819,7 +819,7 @@ HandleEnemyMonFainted: ld [wActionResultOrTookBattleTurn], a jp MainInBattleLoop -FaintEnemyPokemon: ; 0x3c567 +FaintEnemyPokemon: call ReadPlayerMonCurHPAndStatus ld a, [wIsInBattle] dec a @@ -945,7 +945,7 @@ FaintEnemyPokemon: ; 0x3c567 ld [wPartyGainExpFlags], a jpab GainExperience -EnemyMonFaintedText: ; 0x3c63e +EnemyMonFaintedText: TX_FAR _EnemyMonFaintedText db "@" @@ -4672,7 +4672,6 @@ UnusedHighCriticalMoves: db CRABHAMMER db SLASH db $FF -; 3e023 ; determines if attack is a critical hit ; azure heights claims "the fastest pokémon (who are,not coincidentally, diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index d477ffdf..f44d64f5 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -44,7 +44,7 @@ SetupEnemyPartyPokeballs: ld hl, wOAMBuffer + PARTY_LENGTH * 4 jp WritePokeballOAMData -SetupPokeballs: ; 0x3a8a6 +SetupPokeballs: ld a, [de] push af ld de, wBuffer diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 385cdd1b..7999a7a0 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -145,7 +145,7 @@ AIMoveChoiceModification1: ld [hl], a jr .nextMove -StatusAilmentMoveEffects: ; 57e2 +StatusAilmentMoveEffects: db $01 ; unused sleep effect db SLEEP_EFFECT db POISON_EFFECT @@ -731,7 +731,7 @@ AICureStatus: res 0,[hl] ret -AIUseXAccuracy: ; 0x3a7a8 unused +AIUseXAccuracy: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 0,[hl] @@ -745,7 +745,7 @@ AIUseGuardSpec: ld a,GUARD_SPEC jp AIPrintItemUse -AIUseDireHit: ; 0x3a7c2 unused +AIUseDireHit: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 2,[hl] diff --git a/engine/cable_club.asm b/engine/cable_club.asm index d9893f1f..bd9ed683 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -23,7 +23,7 @@ CableClub_DoBattleOrTrade: ; fall through ; This is called after completing a trade. -CableClub_DoBattleOrTradeAgain: ; 5345 +CableClub_DoBattleOrTradeAgain: ld hl, wSerialPlayerDataBlock ld a, SERIAL_PREAMBLE_BYTE ld b, 6 diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index dee5efea..1b571d35 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -432,7 +432,6 @@ GymTrashCans: db 2, 9, 13, 0, 0 ; 12 db 3, 10, 12, 14, 0 ; 13 db 2, 11, 13, 0, 0 ; 14 -; 5dec8 VermilionGymTrashSuccessText1: TX_FAR _VermilionGymTrashSuccessText1 diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 384ab485..f6865b6c 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -92,7 +92,7 @@ OaksPCText: db "PROF.OAK's PC@" PKMNLeaguePCText: db $4a, "LEAGUE@" LogOffPCText: db "LOG OFF@" -BillsPC_:: ; 0x214c2 +BillsPC_:: ld hl, wd730 set 6, [hl] xor a @@ -457,51 +457,51 @@ StatsCancelPCText: db "STATS" next "CANCEL@" -SwitchOnText: ; 0x217e9 +SwitchOnText: TX_FAR _SwitchOnText db "@" -WhatText: ; 0x217ee +WhatText: TX_FAR _WhatText db "@" -DepositWhichMonText: ; 0x217f3 +DepositWhichMonText: TX_FAR _DepositWhichMonText db "@" -MonWasStoredText: ; 0x217f8 +MonWasStoredText: TX_FAR _MonWasStoredText db "@" -CantDepositLastMonText: ; 0x217fd +CantDepositLastMonText: TX_FAR _CantDepositLastMonText db "@" -BoxFullText: ; 0x21802 +BoxFullText: TX_FAR _BoxFullText db "@" -MonIsTakenOutText: ; 0x21807 +MonIsTakenOutText: TX_FAR _MonIsTakenOutText db "@" -NoMonText: ; 0x2180c +NoMonText: TX_FAR _NoMonText db "@" -CantTakeMonText: ; 0x21811 +CantTakeMonText: TX_FAR _CantTakeMonText db "@" -ReleaseWhichMonText: ; 0x21816 +ReleaseWhichMonText: TX_FAR _ReleaseWhichMonText db "@" -OnceReleasedText: ; 0x2181b +OnceReleasedText: TX_FAR _OnceReleasedText db "@" -MonWasReleasedText: ; 0x21820 +MonWasReleasedText: TX_FAR _MonWasReleasedText db "@" diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index e1359063..170c0ef3 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -1,4 +1,4 @@ -PKMNLeaguePC: ; 0x7657e +PKMNLeaguePC: ld hl, AccessedHoFPCText call PrintText ld hl, wd730 diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 759be189..217d6e54 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -49,7 +49,7 @@ AskName: ld bc, NAME_LENGTH jp CopyData -DoYouWantToNicknameText: ; 0x6557 +DoYouWantToNicknameText: TX_FAR _DoYouWantToNicknameText db "@" diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 96ec1ac1..a7076d35 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -223,7 +223,7 @@ OKText: db "OK@" ; Draws a line starting from hl high b and wide c -DrawLineBox: ; 0x12ac7 +DrawLineBox: ld de, SCREEN_WIDTH ; New line .PrintVerticalLine ld [hl], $78 ; │ @@ -335,11 +335,11 @@ StatusScreen2: ld c, a ld a, "-" call StatusScreen_PrintPP ; Fill the rest with -- -.InitPP ; 12bbb +.InitPP ld hl, wLoadedMonMoves coord de, 14, 10 ld b, 0 -.PrintPP ; 12bc3 +.PrintPP ld a, [hli] and a jr z, .PPDone diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm index d73174c4..54ba6b7a 100755 --- a/engine/overworld/oaks_aide.asm +++ b/engine/overworld/oaks_aide.asm @@ -1,4 +1,4 @@ -OaksAideScript: ; 0x59035 +OaksAideScript: ld hl, OaksAideHiText call PrintText call YesNoChoice diff --git a/engine/save.asm b/engine/save.asm index 4a2ac196..58326187 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -183,7 +183,7 @@ SaveSAVConfirm: ld a,[wCurrentMenuItem] ret -WouldYouLikeToSaveText: ; 0x7377d +WouldYouLikeToSaveText: TX_FAR _WouldYouLikeToSaveText db "@" @@ -497,7 +497,7 @@ PrintStatusCondition:: ld [hl],"T" and a ret -PrintStatusConditionNotFainted: ; 14f6 +PrintStatusConditionNotFainted: ld a,[H_LOADEDROMBANK] push af ld a,BANK(PrintStatusAilment) @@ -4192,7 +4192,7 @@ PrintText_NoCreatingTextBox:: jp TextCommandProcessor -PrintNumber:: ; 3c5f +PrintNumber:: ; Print the c-digit, b-byte value at de. ; Allows 2 to 7 digits. For 1-digit numbers, add ; the value to char "0" instead of calling PrintNumber. diff --git a/home/text.asm b/home/text.asm index e425b2c8..e9c0efdd 100644 --- a/home/text.asm +++ b/home/text.asm @@ -135,11 +135,11 @@ Char00:: dec de ret -Char00Text:: ; 0x19f4 “%d ERROR.” +Char00Text:: ; “%d ERROR.” TX_FAR _Char00Text db "@" -Char52:: ; 0x19f9 player’s name +Char52:: ; player’s name push de ld de,wPlayerName jr FinishDTE diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 060d5b16..2b72ef97 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -80,10 +80,10 @@ DaisyUseMapText: TX_FAR _DaisyUseMapText db "@" -BluesHouseText2: ; 0x19bc4 Daisy, walking around +BluesHouseText2: ; Daisy, walking around TX_FAR _BluesHouseText2 db "@" -BluesHouseText3: ; 0x19bc9 map on table +BluesHouseText3: ; map on table TX_FAR _BluesHouseText3 db "@" diff --git a/scripts/fuchsiahouse3.asm b/scripts/fuchsiahouse3.asm index 9e2c6d4b..fe1da024 100755 --- a/scripts/fuchsiahouse3.asm +++ b/scripts/fuchsiahouse3.asm @@ -52,7 +52,7 @@ FuchsiaHouse3Text_561c2: db $0B db "@" -UnusedText_561c8: ; 561c8 +UnusedText_561c8: para "つり こそ" line "おとこの ロマン だ!" diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index 50cfb970..a06dfd54 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -189,26 +189,26 @@ OakWalksUpText: TX_FAR _OakWalksUpText db "@" -PalletTownText2: ; 0x18fd3 girl +PalletTownText2: ; girl TX_FAR _PalletTownText2 db "@" -PalletTownText3: ; 0x18fd8 fat man +PalletTownText3: ; fat man TX_FAR _PalletTownText3 db "@" -PalletTownText4: ; 0x18fdd sign by lab +PalletTownText4: ; sign by lab TX_FAR _PalletTownText4 db "@" -PalletTownText5: ; 0x18fe2 sign by fence +PalletTownText5: ; sign by fence TX_FAR _PalletTownText5 db "@" -PalletTownText6: ; 0x18fe7 sign by Red’s house +PalletTownText6: ; sign by Red’s house TX_FAR _PalletTownText6 db "@" -PalletTownText7: ; 0x18fec sign by Blue’s house +PalletTownText7: ; sign by Blue’s house TX_FAR _PalletTownText7 db "@" diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 15c79b4d..348534b4 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -142,7 +142,7 @@ CoordsData_60de3: db $07,$0C dw MovementData_60e22 -MovementData_60e13: ; 60e13 +MovementData_60e13: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -152,7 +152,7 @@ MovementData_60e13: ; 60e13 db NPC_MOVEMENT_LEFT db $FF -MovementData_60e1b: ; 60e1b +MovementData_60e1b: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN @@ -161,7 +161,7 @@ MovementData_60e1b: ; 60e1b db NPC_MOVEMENT_DOWN db $FF -MovementData_60e22: ; 60e22 +MovementData_60e22: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -169,7 +169,7 @@ MovementData_60e22: ; 60e22 db NPC_MOVEMENT_DOWN db $FF -MovementData_60e28: ; 60e28 +MovementData_60e28: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -179,7 +179,7 @@ MovementData_60e28: ; 60e28 db NPC_MOVEMENT_DOWN db $FF -MovementData_60e30: ; 60e30 +MovementData_60e30: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -188,7 +188,7 @@ MovementData_60e30: ; 60e30 db NPC_MOVEMENT_DOWN db $FF -MovementData_60e37: ; 60e37 +MovementData_60e37: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index 92f37970..cbfb35c8 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -49,7 +49,7 @@ MomHealText2: TX_FAR _MomHealText2 db "@" -RedsHouse1FText2: ; 0x481c6 TV +RedsHouse1FText2: ; TV TX_ASM ld a,[wSpriteStateData1 + 9] cp SPRITE_FACING_UP diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm deleted file mode 100644 index da9a068e..00000000 --- a/scripts/safarizoneentrance-yellow.asm +++ /dev/null @@ -1,255 +0,0 @@ -.xf1f77 - ld hl,.ForJust500Text - call PrintText - ld a,MONEY_BOX - ld [wTextBoxID],a - call DisplayTextBoxID - call YesNoChoice - ld a,[wCurrentMenuItem] - and a - jp nz,.PleaseComeAgain - ld hl,$d346 ; yellow d346 - ld a,[hli] - or [hl] - inc hl - or [hl] - jr nz,.xf1f9f -.xf1f98 - call .xf20ce - jr c,.CantPayWalkDown - jr .xf1ff2 - -.xf1f9f - xor a - ld [hMoney],a - ld a,$05 - ld [hMoney + 1],a - ld a,$00 - ld [hMoney + 2],a - call HasEnoughMoney - jr nc,.success - ld hl,.NotEnoughMoneyText - call PrintText - call .xf2077 - jr c,.CantPayWalkDown - jr .xf1ff2 - -.success - xor a - ld [wPriceTemp],a - ld a,$05 - ld [wPriceTemp + 1],a - ld a,$00 - ld [wPriceTemp + 2],a - ld hl,wPriceTemp + 2 - ld de,wPlayerMoney + 2 - ld c,3 - predef SubBCDPredef - ld a,$b2 - call $3736 - call $373e - ld a,MONEY_BOX - ld [wTextBoxID],a - call DisplayTextBoxID - ld hl,.MakePaymentText - call PrintText - ld a,30 - lb hl, (502 / $100), (502 % $100) -.xf1ff2 - ld [wNumSafariBalls],a - ld a,h - ld [wSafariSteps],a - ld a,l - ld [wSafariSteps + 1],a - ld a,D_UP - ld c,3 - call SafariZoneEntranceAutoWalk - SetEvent EVENT_IN_SAFARI_ZONE - ResetEventReuseHL EVENT_SAFARI_GAME_OVER - ld a,3 - ld [wSafariZoneEntranceCurScript],a - jr .done - -.PleaseComeAgain - ld hl,.PleaseComeAgainText - call PrintText -.CantPayWalkDown - ld a,D_DOWN - ld c,1 - call SafariZoneEntranceAutoWalk - ld a,4 - ld [wSafariZoneEntranceCurScript],a -.done - ret - -.ForJust500Text - TX_FAR SafariZoneEntranceText_9e6e4 - db "@" - -.MakePaymentText - TX_FAR SafariZoneEntranceText_9e747 - db $b - TX_FAR _SafariZoneEntranceText_75360 - db "@" - -.PleaseComeAgainText - TX_FAR _SafariZoneEntranceText_75365 - db "@" - -.NotEnoughMoneyText - TX_FAR _SafariZoneEntranceText_7536a - db "@" - -.SafariZoneEntranceText2 - ld hl,.FirstTimeQuestionText - call PrintText - call YesNoChoice - ld a,[wCurrentMenuItem] - and a - ld hl,.RegularText - jr nz,.Explanation - ld hl,.ExplanationText -.Explanation - call PrintText - ret - -.FirstTimeQuestionText - TX_FAR _SafariZoneEntranceText_753e6 - db "@" - -.ExplanationText - TX_FAR _SafariZoneEntranceText_753eb - db "@" - -.RegularText - TX_FAR _SafariZoneEntranceText_753f0 - db "@" - -SafariZoneEntranceAutoWalk: - push af - ld b,0 - ld a,c - ld [wSimulatedJoypadStatesIndex],a - ld hl,wSimulatedJoypadStatesEnd - pop af - call FillMemory - jp StartSimulatingJoypadStates - -.xf2077 - ld hl,wPlayerMoney - ld de,$ff9f - ld bc,3 - call $b1 ; yellow $00b1 - xor a - ld [$ffa2],a - ld [$ffa3],a - ld a,$17 ; ¥17 per safari ball - ld [$ffa4],a - predef DivideBCDPredef3 - ld a,[$ffa4] - call .xf211e - pop af - ld hl,$d346 - xor a - ld bc,3 - call FillMemory - ld hl,.OhAllRightText - call PrintText_NoCreatingTextBox - ld a,MONEY_BOX - ld a,[$d124] - call DisplayTextBoxID - ld hl,.CantGive30BallsText - call PrintText - pop af - inc a - jr z,.xf20bd - cp 29 - jr c,.xf20bf -.xf20bd - ld a,29 -.xf20bf - ld hl,$1f6 - and a - ret - -.OhAllRightText - TX_FAR _SafariZoneLowCostText1 - db "@" - -.CantGive30BallsText - TX_FAR _SafariZoneLowCostText2 - db "@" - -.xf20ce - ld hl,$d70c - ld a,[hl] - push af - inc [hl] - ld e,a - ld d,0 - ld hl,.lowcosttextpointers - add hl,de - add hl,de - ld a,[hli] - ld h,[hl] - ld l,a - call PrintText - pop af - cp 3 - jr z,.next - scf - ret - -.next - ld hl,.xf20f6 - call $3c46 - ld a,1 - ld hl,$01f6 - and a - ret - -.xf20f6 - TX_FAR _SafariZoneLowCostText3 - db $b - TX_FAR _SafariZoneLowCostText4 - db "@" - -.lowcosttextpointers - dw .xf210a - dw .xf210f - dw .xf2114 - dw .xf2119 - dw .xf2119 - -.xf210a - TX_FAR _SafariZoneLowCostText5 - db "@" - -.xf210f - TX_FAR _SafariZoneLowCostText6 - db "@" - -.xf2114 - TX_FAR _SafariZoneLowCostText7 - db "@" - -.xf2119 - TX_FAR _SafariZoneLowCostText8 - db "@" - -.xf211e - push hl - ld c,a - and $f - ld l,a - ld h,0 - ld a,c - and $f0 - swap a - ld bc,$a - call $3a74 - ld a,l - pop hl - ret - -.xf2133 |