diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:34:05 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:34:05 -0500 |
| commit | 4efb3e307cd6b4bf267ab0d509f8e5ab498f798e (patch) | |
| tree | cd405b6d1ca27c14bfbed4fd3c2fefe91be7ee33 | |
| parent | 5db3bdd6551fad07066b669db1e44a6151aaa0b4 (diff) | |
Sync more with pokered
38 files changed, 88 insertions, 118 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 366c8619..b495552d 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -81,7 +81,7 @@ FIRST_INDOOR_MAP EQU const_value mapconst MT_MOON_B1F, 14, 14 ; $3C mapconst MT_MOON_B2F, 18, 20 ; $3D mapconst CERULEAN_TRASHED_HOUSE, 4, 4 ; $3E - mapconst CERULEAN_TRADE_HOUSE, 4, 4 ; $3F + mapconst CERULEAN_MELANIES_HOUSE, 4, 4 ; $3F mapconst CERULEAN_POKECENTER, 4, 7 ; $40 mapconst CERULEAN_GYM, 7, 5 ; $41 mapconst BIKE_SHOP, 4, 4 ; $42 diff --git a/data/maps/headers/CeruleanMelaniesHouse.asm b/data/maps/headers/CeruleanMelaniesHouse.asm new file mode 100755 index 00000000..7d7d2fd7 --- /dev/null +++ b/data/maps/headers/CeruleanMelaniesHouse.asm @@ -0,0 +1,3 @@ + + map_header CeruleanMelaniesHouse, CERULEAN_MELANIES_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/CeruleanTradeHouse.asm b/data/maps/headers/CeruleanTradeHouse.asm deleted file mode 100755 index 20970b77..00000000 --- a/data/maps/headers/CeruleanTradeHouse.asm +++ /dev/null @@ -1,3 +0,0 @@ - - map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE, 0 - end_map_header diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 74251978..39e8cab4 100755 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -65,7 +65,7 @@ MapHSPointers: dw NoHS dw MtMoonB2FHS dw NoHS - dw CeruleanTradeHouseHS + dw CeruleanMelaniesHouseHS dw NoHS dw NoHS dw NoHS @@ -330,8 +330,8 @@ ViridianGymHS: db VIRIDIAN_GYM, $0B, SHOW Museum1FHS: db MUSEUM_1F, $05, SHOW -CeruleanTradeHouseHS: ; bulbasaur adoption house - db CERULEAN_TRADE_HOUSE, $02, SHOW +CeruleanMelaniesHouseHS: + db CERULEAN_MELANIES_HOUSE, $02, SHOW CeruleanCaveHS: db CERULEAN_CAVE_1F, $01, SHOW db CERULEAN_CAVE_1F, $02, SHOW diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index bbc7e13c..f9a107e3 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -63,7 +63,7 @@ MapHeaderBanks:: db BANK(MtMoonB1F_h) db BANK(MtMoonB2F_h) db BANK(CeruleanTrashedHouse_h) - db BANK(CeruleanTradeHouse_h) + db BANK(CeruleanMelaniesHouse_h) db BANK(CeruleanPokecenter_h) db BANK(CeruleanGym_h) db BANK(BikeShop_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 25a814cf..cf02e5cc 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -63,7 +63,7 @@ MapHeaderPointers:: dw MtMoonB1F_h dw MtMoonB2F_h dw CeruleanTrashedHouse_h - dw CeruleanTradeHouse_h + dw CeruleanMelaniesHouse_h dw CeruleanPokecenter_h dw CeruleanGym_h dw BikeShop_h diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index fae56fc1..2d155e25 100755 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -3,7 +3,7 @@ CeruleanCity_Object: def_warps warp 27, 11, 0, CERULEAN_TRASHED_HOUSE - warp 13, 15, 0, CERULEAN_TRADE_HOUSE + warp 13, 15, 0, CERULEAN_MELANIES_HOUSE warp 19, 17, 0, CERULEAN_POKECENTER warp 30, 19, 0, CERULEAN_GYM warp 13, 25, 0, BIKE_SHOP diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanMelaniesHouse.asm index a52548fe..cbd25533 100755 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanMelaniesHouse.asm @@ -1,4 +1,4 @@ -CeruleanTradeHouse_Object: +CeruleanMelaniesHouse_Object: db $a ; border block def_warps @@ -13,4 +13,4 @@ CeruleanTradeHouse_Object: object SPRITE_ODDISH, 1, 4, STAY, NONE, 3 ; person object SPRITE_SANDSHREW, 5, 3, STAY, LEFT, 4 ; person - def_warps_to CERULEAN_TRADE_HOUSE + def_warps_to CERULEAN_MELANIES_HOUSE diff --git a/data/maps/songs.asm b/data/maps/songs.asm index afafe3b3..4305fc2f 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -62,7 +62,7 @@ MapSongBanks:: db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B1F db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B2F db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRASHED_HOUSE - db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRADE_HOUSE + db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_MELANIES_HOUSE db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_POKECENTER db MUSIC_GYM, BANK(Music_Gym) ; CERULEAN_GYM db MUSIC_CITIES2, BANK(Music_Cities2) ; BIKE_SHOP diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm index a0582416..161ad9fe 100755 --- a/data/sgb/sgb_packets.asm +++ b/data/sgb/sgb_packets.asm @@ -86,9 +86,9 @@ BlkPacket_Slots: BlkPacket_Titlescreen: ATTR_BLK 3 - ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 - ATTR_BLK_DATA %011, 2,2,0, 00,08, 19,17 - ATTR_BLK_DATA %010, 0,0,0, 09,08, 10,08 + ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 ; pokemon logo, version text: pal 0 + ATTR_BLK_DATA %011, 2,2,0, 00,08, 19,17 ; pikachu, copyright text: pal 2 + ATTR_BLK_DATA %010, 0,0,0, 09,08, 10,08 ; pika bubble: pal 0 ds 12, 0 BlkPacket_NidorinoIntro: @@ -111,16 +111,16 @@ BlkPacket_PartyMenu: BlkPacket_TrainerCard: ATTR_BLK 10 - ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 - ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 - ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13 - ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12 - ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,13 - ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,13 - ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16 - ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 - ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 - ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 + ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 ; Boulder Badge + ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 ; Cascade Badge + ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13 ; Thunder Badge + ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12 ; Rainbow Badge + ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,13 ; Rainbow Badge + ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,13 ; Rainbow Badge + ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16 ; Soul Badge + ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 ; Marsh Badge + ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 ; Volcano Badge + ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 ; Earth Badge ds 2, 0 BlkPacket_GameFreakIntro: @@ -181,7 +181,7 @@ DataSnd_728b1: db $E0 ; cpx #$8c (1) DataSnd_728c1: - DATA_SND $847, $0, 11 ; 728c1 (1c:68c1) + DATA_SND $847, $0, 11 db $C4 ; cmp #$c4 (2) db $D0, $16 ; bne +$16 db $A5 ; lda dp @@ -191,7 +191,7 @@ DataSnd_728c1: db $A2, $28 ; ldx #$28 DataSnd_728d1: - DATA_SND $83c, $0, 11 ; 728d1 (1c:68d1) + DATA_SND $83c, $0, 11 db $F0, $12 ; beq +$12 db $A5 ; lda dp db $C9, $C9 ; cmp #$c9 diff --git a/data/text/text_2.asm b/data/text/text_2.asm index f1e5b68d..1616a34e 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -933,7 +933,7 @@ _UseNextMonText:: text "Use next #MON?" done -_Sony1WinText:: +_Rival1WinText:: text "<RIVAL>: Yeah! Am" line "I great or what?" prompt diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm index 9008be86..a3c7a657 100644 --- a/data/trainers/ai_pointers.asm +++ b/data/trainers/ai_pointers.asm @@ -27,7 +27,7 @@ TrainerAIPointers: dbw 3, GenericAI dbw 3, GenericAI dbw 2, BlackbeltAI ; blackbelt - dbw 3, GenericAI + dbw 3, GenericAI ; rival1 dbw 3, GenericAI dbw 1, GenericAI ; chief dbw 3, GenericAI @@ -44,8 +44,8 @@ TrainerAIPointers: dbw 2, BlaineAI ; blaine dbw 1, SabrinaAI ; sabrina dbw 3, GenericAI - dbw 1, Sony2AI ; sony2 - dbw 1, Sony3AI ; sony3 + dbw 1, Rival2AI ; rival2 + dbw 1, Rival3AI ; rival3 dbw 2, LoreleiAI ; lorelei dbw 3, GenericAI dbw 2, AgathaAI ; agatha diff --git a/engine/battle/core.asm b/engine/battle/core.asm index abb1c9b4..01074b74 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1171,22 +1171,22 @@ ChooseNextMon: HandlePlayerBlackOut: ld a, [wLinkState] cp LINK_STATE_BATTLING - jr z, .notSony1Battle + jr z, .notRival1Battle ld a, [wCurOpponent] cp OPP_RIVAL1 - jr nz, .notSony1Battle - hlcoord 0, 0 ; sony 1 battle + jr nz, .notRival1Battle + hlcoord 0, 0 ; rival 1 battle lb bc, 8, 21 call ClearScreenArea call ScrollTrainerPicAfterBattle ld c, 40 call DelayFrames - ld hl, Sony1WinText + ld hl, Rival1WinText call PrintText ld a, [wCurMap] cp OAKS_LAB ret z ; starter battle in oak's lab: don't black out -.notSony1Battle +.notRival1Battle ld b, SET_PAL_BATTLE_BLACK call RunPaletteCommand ld hl, PlayerBlackedOutText2 @@ -1203,8 +1203,8 @@ HandlePlayerBlackOut: scf ret -Sony1WinText: - text_far _Sony1WinText +Rival1WinText: + text_far _Rival1WinText text_end PlayerBlackedOutText2: diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 94e427a1..a2c5e5fb 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -403,7 +403,7 @@ SabrinaAI: ret nc jp AIUseXDefend -Sony2AI: +Rival2AI: cp 13 percent - 1 ret nc ld a, 5 @@ -411,7 +411,7 @@ Sony2AI: ret nc jp AIUsePotion -Sony3AI: +Rival3AI: cp 13 percent - 1 ret nc ld a, 5 diff --git a/home/audio.asm b/home/audio.asm index bf2537a7..aa48985d 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -262,33 +262,35 @@ DetermineAudioFunction:: call BankswitchCommon ; determine the audio function, based on the bank cp BANK(Audio1_PlaySound) - jr nz, .checkForBank08 -; bank 02 (audio 1) + jr nz, .checkForAudio2 +; audio 1 ld a, b call Audio1_PlaySound jr .done -.checkForBank08 +.checkForAudio2 cp BANK(Audio2_PlaySound) - jr nz, .checkForBank1F -; bank 08 (audio 2) + jr nz, .checkForAudio3 +; audio 2 ld a, b call Audio2_PlaySound jr .done -.checkForBank1F +.checkForAudio3 cp BANK(Audio3_PlaySound) - jr nz, .bank20 -; bank 1f (audio 3) + jr nz, .audio4 +; audio 3 ld a, b call Audio3_PlaySound jr .done -.bank20 -; invalid banks will default to XX:6bd4 -; this is seen when encountering Missingno, as its sprite dimensions overflow to wAudioROMBank +.audio4 +; invalid banks will default to audio 4 +; this is seen when encountering Missingno, +; as its sprite dimensions overflow to wAudioROMBank ld a, b call Audio4_PlaySound + .done pop af call BankswitchCommon diff --git a/home/text_script.asm b/home/text_script.asm index fe81cb51..5ef9f9fa 100644 --- a/home/text_script.asm +++ b/home/text_script.asm @@ -200,7 +200,7 @@ DisplayPlayerBlackedOutText:: ld [wNumSafariBalls], a ld [wSafariSteps], a ld [wSafariSteps + 1], a - EventFlagAddressa EVENT_IN_SAFARI_ZONE + EventFlagAddressA EVENT_IN_SAFARI_ZONE ld [wcf0d], a ld [wSafariZoneGateCurScript], a .didnotblackoutinsafari diff --git a/macros/predef.asm b/macros/predef.asm index f4e7f609..d86582d1 100644 --- a/macros/predef.asm +++ b/macros/predef.asm @@ -30,7 +30,3 @@ ENDM db_tx_pre: MACRO db (\1_id - TextPredefs) / 2 + 1 ENDM - -predef_const: MACRO - const \1PredefID -ENDM diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 266ffdd1..72420091 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -62,15 +62,15 @@ event_byte = ((\2) / 8) ENDM -EventFlagAddressa: MACRO +EventFlagAddressA: MACRO event_byte = ((\1) / 8) ld [wEventFlags + event_byte], a - ENDM +ENDM -aEventFlagAddress: MACRO +AEventFlagAddress: MACRO event_byte = ((\1) / 8) ld a, [wEventFlags + event_byte] - ENDM +ENDM ;\1 = event index CheckEventHL: MACRO @@ -156,7 +156,7 @@ event_byte = ((\1) / 8) bit (\1) % 8, [hl] set (\1) % 8, [hl] - ENDM +ENDM CheckAndResetEventReuseHL: MACRO IF event_byte != ((\1) / 8) @@ -166,7 +166,7 @@ event_byte = ((\1) / 8) bit (\1) % 8, [hl] res (\1) % 8, [hl] - ENDM +ENDM ;\1 = event index @@ -519,7 +519,7 @@ event_byte = ((\1) / 8) pop bc ENDC ENDC - ENDM +ENDM ; for handling fixed event bits when events are inserted/removed ;\1 = event index @@ -96,7 +96,7 @@ Route2TradeHouse_Blocks: SaffronPidgeyHouse_Blocks: VermilionPidgeyHouse_Blocks: LavenderCuboneHouse_Blocks: -CeruleanTradeHouse_Blocks: +CeruleanMelaniesHouse_Blocks: PewterNidoranHouse_Blocks: PewterSpeechHouse_Blocks: ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk" @@ -146,9 +146,9 @@ INCLUDE "data/maps/headers/CeruleanTrashedHouse.asm" INCLUDE "scripts/CeruleanTrashedHouse.asm" INCLUDE "data/maps/objects/CeruleanTrashedHouse.asm" -INCLUDE "data/maps/headers/CeruleanTradeHouse.asm" -INCLUDE "scripts/CeruleanTradeHouse.asm" -INCLUDE "data/maps/objects/CeruleanTradeHouse.asm" +INCLUDE "data/maps/headers/CeruleanMelaniesHouse.asm" +INCLUDE "scripts/CeruleanMelaniesHouse.asm" +INCLUDE "data/maps/objects/CeruleanMelaniesHouse.asm" INCLUDE "data/maps/headers/BikeShop.asm" INCLUDE "scripts/BikeShop.asm" diff --git a/maps/green/CeruleanCave1F.blk b/maps/green/CeruleanCave1F.blk deleted file mode 100644 index 689593fd..00000000 --- a/maps/green/CeruleanCave1F.blk +++ /dev/null @@ -1,3 +0,0 @@ -|_vvvv|b Rvvvvvf m,+vvvvv'f v, +|vvtvf , v=vvv f
S - ^ - f+ - $
\ No newline at end of file diff --git a/maps/green/CeruleanCave2F.blk b/maps/green/CeruleanCave2F.blk deleted file mode 100644 index c62864da..00000000 --- a/maps/green/CeruleanCave2F.blk +++ /dev/null @@ -1 +0,0 @@ - (
((
(#(
\ No newline at end of file diff --git a/maps/green/CeruleanCaveB1F.blk b/maps/green/CeruleanCaveB1F.blk deleted file mode 100644 index 8411849f..00000000 --- a/maps/green/CeruleanCaveB1F.blk +++ /dev/null @@ -1 +0,0 @@ -n !"n, - "
L " a vvv "Q - +tv "vf vvNvvvvvvf- - SQvvvvvL
\ No newline at end of file diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm index 9aa957f5..3c5740e9 100755 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm @@ -20,7 +20,6 @@ AgathaShowOrHideExitBlock: jp .setExitBlock .blockExitToNextRoom ld a, $3b - .setExitBlock ld [wNewTileBlockID], a lb bc, 0, 2 diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm index e4345e8e..0c5357d2 100755 --- a/scripts/BikeShop.asm +++ b/scripts/BikeShop.asm @@ -14,7 +14,6 @@ BikeShopText1: ld hl, BikeShopText_1d82f call PrintText jp .Done - .asm_260d4 ld b, BIKE_VOUCHER call IsItemInBag @@ -31,12 +30,10 @@ BikeShopText1: ld hl, BikeShopText_1d824 call PrintText jr .Done - .BagFull ld hl, BikeShopText_1d834 call PrintText jr .Done - .asm_41190 ld hl, BikeShopText_1d810 call PrintText diff --git a/scripts/BrunosRoom.asm b/scripts/BrunosRoom.asm index e5ecc1af..578cbb98 100755 --- a/scripts/BrunosRoom.asm +++ b/scripts/BrunosRoom.asm @@ -20,7 +20,6 @@ BrunoShowOrHideExitBlock: jp .setExitBlock .blockExitToNextRoom ld a, $24 - .setExitBlock ld [wNewTileBlockID], a lb bc, 0, 2 diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm index 0cea70cc..ae1718a0 100755 --- a/scripts/CeladonMansion3F.asm +++ b/scripts/CeladonMansion3F.asm @@ -22,7 +22,7 @@ CeladonMansion3F_TextPointers: ProgrammerText: text_asm call CeladonMansion3_PokedexCount - cp 150 + cp NUM_POKEMON - 1 ; discount Mew ld hl, CeladonMansion3Text_486f5 jr nc, .print ld hl, CeladonMansion3Text_486f0 @@ -41,7 +41,7 @@ CeladonMansion3Text_486f5: GraphicArtistText: text_asm call CeladonMansion3_PokedexCount - cp 150 + cp NUM_POKEMON - 1 ; discount Mew jr nc, .completed ld hl, CeladonMansion3Text_48757 jr .print @@ -103,7 +103,7 @@ CeladonMansion3Text_4876b: WriterText: text_asm call CeladonMansion3_PokedexCount - cp 150 + cp NUM_POKEMON - 1 ; discount Mew ld hl, CeladonMansion3Text_48789 jr nc, .print ld hl, CeladonMansion3Text_48784 @@ -122,7 +122,6 @@ CeladonMansion3Text_48789: DirectorText: text_asm call CeladonMansion3_PokedexCount - ; check pokédex cp NUM_POKEMON - 1 ; discount Mew jr nc, .completed_dex ld hl, .GameDesignerText diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm index 1d39670d..473f5f09 100755 --- a/scripts/CeladonMartRoof.asm +++ b/scripts/CeladonMartRoof.asm @@ -72,7 +72,7 @@ CeladonMartRoofScript_GiveDrinkToGirl: ld hl, wd730 res 6, [hl] call HandleMenuInput - bit BIT_B_BUTTON, a ; pressed b + bit BIT_B_BUTTON, a ret nz ld hl, wFilteredBagItems ld a, [wCurrentMenuItem] diff --git a/scripts/CeruleanTradeHouse.asm b/scripts/CeruleanMelaniesHouse.asm index a6820fdb..ca006506 100755 --- a/scripts/CeruleanTradeHouse.asm +++ b/scripts/CeruleanMelaniesHouse.asm @@ -1,8 +1,8 @@ -CeruleanTradeHouse_Script: +CeruleanMelaniesHouse_Script: call EnableAutoTextBoxDrawing ret -CeruleanTradeHouse_TextPointers: +CeruleanMelaniesHouse_TextPointers: dw CeruleanHouse1Text1 dw CeruleanHouse1Text2 dw CeruleanHouse1Text3 diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index 529b3be2..7c015a64 100755 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -134,7 +134,7 @@ CinnabarGymScript2: cp $ff jp z, CinnabarGymScript_75792 ld a, [wTrainerHeaderFlagBit] - sub 2 + sub $2 ld c, a ld b, FLAG_TEST EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm index 68d2020e..174a1505 100755 --- a/scripts/LancesRoom.asm +++ b/scripts/LancesRoom.asm @@ -18,22 +18,21 @@ LanceShowOrHideEntranceBlocks: ; open entrance ld a, $31 ld b, $32 - jp .LanceSetEntranceBlocks - + jp .setEntranceBlocks .closeEntrance ld a, $72 ld b, $73 -.LanceSetEntranceBlocks +.setEntranceBlocks ; Replaces the tile blocks so the player can't leave. push bc ld [wNewTileBlockID], a lb bc, 6, 2 - call .LanceSetEntranceBlock + call .SetEntranceBlock pop bc ld a, b ld [wNewTileBlockID], a lb bc, 6, 3 -.LanceSetEntranceBlock +.SetEntranceBlock: predef_jump ReplaceTileBlock ResetLanceScript: diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index a02d7d42..b2bed1a4 100755 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -649,4 +649,3 @@ MtMoon3EndBattleText5: MtMoon3AfterBattleText5: text_far _MtMoon3AfterBattleText5 text_end - diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index e8ef4cbe..a369abed 100755 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -201,13 +201,13 @@ OaksLabScript7: OaksLabScript8: ld a, $1 ldh [hSpriteIndexOrTextID], a - ld de, .SonyPushesPlayerAwayFromEeveeBall + ld de, .RivalPushesPlayerAwayFromEeveeBall call MoveSprite ld a, $9 ld [wOaksLabCurScript], a ret -.SonyPushesPlayerAwayFromEeveeBall +.RivalPushesPlayerAwayFromEeveeBall db $00 db $07 db $07 @@ -593,7 +593,7 @@ OaksLabScript20: ld b, 0 ld c, a ld hl, wNPCMovementDirections2 - xor a + xor a ; NPC_MOVEMENT_DOWN call FillMemory ld [hl], $ff call StopAllMusic @@ -641,7 +641,6 @@ OaksLabScript_RemoveParcel: inc hl inc c jr .loop - .foundParcel ld hl, wNumBagItems ld a, c @@ -664,7 +663,6 @@ OaksLabScript_1c8b9: ld a, $30 ld b, 11 jr .asm_1c8f6 - .asm_1c8d3 cp 1 jr nz, .asm_1c8e2 @@ -673,7 +671,6 @@ OaksLabScript_1c8b9: ld a, $30 ld b, 9 jr .asm_1c8f6 - .asm_1c8e2 ld a, $3 ld [wNPCMovementDirections2Index], a @@ -683,7 +680,6 @@ OaksLabScript_1c8b9: jr nz, .asm_1c8f4 ld a, $40 jr .asm_1c8f6 - .asm_1c8f4 ld a, $20 .asm_1c8f6 @@ -817,7 +813,6 @@ OaksLabText3: ld [wDoNotWaitForButtonPressAfterDisplayingText], a predef DisplayDexRating jp .asm_1ca6f - .asm_1c9ec ld b, POKE_BALL call IsItemInBag @@ -840,12 +835,10 @@ OaksLabText3: ld hl, OaksLabText_1ca72 call PrintText jr .asm_1ca6f - .asm_1ca23 ld hl, OaksLabText_1ca77 call PrintText jr .asm_1ca6f - .asm_1ca2b ld b, OAKS_PARCEL call IsItemInBag @@ -853,7 +846,6 @@ OaksLabText3: ld hl, OaksLabText_1ca7c call PrintText jr .asm_1ca6f - .asm_1ca3a ld hl, OaksLabDeliverParcelText call PrintText @@ -861,12 +853,10 @@ OaksLabText3: ld a, $13 ld [wOaksLabCurScript], a jr .asm_1ca6f - .asm_1ca4a ld hl, OaksLabAroundWorldText call PrintText jr .asm_1ca6f - .asm_1ca52 CheckAndSetEvent EVENT_GOT_POKEBALLS_FROM_OAK jr nz, .asm_1ca69 @@ -875,7 +865,6 @@ OaksLabText3: ld hl, OaksLabGivePokeballsText call PrintText jr .asm_1ca6f - .asm_1ca69 ld hl, OaksLabPleaseVisitText call PrintText diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index 28f93411..db2de0d1 100755 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -179,7 +179,7 @@ PalletTownScript6: ld [wSpriteIndex], a xor a ld [wNPCMovementScriptFunctionNum], a - ld a, $1 + ld a, 1 ld [wNPCMovementScriptPointerTableNum], a ldh a, [hLoadedROMBank] ld [wNPCMovementScriptBank], a @@ -191,7 +191,7 @@ PalletTownScript6: PalletTownScript7: ld a, [wNPCMovementScriptPointerTableNum] - and a + and a ; is the movement script over? ret nz ; trigger the next script @@ -201,10 +201,9 @@ PalletTownScript7: PalletTownScript8: CheckEvent EVENT_DAISY_WALKING - jr nz, .asm_18f9e - and $3 ; (EVENT_GOT_TOWN_MAP | EVENT_ENTERED_BLUES_HOUSE) - cp $3 - jr nz, .asm_18f9e + jr nz, .next + CheckBothEventsSet EVENT_GOT_TOWN_MAP, EVENT_ENTERED_BLUES_HOUSE, 1 + jr nz, .next SetEvent EVENT_DAISY_WALKING ld a, HS_DAISY_SITTING ld [wMissableObjectIndex], a @@ -212,8 +211,7 @@ PalletTownScript8: ld a, HS_DAISY_WALKING ld [wMissableObjectIndex], a predef_jump ShowObject - -.asm_18f9e +.next CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK ret z SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index 76a58b71..c8dac1eb 100755 --- a/scripts/PewterGym.asm +++ b/scripts/PewterGym.asm @@ -202,7 +202,6 @@ PewterGymText3: call PrintText .asm_5c512 jp TextScriptEnd - .asm_5c3fa ld hl, PewterGymText_5c41c call PrintText diff --git a/scripts/Route22Gate.asm b/scripts/Route22Gate.asm index adbefe8a..e9dab015 100755 --- a/scripts/Route22Gate.asm +++ b/scripts/Route22Gate.asm @@ -62,7 +62,7 @@ Route22Gate_TextPointers: Route22GateText1: text_asm ld a, [wObtainedBadges] - bit 0, a ; BOULDERBADGE + bit BIT_BOULDERBADGE, a jr nz, .asm_1e6f6 ld hl, Route22GateText_1e704 call PrintText diff --git a/scripts/Route25.asm b/scripts/Route25.asm index 400ac9ed..10f907b2 100755 --- a/scripts/Route25.asm +++ b/scripts/Route25.asm @@ -29,7 +29,6 @@ Route25Script_515e1: ld [wMissableObjectIndex], a predef ShowObject jr .asm_5165c - .asm_51638 CheckEventAfterBranchReuseHL EVENT_GOT_SS_TICKET, EVENT_MET_BILL_2 jr z, .asm_5165c @@ -155,7 +155,7 @@ INCLUDE "text/PewterMart.asm" INCLUDE "text/PewterSpeechHouse.asm" INCLUDE "text/PewterPokecenter.asm" INCLUDE "text/CeruleanTrashedHouse.asm" -INCLUDE "text/CeruleanTradeHouse.asm" +INCLUDE "text/CeruleanMelaniesHouse.asm" INCLUDE "text/CeruleanPokecenter.asm" INCLUDE "text/CeruleanGym.asm" INCLUDE "text/BikeShop.asm" diff --git a/text/CeruleanTradeHouse.asm b/text/CeruleanMelaniesHouse.asm index d50a4ac4..d50a4ac4 100644 --- a/text/CeruleanTradeHouse.asm +++ b/text/CeruleanMelaniesHouse.asm |