diff options
Diffstat (limited to 'engine')
42 files changed, 663 insertions, 665 deletions
diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index aa4755e4f..099598f81 100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm @@ -86,3 +86,5 @@ INCBIN "gfx/diploma/page1.tilemap" DiplomaPage2Tilemap: INCBIN "gfx/diploma/page2.tilemap" + + ret ; unused diff --git a/engine/events/fish.asm b/engine/events/fish.asm index c1dde87d8..df8d80a63 100644 --- a/engine/events/fish.asm +++ b/engine/events/fish.asm @@ -1,7 +1,7 @@ Fish: ; Using a fishing rod. ; Fish for monsters with rod e in encounter group d. -; Return monster e at level d. +; Return monster d at level e. push af push bc @@ -23,7 +23,7 @@ endr .Fish: ; Fish for monsters with rod b from encounter data in FishGroup at hl. -; Return monster e at level d. +; Return monster d at level e. call Random cp [hl] diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 5401f76f9..eba4d998e 100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm @@ -4,7 +4,7 @@ FruitTreeScript:: readmem wCurFruit getitemname STRING_BUFFER_3, USE_SCRIPT_VAR writetext FruitBearingTreeText - buttonsound + promptbutton callasm TryResetFruitTrees callasm CheckFruitTree iffalse .fruit @@ -17,7 +17,7 @@ FruitTreeScript:: readmem wCurFruit giveitem ITEM_FROM_MEM iffalse .packisfull - buttonsound + promptbutton writetext ObtainedFruitText callasm PickedFruitTree specialsound @@ -25,7 +25,7 @@ FruitTreeScript:: sjump .end .packisfull - buttonsound + promptbutton writetext FruitPackIsFullText waitbutton diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 2450e8d02..3b71ee594 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -89,12 +89,12 @@ PrintMagikarpLength: call Magikarp_LoadFeetInchesChars ld hl, wStringBuffer1 ld de, wMagikarpLength - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum ld [hl], "′" inc hl ld de, wMagikarpLength + 1 - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum ld [hl], "″" inc hl diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm index 4889b30aa..3d01c3250 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/misc_scripts_2.asm @@ -22,7 +22,7 @@ HiddenItemScript:: sjump .finish .bag_full - buttonsound + promptbutton writetext .ButNoSpaceText waitbutton diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index 80d055111..9bca9d169 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -164,7 +164,7 @@ GetCaughtLevel: ld [wSeerCaughtLevel], a ld hl, wSeerCaughtLevelString ld de, wSeerCaughtLevel - lb bc, PRINTNUM_RIGHTALIGN | 1, 3 + lb bc, PRINTNUM_LEFTALIGN | 1, 3 call PrintNum ret diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index 7954963e6..1be775a4c 100644 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -70,7 +70,7 @@ Rate: ld bc, ITEM_NAME_LENGTH call ByteFill pop hl - lb bc, PRINTNUM_RIGHTALIGN | 1, 3 + lb bc, PRINTNUM_LEFTALIGN | 1, 3 call PrintNum ret diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 1ca5eb4c9..b7426caec 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -69,33 +69,33 @@ PokecenterNurseScript: checkevent EVENT_WELCOMED_TO_POKECOM_CENTER iftrue .morn_comcenter farwritetext NurseMornText - buttonsound + promptbutton sjump .ok .morn_comcenter farwritetext PokeComNurseMornText - buttonsound + promptbutton sjump .ok .day checkevent EVENT_WELCOMED_TO_POKECOM_CENTER iftrue .day_comcenter farwritetext NurseDayText - buttonsound + promptbutton sjump .ok .day_comcenter farwritetext PokeComNurseDayText - buttonsound + promptbutton sjump .ok .nite checkevent EVENT_WELCOMED_TO_POKECOM_CENTER iftrue .nite_comcenter farwritetext NurseNiteText - buttonsound + promptbutton sjump .ok .nite_comcenter farwritetext PokeComNurseNiteText - buttonsound + promptbutton sjump .ok .ok @@ -326,19 +326,19 @@ BugContestResultsScript: ifequal 2, BugContestResults_SecondPlace ifequal 3, BugContestResults_ThirdPlace farwritetext ContestResults_ConsolationPrizeText - buttonsound + promptbutton waitsfx verbosegiveitem BERRY iffalse BugContestResults_NoRoomForBerry BugContestResults_DidNotWin: farwritetext ContestResults_DidNotWinText - buttonsound + promptbutton sjump BugContestResults_FinishUp BugContestResults_ReturnAfterWinnersPrize: farwritetext ContestResults_JoinUsNextTimeText - buttonsound + promptbutton BugContestResults_FinishUp: checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER @@ -408,25 +408,25 @@ BugContestResults_ThirdPlace: BugContestResults_NoRoomForSunStone: farwritetext BugContestPrizeNoRoomText - buttonsound + promptbutton setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE sjump BugContestResults_ReturnAfterWinnersPrize BugContestResults_NoRoomForEverstone: farwritetext BugContestPrizeNoRoomText - buttonsound + promptbutton setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE sjump BugContestResults_ReturnAfterWinnersPrize BugContestResults_NoRoomForGoldBerry: farwritetext BugContestPrizeNoRoomText - buttonsound + promptbutton setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY sjump BugContestResults_ReturnAfterWinnersPrize BugContestResults_NoRoomForBerry: farwritetext BugContestPrizeNoRoomText - buttonsound + promptbutton setevent EVENT_CONTEST_OFFICER_HAS_BERRY sjump BugContestResults_DidNotWin @@ -786,7 +786,7 @@ RegisteredNumberMScript: farwritetext RegisteredNumber1Text playsound SFX_REGISTER_PHONE_NUMBER waitsfx - buttonsound + promptbutton end NumberAcceptedMScript: @@ -1279,31 +1279,31 @@ GiftMScript: .Jose: farwritetext JoseGiftText - buttonsound + promptbutton end .Wade: farwritetext WadeGiftText - buttonsound + promptbutton end .Alan: farwritetext AlanGiftText - buttonsound + promptbutton end .Derek: farwritetext DerekGiftText - buttonsound + promptbutton end .Tully: farwritetext TullyGiftText - buttonsound + promptbutton end .Wilton: farwritetext WiltonGiftText - buttonsound + promptbutton end .Kenji: farwritetext KenjiGiftText - buttonsound + promptbutton end PackFullMScript: @@ -1386,19 +1386,19 @@ RematchGiftMScript: .Huey: farwritetext HueyRematchGiftText - buttonsound + promptbutton end .Joey: farwritetext JoeyRematchGiftText - buttonsound + promptbutton end .Vance: farwritetext VanceRematchGiftText - buttonsound + promptbutton end .Parry: farwritetext ParryRematchGiftText - buttonsound + promptbutton end AskNumber1FScript: @@ -1477,7 +1477,7 @@ RegisteredNumberFScript: farwritetext RegisteredNumber2Text playsound SFX_REGISTER_PHONE_NUMBER waitsfx - buttonsound + promptbutton end NumberAcceptedFScript: @@ -1691,19 +1691,19 @@ GiftFScript: .Beverly: farwritetext BeverlyGiftText - buttonsound + promptbutton end .Gina: farwritetext GinaGiftText - buttonsound + promptbutton end .Dana: farwritetext DanaGiftText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyGiftText - buttonsound + promptbutton end PackFullFScript: @@ -1747,7 +1747,7 @@ RematchGiftFScript: .Erin: opentext farwritetext ErinRematchGiftText - buttonsound + promptbutton end GymStatue1Script: @@ -1762,7 +1762,7 @@ GymStatue2Script: getcurlandmarkname STRING_BUFFER_3 opentext farwritetext GymStatue_CityGymText - buttonsound + promptbutton farwritetext GymStatue_WinningTrainersText waitbutton closetext @@ -1786,7 +1786,7 @@ GameCornerCoinVendorScript: faceplayer opentext farwritetext CoinVendor_WelcomeText - buttonsound + promptbutton checkitem COIN_CASE iftrue CoinVendor_IntroScript farwritetext CoinVendor_NoCoinCaseText diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index ec500e85f..2426eba78 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1075,21 +1075,21 @@ SGBBorder_MorePalPushing: ld a, $e4 ldh [rBGP], a ld de, vTiles1 - ld bc, 20 tiles + ld bc, (6 + SCREEN_WIDTH + 6) * 5 * 2 call CopyData - ld b, 18 + ld b, SCREEN_HEIGHT .loop push bc - ld bc, $c + ld bc, 6 * 2 call CopyData - ld bc, $28 + ld bc, SCREEN_WIDTH * 2 call ClearBytes - ld bc, $c + ld bc, 6 * 2 call CopyData pop bc dec b jr nz, .loop - ld bc, $140 + ld bc, (6 + SCREEN_WIDTH + 6) * 5 * 2 call CopyData ld bc, $100 call ClearBytes @@ -1195,6 +1195,7 @@ SGBBorderMap: INCBIN "gfx/sgb/sgb_border.bin" SGBBorderPalettes: +; assumed to come after SGBBorderMap INCLUDE "gfx/sgb/sgb_border.pal" SGBBorder: diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 1ff7aab21..736f00cdb 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -371,7 +371,7 @@ TMHM_DisplayPocketItems: ld [hl], "H" inc hl ld de, wTempTMHM - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum pop af ld [wTempTMHM], a diff --git a/engine/link/link.asm b/engine/link/link.asm index d12f6bdd8..0ddff205f 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -371,13 +371,13 @@ Gen2ToGen2LinkComms: jr z, .next sub $3 jr nc, .skip - farcall DeutenEnglischenPost + farcall ConvertEnglishMailToFrenchGerman jr .next .skip cp $2 jr nc, .next - farcall HandleSpanishItalianMail + farcall ConvertEnglishMailToSpanishItalian .next pop de @@ -875,13 +875,13 @@ Link_PrepPartyData_Gen2: jr z, .next sub $3 jr nc, .italian_spanish - farcall HandleFrenchGermanMail + farcall ConvertFrenchGermanMailToEnglish jr .next .italian_spanish cp $2 jr nc, .next - farcall HandleSpanishItalianMail + farcall ConvertSpanishItalianMailToEnglish .next pop de diff --git a/engine/math/print_num.asm b/engine/math/print_num.asm index 62ef97fb3..409379257 100644 --- a/engine/math/print_num.asm +++ b/engine/math/print_num.asm @@ -6,7 +6,7 @@ _PrintNum:: ; digits will be in front of the decimal point. ; Some extra flags can be given in bits 5-7 of b. ; Bit 5: money if set (unless left-aligned without leading zeros) -; Bit 6: right-aligned if set +; Bit 6: left-aligned if set ; Bit 7: print leading zeros if set push bc diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 0a398d259..67a93c74f 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -161,7 +161,7 @@ StartMenu_PrintBugContestStatus: call PlaceString hlcoord 8, 5 ld de, wParkBallsRemaining - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum hlcoord 1, 1 ld de, .CAUGHT @@ -187,7 +187,7 @@ StartMenu_PrintBugContestStatus: ld l, c inc hl ld c, 3 - call Print8BitNumRightAlign + call Print8BitNumLeftAlign .skip_level pop af diff --git a/engine/movie/crystal_intro.asm b/engine/movie/crystal_intro.asm index 5c4f38151..29808c86b 100644 --- a/engine/movie/crystal_intro.asm +++ b/engine/movie/crystal_intro.asm @@ -445,7 +445,7 @@ IntroScene1: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap001 + ld hl, IntroUnownAAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -456,18 +456,18 @@ IntroScene1: ld hl, IntroPulseGFX ld de, vTiles0 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap002 + ld hl, IntroUnownATilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -521,7 +521,7 @@ IntroScene3: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap003 + ld hl, IntroBackgroundAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -529,18 +529,18 @@ IntroScene3: ld hl, IntroBackgroundGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap004 + ld hl, IntroBackgroundTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -584,7 +584,7 @@ IntroScene5: ldh [hLCDCPointer], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap005 + ld hl, IntroUnownHIAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -595,18 +595,18 @@ IntroScene5: ld hl, IntroPulseGFX ld de, vTiles0 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap006 + ld hl, IntroUnownHITilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -682,7 +682,7 @@ IntroScene7: ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap003 + ld hl, IntroBackgroundAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles @@ -700,7 +700,7 @@ IntroScene7: ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap004 + ld hl, IntroBackgroundTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles @@ -709,12 +709,12 @@ IntroScene7: ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -852,7 +852,7 @@ IntroScene11: ldh [hLCDCPointer], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap007 + ld hl, IntroUnownsAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -860,18 +860,18 @@ IntroScene11: ld hl, IntroUnownsGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap008 + ld hl, IntroUnownsTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -975,7 +975,7 @@ IntroScene13: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap003 + ld hl, IntroBackgroundAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -986,18 +986,18 @@ IntroScene13: ld hl, IntroBackgroundGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap004 + ld hl, IntroBackgroundTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1079,7 +1079,7 @@ IntroScene15: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap009 + ld hl, IntroSuicuneJumpAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1094,7 +1094,7 @@ IntroScene15: ld hl, vTiles1 tile $00 lb bc, BANK(IntroGrass4GFX), 1 call Request2bpp - ld hl, IntroTilemap010 + ld hl, IntroSuicuneJumpTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles call Intro_LoadTilemap @@ -1102,11 +1102,11 @@ IntroScene15: push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1161,7 +1161,7 @@ IntroScene17: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap011 + ld hl, IntroSuicuneCloseAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1169,18 +1169,18 @@ IntroScene17: ld hl, IntroSuicuneCloseGFX ld de, vTiles1 tile $00 call Intro_DecompressRequest2bpp_255Tiles - ld hl, IntroTilemap012 + ld hl, IntroSuicuneCloseTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette4 + ld hl, IntroSuicuneClosePalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette4 + ld hl, IntroSuicuneClosePalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1227,7 +1227,7 @@ IntroScene19: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap013 + ld hl, IntroSuicuneBackAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1242,7 +1242,7 @@ IntroScene19: ld hl, vTiles1 tile $7f lb bc, BANK(IntroGrass4GFX), 1 call Request2bpp - ld hl, IntroTilemap014 + ld hl, IntroSuicuneBackTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles call Intro_LoadTilemap @@ -1250,11 +1250,11 @@ IntroScene19: push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1404,7 +1404,7 @@ IntroScene26: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap015 + ld hl, IntroCrystalUnownsAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1412,18 +1412,18 @@ IntroScene26: ld hl, IntroCrystalUnownsGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap017 + ld hl, IntroCrystalUnownsTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette3 + ld hl, IntroCrystalUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette3 + ld hl, IntroCrystalUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -2038,14 +2038,14 @@ INCBIN "gfx/intro/pichu_wooper.2bpp.lz" IntroBackgroundGFX: INCBIN "gfx/intro/background.2bpp.lz" -IntroTilemap004: -INCBIN "gfx/intro/004.tilemap.lz" +IntroBackgroundTilemap: +INCBIN "gfx/intro/background.tilemap.lz" -IntroTilemap003: -INCBIN "gfx/intro/003.tilemap.lz" +IntroBackgroundAttrmap: +INCBIN "gfx/intro/background.attrmap.lz" -IntroPalette1: -INCLUDE "gfx/intro/intro_1.pal" +IntroBackgroundPalette: +INCLUDE "gfx/intro/background.pal" IntroUnownsGFX: INCBIN "gfx/intro/unowns.2bpp.lz" @@ -2053,50 +2053,50 @@ INCBIN "gfx/intro/unowns.2bpp.lz" IntroPulseGFX: INCBIN "gfx/intro/pulse.2bpp.lz" -IntroTilemap002: -INCBIN "gfx/intro/002.tilemap.lz" +IntroUnownATilemap: +INCBIN "gfx/intro/unown_a.tilemap.lz" -IntroTilemap001: -INCBIN "gfx/intro/001.tilemap.lz" +IntroUnownAAttrmap: +INCBIN "gfx/intro/unown_a.attrmap.lz" -IntroTilemap006: -INCBIN "gfx/intro/006.tilemap.lz" +IntroUnownHITilemap: +INCBIN "gfx/intro/unown_hi.tilemap.lz" -IntroTilemap005: -INCBIN "gfx/intro/005.tilemap.lz" +IntroUnownHIAttrmap: +INCBIN "gfx/intro/unown_hi.attrmap.lz" -IntroTilemap008: -INCBIN "gfx/intro/008.tilemap.lz" +IntroUnownsTilemap: +INCBIN "gfx/intro/unowns.tilemap.lz" -IntroTilemap007: -INCBIN "gfx/intro/007.tilemap.lz" +IntroUnownsAttrmap: +INCBIN "gfx/intro/unowns.attrmap.lz" -IntroPalette2: -INCLUDE "gfx/intro/intro_2.pal" +IntroUnownsPalette: +INCLUDE "gfx/intro/unowns.pal" IntroCrystalUnownsGFX: INCBIN "gfx/intro/crystal_unowns.2bpp.lz" -IntroTilemap017: -INCBIN "gfx/intro/017.tilemap.lz" +IntroCrystalUnownsTilemap: +INCBIN "gfx/intro/crystal_unowns.tilemap.lz" -IntroTilemap015: -INCBIN "gfx/intro/015.tilemap.lz" +IntroCrystalUnownsAttrmap: +INCBIN "gfx/intro/crystal_unowns.attrmap.lz" -IntroPalette3: -INCLUDE "gfx/intro/intro_3.pal" +IntroCrystalUnownsPalette: +INCLUDE "gfx/intro/crystal_unowns.pal" IntroSuicuneCloseGFX: INCBIN "gfx/intro/suicune_close.2bpp.lz" -IntroTilemap012: -INCBIN "gfx/intro/012.tilemap.lz" +IntroSuicuneCloseTilemap: +INCBIN "gfx/intro/suicune_close.tilemap.lz" -IntroTilemap011: -INCBIN "gfx/intro/011.tilemap.lz" +IntroSuicuneCloseAttrmap: +INCBIN "gfx/intro/suicune_close.attrmap.lz" -IntroPalette4: -INCLUDE "gfx/intro/intro_4.pal" +IntroSuicuneClosePalette: +INCLUDE "gfx/intro/suicune_close.pal" IntroSuicuneJumpGFX: INCBIN "gfx/intro/suicune_jump.2bpp.lz" @@ -2104,20 +2104,20 @@ INCBIN "gfx/intro/suicune_jump.2bpp.lz" IntroSuicuneBackGFX: INCBIN "gfx/intro/suicune_back.2bpp.lz" -IntroTilemap010: -INCBIN "gfx/intro/010.tilemap.lz" +IntroSuicuneJumpTilemap: +INCBIN "gfx/intro/suicune_jump.tilemap.lz" -IntroTilemap009: -INCBIN "gfx/intro/009.tilemap.lz" +IntroSuicuneJumpAttrmap: +INCBIN "gfx/intro/suicune_jump.attrmap.lz" -IntroTilemap014: -INCBIN "gfx/intro/014.tilemap.lz" +IntroSuicuneBackTilemap: +INCBIN "gfx/intro/suicune_back.tilemap.lz" -IntroTilemap013: -INCBIN "gfx/intro/013.tilemap.lz" +IntroSuicuneBackAttrmap: +INCBIN "gfx/intro/suicune_back.attrmap.lz" -IntroPalette5: -INCLUDE "gfx/intro/intro_5.pal" +IntroSuicunePalette: +INCLUDE "gfx/intro/suicune.pal" IntroUnownBackGFX: INCBIN "gfx/intro/unown_back.2bpp.lz" diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index 178a889a3..d4c6ec0bf 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -759,40 +759,41 @@ PlayerMovement: ret .pointers - dw .zero - dw .one - dw .two - dw .three - dw .four - dw .five - dw .six - dw .seven - -.zero -.four +; entries correspond to PLAYERMOVEMENT_* constants + dw .normal + dw .warp + dw .turn + dw .force_turn + dw .finish + dw .continue + dw .exit_water + dw .jump + +.normal: +.finish: xor a ld c, a ret -.seven +.jump: call ret_968d7 ; mobile xor a ld c, a ret -.one - ld a, 5 +.warp: + ld a, PLAYEREVENT_WARP ld c, a scf ret -.two - ld a, 9 +.turn: + ld a, PLAYEREVENT_JOYCHANGEFACING ld c, a scf ret -.three +.force_turn: ; force the player to move in some direction ld a, BANK(Script_ForcedMovement) ld hl, Script_ForcedMovement @@ -802,8 +803,8 @@ PlayerMovement: scf ret -.five -.six +.continue: +.exit_water: ld a, -1 ld c, a and a @@ -923,13 +924,13 @@ CountStep: ret .hatch - ld a, 8 + ld a, PLAYEREVENT_HATCH scf ret ; unused .unreferenced - ld a, 7 + ld a, PLAYEREVENT_WHITEOUT scf ret @@ -1626,7 +1627,7 @@ CmdQueue_StoneTable: jr c, .fall_down_hole .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, de ld d, h ld e, l diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 6a1c1a22b..16562213b 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -10,7 +10,7 @@ DeleteMapObject:: push af ld h, b ld l, c - ld bc, OBJECT_STRUCT_LENGTH + ld bc, OBJECT_LENGTH xor a call ByteFill pop af @@ -2082,11 +2082,11 @@ DespawnEmote: jr z, .next push bc xor a - ld bc, OBJECT_STRUCT_LENGTH + ld bc, OBJECT_LENGTH call ByteFill pop bc .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, de ld d, h ld e, l @@ -2149,7 +2149,7 @@ Function55e0:: jr z, .ok call Function565c .ok - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2205,7 +2205,7 @@ Function5645: .loop ldh [hMapObjectIndexBuffer], a call SetFacing_Standing - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2421,7 +2421,7 @@ HandleNPCStep:: jr z, .next call Function437b .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2582,7 +2582,7 @@ Function587a: add hl, bc set OBJ_FLAGS2_5, [hl] .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2625,7 +2625,7 @@ Function58b9:: add hl, bc res OBJ_FLAGS2_5, [hl] .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2750,7 +2750,7 @@ ApplyBGMapAnchorToObjects: add e ld [hl], a .skip - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2809,7 +2809,7 @@ InitSprites: jr .add .skip - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2817,7 +2817,7 @@ InitSprites: jr .next .add - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/map_objects_2.asm b/engine/overworld/map_objects_2.asm index f055e0fd9..d89d95fc0 100644 --- a/engine/overworld/map_objects_2.asm +++ b/engine/overworld/map_objects_2.asm @@ -19,7 +19,7 @@ LoadObjectMasks: ld [de], a inc de pop bc - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index d249d2fd4..f4c730247 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -369,7 +369,7 @@ IsNPCAtCoord: jr nz, .setcarry .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -523,7 +523,7 @@ Unreferenced_Function7113: jr .yes .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm index e47645f2c..814f608f7 100644 --- a/engine/overworld/overworld.asm +++ b/engine/overworld/overworld.asm @@ -109,7 +109,7 @@ AddIndoorSprites: push af ld a, [hl] call AddSpriteGFX - ld de, OBJECT_LENGTH + ld de, MAPOBJECT_LENGTH add hl, de pop af inc a diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 09d6b47de..9f372640b 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -120,7 +120,7 @@ DoPlayerMovement:: ld c, a call CheckWhirlpoolTile jr c, .not_whirlpool - ld a, 3 + ld a, PLAYERMOVEMENT_FORCE_TURN scf ret @@ -222,7 +222,7 @@ DoPlayerMovement:: .continue_walk ld a, STEP_WALK call .DoStep - ld a, 5 + ld a, PLAYERMOVEMENT_CONTINUE scf ret @@ -247,7 +247,7 @@ DoPlayerMovement:: ld a, STEP_TURN call .DoStep - ld a, 2 + ld a, PLAYERMOVEMENT_TURN scf ret @@ -345,7 +345,7 @@ DoPlayerMovement:: call PlayMapMusic ld a, STEP_WALK call .DoStep - ld a, 6 + ld a, PLAYERMOVEMENT_EXIT_WATER scf ret @@ -374,7 +374,7 @@ DoPlayerMovement:: call PlaySFX ld a, STEP_LEDGE call .DoStep - ld a, 7 + ld a, PLAYERMOVEMENT_JUMP scf ret @@ -428,11 +428,11 @@ DoPlayerMovement:: call .StandInPlace scf - ld a, 1 + ld a, PLAYERMOVEMENT_WARP ret .not_warp - xor a + xor a ; PLAYERMOVEMENT_NORMAL ret .EdgeWarps: @@ -465,7 +465,7 @@ DoPlayerMovement:: ld a, [hl] ld [wPlayerTurningDirection], a - ld a, 4 + ld a, PLAYERMOVEMENT_FINISH ret .Steps: diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 9f1b13dd9..478c8f6c6 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -132,9 +132,9 @@ CopyObjectStruct:: and a ret nz ; masked - ld hl, wObjectStructs + OBJECT_STRUCT_LENGTH * 1 + ld hl, wObjectStructs + OBJECT_LENGTH * 1 ld a, 1 - ld de, OBJECT_STRUCT_LENGTH + ld de, OBJECT_LENGTH .loop ldh [hObjectStructIndexBuffer], a ld a, [hl] @@ -224,7 +224,7 @@ CopyMapObjectToObjectStruct: ret InitializeVisibleSprites: - ld bc, wMapObjects + OBJECT_LENGTH + ld bc, wMapObjects + MAPOBJECT_LENGTH ld a, 1 .loop ldh [hMapObjectIndexBuffer], a @@ -271,7 +271,7 @@ InitializeVisibleSprites: jp c, .ret .next - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -311,7 +311,7 @@ CheckObjectEnteringVisibleRange:: ld d, a ld a, [wXCoord] ld e, a - ld bc, wMapObjects + OBJECT_LENGTH + ld bc, wMapObjects + MAPOBJECT_LENGTH ld a, 1 .loop_v ldh [hMapObjectIndexBuffer], a @@ -345,7 +345,7 @@ CheckObjectEnteringVisibleRange:: pop de .next_v - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -367,7 +367,7 @@ CheckObjectEnteringVisibleRange:: ld e, a ld a, [wYCoord] ld d, a - ld bc, wMapObjects + OBJECT_LENGTH + ld bc, wMapObjects + MAPOBJECT_LENGTH ld a, 1 .loop_h ldh [hMapObjectIndexBuffer], a @@ -401,7 +401,7 @@ CheckObjectEnteringVisibleRange:: pop de .next_h - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 128439205..245d8e763 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -148,7 +148,7 @@ ScriptCommandTable: dw Script_farjumptext ; 52 dw Script_jumptext ; 53 dw Script_waitbutton ; 54 - dw Script_buttonsound ; 55 + dw Script_promptbutton ; 55 dw Script_pokepic ; 56 dw Script_closepokepic ; 57 dw Script__2dmenu ; 58 @@ -398,7 +398,7 @@ Script_waitbutton: jp WaitButton -Script_buttonsound: +Script_promptbutton: ; script command 0x55 ldh a, [hOAMUpdate] @@ -406,7 +406,7 @@ Script_buttonsound: ld a, $1 ldh [hOAMUpdate], a call WaitBGMap - call ButtonSound + call PromptButton pop af ldh [hOAMUpdate], a ret @@ -525,7 +525,7 @@ GiveItemScript: end .Full: - buttonsound + promptbutton pocketisfull end @@ -1952,7 +1952,7 @@ Script_getmoney: call ResetStringBuffer1 call GetMoneyAccount ld hl, wStringBuffer1 - lb bc, PRINTNUM_RIGHTALIGN | 3, 6 + lb bc, PRINTNUM_LEFTALIGN | 3, 6 call PrintNum ld de, wStringBuffer1 jp GetStringBuffer @@ -1964,7 +1964,7 @@ Script_getcoins: call ResetStringBuffer1 ld hl, wStringBuffer1 ld de, wCoins - lb bc, PRINTNUM_RIGHTALIGN | 2, 6 + lb bc, PRINTNUM_LEFTALIGN | 2, 6 call PrintNum ld de, wStringBuffer1 jp GetStringBuffer @@ -1976,7 +1976,7 @@ Script_getnum: call ResetStringBuffer1 ld de, wScriptVar ld hl, wStringBuffer1 - lb bc, PRINTNUM_RIGHTALIGN | 1, 3 + lb bc, PRINTNUM_LEFTALIGN | 1, 3 call PrintNum ld de, wStringBuffer1 jp GetStringBuffer diff --git a/engine/phone/scripts/bill.asm b/engine/phone/scripts/bill.asm index ccc74dd73..96e2f406d 100644 --- a/engine/phone/scripts/bill.asm +++ b/engine/phone/scripts/bill.asm @@ -4,22 +4,22 @@ BillPhoneCalleeScript: checktime NITE iftrue .nitegreet farwritetext BillPhoneMornGreetingText - buttonsound + promptbutton sjump .main .daygreet farwritetext BillPhoneDayGreetingText - buttonsound + promptbutton sjump .main .nitegreet farwritetext BillPhoneNiteGreetingText - buttonsound + promptbutton sjump .main .main farwritetext BillPhoneGenericText - buttonsound + promptbutton readvar VAR_BOXSPACE getnum STRING_BUFFER_3 ifequal 0, .full diff --git a/engine/phone/scripts/brent_gossip.asm b/engine/phone/scripts/brent_gossip.asm index 3c92d420a..76fb1c156 100644 --- a/engine/phone/scripts/brent_gossip.asm +++ b/engine/phone/scripts/brent_gossip.asm @@ -13,50 +13,50 @@ BrentBillTriviaScript: .Father: farwritetext BrentFatherGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Grandpa: farwritetext BrentGrandpaGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Goldenrod: farwritetext BrentGoldenrodGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Route25: farwritetext BrentRoute25GossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Abra: farwritetext BrentAbraGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Sister: farwritetext BrentSisterGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Milk: farwritetext BrentMilkGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Battling: farwritetext BrentBattlingGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .FlowerShop: farwritetext BrentFlowerShopGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .KimonoGirl: farwritetext BrentKimonoGirlGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/buena.asm b/engine/phone/scripts/buena.asm index edfe5c0a7..02a6c0a97 100644 --- a/engine/phone/scripts/buena.asm +++ b/engine/phone/scripts/buena.asm @@ -18,17 +18,17 @@ BuenaPhoneScript_CheckTimeOfDayCallee: checktime DAY iftrue .day writetext BuenaPhoneNiteAnswerText - buttonsound + promptbutton end .morn writetext BuenaPhoneMorningAnswerText - buttonsound + promptbutton end .day writetext BuenaPhoneDayAnswerText - buttonsound + promptbutton end BuenaPhoneScript_AfterMidnightCallee: @@ -43,22 +43,22 @@ BuenaPhoneScript_CheckTimeOfDayCaller: checktime DAY iftrue .day writetext BuenaPhoneNiteText - buttonsound + promptbutton end .morn writetext BuenaPhoneMorningText - buttonsound + promptbutton end .day writetext BuenaPhoneDayText - buttonsound + promptbutton end BuenaPhoneScript_AfterMidnightCaller: writetext BuenaPhoneMidnightText - buttonsound + promptbutton end BuenaPhoneScript_Rocket: diff --git a/engine/phone/scripts/chad_gossip.asm b/engine/phone/scripts/chad_gossip.asm index 544c25b21..58192232c 100644 --- a/engine/phone/scripts/chad_gossip.asm +++ b/engine/phone/scripts/chad_gossip.asm @@ -13,50 +13,50 @@ ChadOakGossipScript: .Blue: farwritetext ChadBlueGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Daisy: farwritetext ChadDaisyGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .ProfElm: farwritetext ChadProfElmGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Dream: farwritetext ChadProfOaksDreamGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Kurt: farwritetext ChadKurtGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .League: farwritetext ChadLeagueGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .RadioShow: farwritetext ChadPokemonTalkGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Battling: farwritetext ChadProfOakTrainerGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .DaisyTea: farwritetext ChadDaisyTeaGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Traveled: farwritetext ChadProfOakTravelingGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/generic_callee.asm b/engine/phone/scripts/generic_callee.asm index 76d26f922..f8a5f7394 100644 --- a/engine/phone/scripts/generic_callee.asm +++ b/engine/phone/scripts/generic_callee.asm @@ -47,102 +47,102 @@ PhoneScript_AnswerPhone_Male: .Jack: farwritetext JackAnswerPhoneText - buttonsound + promptbutton end .Huey: farwritetext HueyAnswerPhoneText - buttonsound + promptbutton end .Gaven: farwritetext GavenAnswerPhoneText - buttonsound + promptbutton end .Jose: farwritetext JoseAnswerPhoneText - buttonsound + promptbutton end .Joey: farwritetext JoeyAnswerPhoneText - buttonsound + promptbutton end .Wade: farwritetext WadeAnswerPhoneText - buttonsound + promptbutton end .Ralph: farwritetext RalphAnswerPhoneText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyAnswerPhoneText - buttonsound + promptbutton end .Todd: farwritetext ToddAnswerPhoneText - buttonsound + promptbutton end .Irwin: farwritetext IrwinAnswerPhoneText - buttonsound + promptbutton end .Arnie: farwritetext ArnieAnswerPhoneText - buttonsound + promptbutton end .Alan: farwritetext AlanAnswerPhoneText - buttonsound + promptbutton end .Chad: farwritetext ChadAnswerPhoneText - buttonsound + promptbutton end .Derek: farwritetext DerekAnswerPhoneText - buttonsound + promptbutton end .Tully: farwritetext TullyAnswerPhoneText - buttonsound + promptbutton end .Brent: farwritetext BrentAnswerPhoneText - buttonsound + promptbutton end .Vance: farwritetext VanceAnswerPhoneText - buttonsound + promptbutton end .Wilton: farwritetext WiltonAnswerPhoneText - buttonsound + promptbutton end .Kenji: farwritetext KenjiAnswerPhoneText - buttonsound + promptbutton end .Parry: farwritetext ParryAnswerPhoneText - buttonsound + promptbutton end PhoneScript_AnswerPhone_Male_Day: @@ -170,102 +170,102 @@ PhoneScript_AnswerPhone_Male_Day: .Jack: farwritetext JackAnswerPhoneDayText - buttonsound + promptbutton end .Huey: farwritetext HueyAnswerPhoneDayText - buttonsound + promptbutton end .Gaven: farwritetext GavenAnswerPhoneDayText - buttonsound + promptbutton end .Jose: farwritetext JoseAnswerPhoneDayText - buttonsound + promptbutton end .Joey: farwritetext JoeyAnswerPhoneDayText - buttonsound + promptbutton end .Wade: farwritetext WadeAnswerPhoneDayText - buttonsound + promptbutton end .Ralph: farwritetext RalphAnswerPhoneDayText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyAnswerPhoneDayText - buttonsound + promptbutton end .Todd: farwritetext ToddAnswerPhoneDayText - buttonsound + promptbutton end .Irwin: farwritetext IrwinAnswerPhoneDayText - buttonsound + promptbutton end .Arnie: farwritetext ArnieAnswerPhoneDayText - buttonsound + promptbutton end .Alan: farwritetext AlanAnswerPhoneDayText - buttonsound + promptbutton end .Chad: farwritetext ChadAnswerPhoneDayText - buttonsound + promptbutton end .Derek: farwritetext DerekAnswerPhoneDayText - buttonsound + promptbutton end .Tully: farwritetext TullyAnswerPhoneDayText - buttonsound + promptbutton end .Brent: farwritetext BrentAnswerPhoneDayText - buttonsound + promptbutton end .Vance: farwritetext VanceAnswerPhoneDayText - buttonsound + promptbutton end .Wilton: farwritetext WiltonAnswerPhoneDayText - buttonsound + promptbutton end .Kenji: farwritetext KenjiAnswerPhoneDayText - buttonsound + promptbutton end .Parry: farwritetext ParryAnswerPhoneDayText - buttonsound + promptbutton end PhoneScript_AnswerPhone_Male_Nite: @@ -293,102 +293,102 @@ PhoneScript_AnswerPhone_Male_Nite: .Jack: farwritetext JackAnswerPhoneNiteText - buttonsound + promptbutton end .Huey: farwritetext HueyAnswerPhoneNiteText - buttonsound + promptbutton end .Gaven: farwritetext GavenAnswerPhoneNiteText - buttonsound + promptbutton end .Jose: farwritetext JoseAnswerPhoneNiteText - buttonsound + promptbutton end .Joey: farwritetext JoeyAnswerPhoneNiteText - buttonsound + promptbutton end .Wade: farwritetext WadeAnswerPhoneNiteText - buttonsound + promptbutton end .Ralph: farwritetext RalphAnswerPhoneNiteText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyAnswerPhoneNiteText - buttonsound + promptbutton end .Todd: farwritetext ToddAnswerPhoneNiteText - buttonsound + promptbutton end .Irwin: farwritetext IrwinAnswerPhoneNiteText - buttonsound + promptbutton end .Arnie: farwritetext ArnieAnswerPhoneNiteText - buttonsound + promptbutton end .Alan: farwritetext AlanAnswerPhoneNiteText - buttonsound + promptbutton end .Chad: farwritetext ChadAnswerPhoneNiteText - buttonsound + promptbutton end .Derek: farwritetext DerekAnswerPhoneNiteText - buttonsound + promptbutton end .Tully: farwritetext TullyAnswerPhoneNiteText - buttonsound + promptbutton end .Brent: farwritetext BrentAnswerPhoneNiteText - buttonsound + promptbutton end .Vance: farwritetext VanceAnswerPhoneNiteText - buttonsound + promptbutton end .Wilton: farwritetext WiltonAnswerPhoneNiteText - buttonsound + promptbutton end .Kenji: farwritetext KenjiAnswerPhoneNiteText - buttonsound + promptbutton end .Parry: farwritetext ParryAnswerPhoneNiteText - buttonsound + promptbutton end PhoneScript_AnswerPhone_Female: @@ -408,42 +408,42 @@ PhoneScript_AnswerPhone_Female: .Beverly: farwritetext BeverlyAnswerPhoneText - buttonsound + promptbutton end .Beth: farwritetext BethAnswerPhoneText - buttonsound + promptbutton end .Reena: farwritetext ReenaAnswerPhoneText - buttonsound + promptbutton end .Liz: farwritetext LizAnswerPhoneText - buttonsound + promptbutton end .Gina: farwritetext GinaAnswerPhoneText - buttonsound + promptbutton end .Dana: farwritetext DanaAnswerPhoneText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyAnswerPhoneText - buttonsound + promptbutton end .Erin: farwritetext ErinAnswerPhoneText - buttonsound + promptbutton end PhoneScript_AnswerPhone_Female_Day: @@ -459,42 +459,42 @@ PhoneScript_AnswerPhone_Female_Day: .Beverly: farwritetext BeverlyAnswerPhoneDayText - buttonsound + promptbutton end .Beth: farwritetext BethAnswerPhoneDayText - buttonsound + promptbutton end .Reena: farwritetext ReenaAnswerPhoneDayText - buttonsound + promptbutton end .Liz: farwritetext LizAnswerPhoneDayText - buttonsound + promptbutton end .Gina: farwritetext GinaAnswerPhoneDayText - buttonsound + promptbutton end .Dana: farwritetext DanaAnswerPhoneDayText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyAnswerPhoneDayText - buttonsound + promptbutton end .Erin: farwritetext ErinAnswerPhoneDayText - buttonsound + promptbutton end PhoneScript_AnswerPhone_Female_Nite: @@ -510,42 +510,42 @@ PhoneScript_AnswerPhone_Female_Nite: .Beverly: farwritetext BeverlyAnswerPhoneNiteText - buttonsound + promptbutton end .Beth: farwritetext BethAnswerPhoneNiteText - buttonsound + promptbutton end .Reena: farwritetext ReenaAnswerPhoneNiteText - buttonsound + promptbutton end .Liz: farwritetext LizAnswerPhoneNiteText - buttonsound + promptbutton end .Gina: farwritetext GinaAnswerPhoneNiteText - buttonsound + promptbutton end .Dana: farwritetext DanaAnswerPhoneNiteText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyAnswerPhoneNiteText - buttonsound + promptbutton end .Erin: farwritetext ErinAnswerPhoneNiteText - buttonsound + promptbutton end PhoneScript_GreetPhone_Male: @@ -577,102 +577,102 @@ PhoneScript_GreetPhone_Male: .Jack: farwritetext JackGreetText - buttonsound + promptbutton end .Huey: farwritetext HueyGreetText - buttonsound + promptbutton end .Gaven: farwritetext GavenGreetText - buttonsound + promptbutton end .Jose: farwritetext JoseGreetText - buttonsound + promptbutton end .Joey: farwritetext JoeyGreetText - buttonsound + promptbutton end .Wade: farwritetext WadeGreetText - buttonsound + promptbutton end .Ralph: farwritetext RalphGreetText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyGreetText - buttonsound + promptbutton end .Todd: farwritetext ToddGreetText - buttonsound + promptbutton end .Irwin: farwritetext IrwinGreetText - buttonsound + promptbutton end .Arnie: farwritetext ArnieGreetText - buttonsound + promptbutton end .Alan: farwritetext AlanGreetText - buttonsound + promptbutton end .Chad: farwritetext ChadGreetText - buttonsound + promptbutton end .Derek: farwritetext DerekGreetText - buttonsound + promptbutton end .Tully: farwritetext TullyGreetText - buttonsound + promptbutton end .Brent: farwritetext BrentGreetText - buttonsound + promptbutton end .Vance: farwritetext VanceGreetText - buttonsound + promptbutton end .Wilton: farwritetext WiltonGreetText - buttonsound + promptbutton end .Kenji: farwritetext KenjiGreetText - buttonsound + promptbutton end .Parry: farwritetext ParryGreetText - buttonsound + promptbutton end PhoneScript_GreetPhone_Male_Day: @@ -700,102 +700,102 @@ PhoneScript_GreetPhone_Male_Day: .Jack: farwritetext JackGreetDayText - buttonsound + promptbutton end .Huey: farwritetext HueyGreetDayText - buttonsound + promptbutton end .Gaven: farwritetext GavenGreetDayText - buttonsound + promptbutton end .Jose: farwritetext JoseGreetDayText - buttonsound + promptbutton end .Joey: farwritetext JoeyGreetDayText - buttonsound + promptbutton end .Wade: farwritetext WadeGreetDayText - buttonsound + promptbutton end .Ralph: farwritetext RalphGreetDayText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyGreetDayText - buttonsound + promptbutton end .Todd: farwritetext ToddGreetDayText - buttonsound + promptbutton end .Irwin: farwritetext IrwinGreetDayText - buttonsound + promptbutton end .Arnie: farwritetext ArnieGreetDayText - buttonsound + promptbutton end .Alan: farwritetext AlanGreetDayText - buttonsound + promptbutton end .Chad: farwritetext ChadGreetDayText - buttonsound + promptbutton end .Derek: farwritetext DerekGreetDayText - buttonsound + promptbutton end .Tully: farwritetext TullyGreetDayText - buttonsound + promptbutton end .Brent: farwritetext BrentGreetDayText - buttonsound + promptbutton end .Vance: farwritetext VanceGreetDayText - buttonsound + promptbutton end .Wilton: farwritetext WiltonGreetDayText - buttonsound + promptbutton end .Kenji: farwritetext KenjiGreetDayText - buttonsound + promptbutton end .Parry: farwritetext ParryGreetDayText - buttonsound + promptbutton end PhoneScript_GreetPhone_Male_Nite: @@ -823,102 +823,102 @@ PhoneScript_GreetPhone_Male_Nite: .Jack: farwritetext JackGreetNiteText - buttonsound + promptbutton end .Huey: farwritetext HueyGreetNiteText - buttonsound + promptbutton end .Gaven: farwritetext GavenGreetNiteText - buttonsound + promptbutton end .Jose: farwritetext JoseGreetNiteText - buttonsound + promptbutton end .Joey: farwritetext JoeyGreetNiteText - buttonsound + promptbutton end .Wade: farwritetext WadeGreetNiteText - buttonsound + promptbutton end .Ralph: farwritetext RalphGreetNiteText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyGreetNiteText - buttonsound + promptbutton end .Todd: farwritetext ToddGreetNiteText - buttonsound + promptbutton end .Irwin: farwritetext IrwinGreetNiteText - buttonsound + promptbutton end .Arnie: farwritetext ArnieGreetNiteText - buttonsound + promptbutton end .Alan: farwritetext AlanGreetNiteText - buttonsound + promptbutton end .Chad: farwritetext ChadGreetNiteText - buttonsound + promptbutton end .Derek: farwritetext DerekGreetNiteText - buttonsound + promptbutton end .Tully: farwritetext TullyGreetNiteText - buttonsound + promptbutton end .Brent: farwritetext BrentGreetNiteText - buttonsound + promptbutton end .Vance: farwritetext VanceGreetNiteText - buttonsound + promptbutton end .Wilton: farwritetext WiltonGreetNiteText - buttonsound + promptbutton end .Kenji: farwritetext KenjiGreetNiteText - buttonsound + promptbutton end .Parry: farwritetext ParryGreetNiteText - buttonsound + promptbutton end PhoneScript_GreetPhone_Female: @@ -938,42 +938,42 @@ PhoneScript_GreetPhone_Female: .Beverly: farwritetext BeverlyGreetText - buttonsound + promptbutton end .Beth: farwritetext BethGreetText - buttonsound + promptbutton end .Reena: farwritetext ReenaGreetText - buttonsound + promptbutton end .Liz: farwritetext LizGreetText - buttonsound + promptbutton end .Gina: farwritetext GinaGreetText - buttonsound + promptbutton end .Dana: farwritetext DanaGreetText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyGreetText - buttonsound + promptbutton end .Erin: farwritetext ErinGreetText - buttonsound + promptbutton end PhoneScript_GreetPhone_Female_Day: @@ -989,42 +989,42 @@ PhoneScript_GreetPhone_Female_Day: .Beverly: farwritetext BeverlyGreetDayText - buttonsound + promptbutton end .Beth: farwritetext BethGreetDayText - buttonsound + promptbutton end .Reena: farwritetext ReenaGreetDayText - buttonsound + promptbutton end .Liz: farwritetext LizGreetDayText - buttonsound + promptbutton end .Gina: farwritetext GinaGreetDayText - buttonsound + promptbutton end .Dana: farwritetext DanaGreetDayText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyGreetDayText - buttonsound + promptbutton end .Erin: farwritetext ErinGreetDayText - buttonsound + promptbutton end PhoneScript_GreetPhone_Female_Nite: @@ -1040,42 +1040,42 @@ PhoneScript_GreetPhone_Female_Nite: .Beverly: farwritetext BeverlyGreetNiteText - buttonsound + promptbutton end .Beth: farwritetext BethGreetNiteText - buttonsound + promptbutton end .Reena: farwritetext ReenaGreetNiteText - buttonsound + promptbutton end .Liz: farwritetext LizGreetNiteText - buttonsound + promptbutton end .Gina: farwritetext GinaGreetNiteText - buttonsound + promptbutton end .Dana: farwritetext DanaGreetNiteText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyGreetNiteText - buttonsound + promptbutton end .Erin: farwritetext ErinGreetNiteText - buttonsound + promptbutton end PhoneScript_Generic_Male: @@ -1100,92 +1100,92 @@ PhoneScript_Generic_Male: .Jack: farwritetext JackGenericText - buttonsound + promptbutton end .Unknown: farwritetext UnknownGenericText - buttonsound + promptbutton end .Gaven: farwritetext GavenGenericText - buttonsound + promptbutton end .Jose: farwritetext JoseGenericText - buttonsound + promptbutton end .Joey: farwritetext JoeyGenericText - buttonsound + promptbutton end .Wade: farwritetext WadeGenericText - buttonsound + promptbutton end .Ralph: farwritetext RalphGenericText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyGenericText - buttonsound + promptbutton end .Todd: farwritetext ToddGenericText - buttonsound + promptbutton end .Arnie: farwritetext ArnieGenericText - buttonsound + promptbutton end .Alan: farwritetext AlanGenericText - buttonsound + promptbutton end .Chad: farwritetext ChadGenericText - buttonsound + promptbutton end .Derek: farwritetext DerekGenericText - buttonsound + promptbutton end .Tully: farwritetext TullyGenericText - buttonsound + promptbutton end .Brent: farwritetext BrentGenericText - buttonsound + promptbutton end .Vance: farwritetext VanceGenericText - buttonsound + promptbutton end .Wilton: farwritetext WiltonGenericText - buttonsound + promptbutton end .Parry: farwritetext ParryGenericText - buttonsound + promptbutton end PhoneScript_Generic_Female: @@ -1201,42 +1201,42 @@ PhoneScript_Generic_Female: .Beverly: farwritetext BeverlyGenericText - buttonsound + promptbutton end .Beth: farwritetext BethGenericText - buttonsound + promptbutton end .Reena: farwritetext ReenaGenericText - buttonsound + promptbutton end .Liz: farwritetext LizGenericText - buttonsound + promptbutton end .Gina: farwritetext GinaGenericText - buttonsound + promptbutton end .Dana: farwritetext DanaGenericText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyGenericText - buttonsound + promptbutton end .Erin: farwritetext ErinGenericText - buttonsound + promptbutton end PhoneScript_MonFlavorText: @@ -1244,7 +1244,7 @@ PhoneScript_MonFlavorText: farscall PhoneScript_Random2 ifequal $0, .TooEnergetic farwritetext UnknownGenericText - buttonsound + promptbutton farsjump PhoneScript_HangUpText_Male .TooEnergetic: @@ -1252,7 +1252,7 @@ PhoneScript_MonFlavorText: .unnecessary farwritetext UnknownTougherThanEverText - buttonsound + promptbutton farsjump PhoneScript_HangUpText_Male GrandmaString: db "Grandma@" diff --git a/engine/phone/scripts/generic_caller.asm b/engine/phone/scripts/generic_caller.asm index 6c4e9fd7d..5dff5654b 100644 --- a/engine/phone/scripts/generic_caller.asm +++ b/engine/phone/scripts/generic_caller.asm @@ -76,87 +76,87 @@ Phone_WhosBragging_Male: .Jack: farwritetext JackIntelligenceKeepsRisingText - buttonsound + promptbutton end .Gaven: farwritetext GavenMonGreaterThanImaginedText - buttonsound + promptbutton end .Jose: farwritetext JoseMonsStickHasADeliciousAromaText - buttonsound + promptbutton end .Joey: farwritetext JoeyMonLookingSharperText - buttonsound + promptbutton end .Wade: farwritetext WadeAreYourMonGrowingText - buttonsound + promptbutton end .Ralph: farwritetext RalphNeglectingKidsText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyMonAteSomeBerriesText - buttonsound + promptbutton end .Todd: farwritetext ToddLooksCuteLikeMeText - buttonsound + promptbutton end .Arnie: farwritetext ArnieMonIsSoCuteText - buttonsound + promptbutton end .Alan: farwritetext AlanGettingStrongerText - buttonsound + promptbutton end .Chad: farwritetext ChadObservingWildText - buttonsound + promptbutton end .Derek: farwritetext DerekCheekPinchingText - buttonsound + promptbutton end .Tully: farwritetext TullyMonHasGrownText - buttonsound + promptbutton end .Brent: farwritetext BrentRareTradeText - buttonsound + promptbutton end .Vance: farwritetext VanceMonHasBecomeTougherText - buttonsound + promptbutton end .Wilton: farwritetext WiltonMonHasGrownText - buttonsound + promptbutton end .Parry: farwritetext ParryNothingCanMatchText - buttonsound + promptbutton end Phone_WhosBragging_Female: @@ -172,42 +172,42 @@ Phone_WhosBragging_Female: .Beverly: farwritetext BeverlyMadeMonEvenCuterText - buttonsound + promptbutton end .Beth: farwritetext BethExhilaratingRideText - buttonsound + promptbutton end .Reena: farwritetext ReenaMonsIsAPerfectMatchText - buttonsound + promptbutton end .Liz: farwritetext LizMonAlwaysWantsToNuzzleText - buttonsound + promptbutton end .Gina: farwritetext GinaGettingInSyncWithMonText - buttonsound + promptbutton end .Dana: farwritetext DanaTakingPhotosText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyMonIsAdorableText - buttonsound + promptbutton end .Erin: farwritetext ErinMonIsMuchStrongerText - buttonsound + promptbutton end Phone_WhoDefeatedMon_Male: @@ -232,87 +232,87 @@ Phone_WhoDefeatedMon_Male: .Jack: farwritetext JackDefeatedMonText - buttonsound + promptbutton end .Gaven: farwritetext GavenDefeatedMonText - buttonsound + promptbutton end .Jose: farwritetext JoseDefeatedMonText - buttonsound + promptbutton end .Joey: farwritetext JoeyDefeatedMonText - buttonsound + promptbutton end .Wade: farwritetext WadeDefeatedMonText - buttonsound + promptbutton end .Ralph: farwritetext RalphDefeatedMonText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyDefeatedMonText - buttonsound + promptbutton end .Todd: farwritetext ToddDefeatedMonText - buttonsound + promptbutton end .Arnie: farwritetext ArnieDefeatedMonText - buttonsound + promptbutton end .Alan: farwritetext AlanDefeatedMonText - buttonsound + promptbutton end .Chad: farwritetext ChadDefeatedMonText - buttonsound + promptbutton end .Derek: farwritetext DerekDefeatedMonText - buttonsound + promptbutton end .Tully: farwritetext TullyDefeatedMonText - buttonsound + promptbutton end .Brent: farwritetext BrentDefeatedMonText - buttonsound + promptbutton end .Vance: farwritetext VanceDefeatedMonText - buttonsound + promptbutton end .Wilton: farwritetext WiltonDefeatedMonText - buttonsound + promptbutton end .Parry: farwritetext ParryDefeatedMonText - buttonsound + promptbutton end Phone_WhoDefeatedMon_Female: @@ -328,42 +328,42 @@ Phone_WhoDefeatedMon_Female: .Beverly: farwritetext BeverlyDefeatedMonText - buttonsound + promptbutton end .Beth: farwritetext BethDefeatedMonText - buttonsound + promptbutton end .Reena: farwritetext ReenaDefeatedMonText - buttonsound + promptbutton end .Liz: farwritetext LizDefeatedMonText - buttonsound + promptbutton end .Gina: farwritetext GinaDefeatedMonText - buttonsound + promptbutton end .Dana: farwritetext DanaDefeatedMonText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyDefeatedMonText - buttonsound + promptbutton end .Erin: farwritetext ErinDefeatedMonText - buttonsound + promptbutton end Phone_WhoLostAMon_Male: @@ -388,87 +388,87 @@ Phone_WhoLostAMon_Male: .Jack: farwritetext JackLostAMonText - buttonsound + promptbutton end .Gaven: farwritetext GavenLostAMonText - buttonsound + promptbutton end .Jose: farwritetext JoseLostAMonText - buttonsound + promptbutton end .Joey: farwritetext JoeyLostAMonText - buttonsound + promptbutton end .Wade: farwritetext WadeLostAMonText - buttonsound + promptbutton end .Ralph: farwritetext RalphLostAMonText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyLostAMonText - buttonsound + promptbutton end .Todd: farwritetext ToddLostAMonText - buttonsound + promptbutton end .Arnie: farwritetext ArnieLostAMonText - buttonsound + promptbutton end .Alan: farwritetext AlanLostAMonText - buttonsound + promptbutton end .Chad: farwritetext ChadLostAMonText - buttonsound + promptbutton end .Derek: farwritetext DerekLostAMonText - buttonsound + promptbutton end .Tully: farwritetext TullyLostAMonText - buttonsound + promptbutton end .Brent: farwritetext BrentLostAMonText - buttonsound + promptbutton end .Vance: farwritetext VanceLostAMonText - buttonsound + promptbutton end .Wilton: farwritetext WiltonLostAMonText - buttonsound + promptbutton end .Parry: farwritetext ParryLostAMonText - buttonsound + promptbutton end Phone_WhoLostAMon_Female: @@ -484,42 +484,42 @@ Phone_WhoLostAMon_Female: .Beverly: farwritetext BeverlyLostAMonText - buttonsound + promptbutton end .Beth: farwritetext BethLostAMonText - buttonsound + promptbutton end .Reena: farwritetext ReenaLostAMonText - buttonsound + promptbutton end .Liz: farwritetext LizLostAMonText - buttonsound + promptbutton end .Gina: farwritetext GinaLostAMonText - buttonsound + promptbutton end .Dana: farwritetext DanaLostAMonText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyLostAMonText - buttonsound + promptbutton end .Erin: farwritetext ErinLostAMonText - buttonsound + promptbutton end PhoneScript_WantsToBattle_Male: @@ -552,87 +552,87 @@ PhoneScript_RematchText_Male: .Jack: farwritetext JackBattleRematchText - buttonsound + promptbutton end .Huey: farwritetext HueyBattleRematchText - buttonsound + promptbutton end .Gaven: farwritetext GavenBattleRematchText - buttonsound + promptbutton end .Jose: farwritetext JoseBattleRematchText - buttonsound + promptbutton end .Joey: farwritetext JoeyBattleRematchText - buttonsound + promptbutton end .Wade: farwritetext WadeBattleRematchText - buttonsound + promptbutton end .Ralph: farwritetext RalphBattleRematchText - buttonsound + promptbutton end .Anthony: farwritetext AnthonyBattleRematchText - buttonsound + promptbutton end .Todd: farwritetext ToddBattleRematchText - buttonsound + promptbutton end .Arnie: farwritetext ArnieBattleRematchText - buttonsound + promptbutton end .Alan: farwritetext AlanBattleRematchText - buttonsound + promptbutton end .Chad: farwritetext ChadBattleRematchText - buttonsound + promptbutton end .Tully: farwritetext TullyBattleRematchText - buttonsound + promptbutton end .Brent: farwritetext BrentBattleRematchText - buttonsound + promptbutton end .Vance: farwritetext VanceBattleRematchText - buttonsound + promptbutton end .Wilton: farwritetext WiltonBattleRematchText - buttonsound + promptbutton end .Parry: farwritetext ParryBattleRematchText - buttonsound + promptbutton end PhoneScript_RematchText_Female: @@ -647,37 +647,37 @@ PhoneScript_RematchText_Female: .Beth: farwritetext BethBattleRematchText - buttonsound + promptbutton end .Reena: farwritetext ReenaBattleRematchText - buttonsound + promptbutton end .Liz: farwritetext LizBattleRematchText - buttonsound + promptbutton end .Gina: farwritetext GinaBattleRematchText - buttonsound + promptbutton end .Dana: farwritetext DanaBattleRematchText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyBattleRematchText - buttonsound + promptbutton end .Erin: farwritetext ErinBattleRematchText - buttonsound + promptbutton end LizWrongNumberScript: @@ -861,37 +861,37 @@ PhoneScript_BugCatchingContest: .Wade: farwritetext WadeBugCatchingContestText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Derek: farwritetext DerekBugCatchingContestText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male IrwinRocketRumorScript: farwritetext IrwinRocketTakeoverRumorText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male GinaRocketRumorScript: farwritetext GinaRocketTakeoverRumorText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female ArnieSwarmScript: farwritetext ArnieSwarmText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male RalphItemScript: farwritetext RalphItemText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male AnthonySwarmScript: farwritetext AnthonySwarmText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male PhoneScript_FoundItem_Male: @@ -952,10 +952,10 @@ PhoneScript_FoundItem_Female: ToddItemScript: farwritetext ToddDepartmentStoreBargainSaleText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male KenjiCallingPhoneScript: farwritetext KenjiRemainDedicatedText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/hangups.asm b/engine/phone/scripts/hangups.asm index e524ca0fc..7ca1db51c 100644 --- a/engine/phone/scripts/hangups.asm +++ b/engine/phone/scripts/hangups.asm @@ -1,131 +1,131 @@ JackPhoneTipsScript: farwritetext JackHeardSomeGreatTipsText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male BeverlyHangUpScript: farwritetext BeverlyLetsChatAboutMonAgainText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female HueyHangUpScript: farwritetext HueyWeHaveToBattleAgainSometimeText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male GavenHangUpNotThursdayScript: farwritetext GavenHangUpNotThursdayText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male BethHangUpScript: farwritetext BethLetsBattleAgainSometimeText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female JoseHangUpScript: farwritetext JoseHaventGottenItemYetText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male ReenaForwardScript: farwritetext ReenaForwardText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female JoeyHangUpScript: farwritetext JoeyDevisingStrategiesText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male WadeNoBerriesScript: farwritetext WadeNoBerriesText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male RalphNoItemScript: farwritetext RalphNoItemText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male LizHangUpScript: farwritetext LizFawningOverMonText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female AnthonyHangUpScript: farwritetext AnthonyWasntPayingAttentionText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male ToddNoItemScript: farwritetext ToddSavingUpForBargainSaleText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male GinaHangUpScript: farwritetext GinaHaventFoundAnythingYetText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female ArnieHangUpScript: farwritetext ArnieHaventSeenRareMonText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male AlanHangUpScript: farwritetext AlanHaventPickedUpAnythingText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male DanaHangUpScript: farwritetext DanaCanYouWaitABitLongerText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female ChadHangUpScript: farwritetext ChadGoingToStudyHardText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male DerekHangUpScript: farwritetext DerekLetsGetTogetherText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male TullyNoItemScript: farwritetext TullyNoItemText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male BrentHangUpScript: farwritetext BrentSorryImTooBusyText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male TiffanyNoItemScript: farwritetext TiffanyNoItemText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female VanceLookingForwardScript: farwritetext VanceLookingForwardText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male WiltonHaventFoundAnythingScript: farwritetext WiltonHaventFoundAnythingText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male ParryBattleWithMeScript: farwritetext ParryBattleWithMeText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male ErinWorkingHardScript: farwritetext ErinWorkingHardText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female IrwinRandomTextScript: @@ -136,17 +136,17 @@ IrwinRandomTextScript: IrwinEscapadeScript: farwritetext IrwinYourEscapadesRockText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male IrwinGoodMatchScript: farwritetext IrwinGoodMatchText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male IrwinSoMuchToChatAboutScript: farwritetext IrwinSoMuchToChatAboutText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male KenjiAnswerPhoneScript: @@ -154,12 +154,12 @@ KenjiAnswerPhoneScript: ifequal 2, .Training ifequal 1, .OnBreak farwritetext KenjiCallMeBackAnotherTimeText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Training: farwritetext KenjiIllHaveTimeToChatTomorrowText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .OnBreak: @@ -169,15 +169,15 @@ KenjiAnswerPhoneScript: iftrue .Night setevent EVENT_KENJI_ON_BREAK farwritetext KenjiTakingABreakText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Morning: farwritetext KenjiHangUpMorningText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Night: farwritetext KenjiHangUpNightText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/hangups_2.asm b/engine/phone/scripts/hangups_2.asm index c0fa7217a..aad10df21 100644 --- a/engine/phone/scripts/hangups_2.asm +++ b/engine/phone/scripts/hangups_2.asm @@ -1,49 +1,49 @@ BeverlyComePickUpScript: farwritetext BeverlyComePickUpText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female JoseComePickUpScript: farwritetext JoseComePickUpText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male WadeComeQuickScript: farwritetext WadeComeQuickText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male GinaComePickUpScript: farwritetext GinaComePickUpText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female AlanComePickUpScript: farwritetext AlanComePickUpGiftText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male DanaComePickUpScript: farwritetext DanaComePickUpText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female DerekComePickUpScript: farwritetext DerekComePickUpText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male TullyHurryScript: farwritetext TullyHurryText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male TiffanyHurryScript: farwritetext TiffanyHurryText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female WiltonWantThisScript: farwritetext WiltonWantThisText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/irwin_gossip.asm b/engine/phone/scripts/irwin_gossip.asm index 97816d6e8..2a377e243 100644 --- a/engine/phone/scripts/irwin_gossip.asm +++ b/engine/phone/scripts/irwin_gossip.asm @@ -24,65 +24,65 @@ IrwinRumorScript: checkflag ENGINE_PLAINBADGE iftrue .PlainBadge farwritetext IrwinCalledRightAwayText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .PlainBadge: farwritetext IrwinPlainBadgeGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .JasmineReturned: farwritetext IrwinJasmineReturnedGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .RocketHideout: farwritetext IrwinRocketHideoutGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .RadioTower: farwritetext IrwinRadioTowerGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .RisingBadge: farwritetext IrwinRisingBadgeGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .EliteFour: farwritetext IrwinEliteFourGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .VermilionCity: farwritetext IrwinVermilionCityGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .TrainPass: farwritetext IrwinTrainPassGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Snorlax: farwritetext IrwinSnorlaxGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .MtSilver: farwritetext IrwinMtSilverGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .FogBadge: farwritetext IrwinFogBadgeGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .MarshBadge: farwritetext IrwinMarshBadgeGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/jack_gossip.asm b/engine/phone/scripts/jack_gossip.asm index ffb8cb59f..0ebdf3a1b 100644 --- a/engine/phone/scripts/jack_gossip.asm +++ b/engine/phone/scripts/jack_gossip.asm @@ -14,55 +14,55 @@ JackTriviaScript: .Thunder: farwritetext JackThunderTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Rollout: farwritetext JackRolloutTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Solarbeam: farwritetext JackSolarbeamTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Stomp: farwritetext JackStompTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Gust: farwritetext JackGustTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Twister: farwritetext JackTwisterTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Earthquake: farwritetext JackEarthquakeTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Magnitude: farwritetext JackMagnitudeTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .Sandstorm: farwritetext JackSandstormTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .SunnyDay: farwritetext JackSunnyDayTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male .RainDance: farwritetext JackRainDanceTriviaText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/liz_gossip.asm b/engine/phone/scripts/liz_gossip.asm index e57ea1162..cbd8206e5 100644 --- a/engine/phone/scripts/liz_gossip.asm +++ b/engine/phone/scripts/liz_gossip.asm @@ -13,50 +13,50 @@ LizGossipRandomScript: .RuinsOfAlph: farwritetext LizRuinsOfAlphGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female .Falkner: farwritetext LizFalknerGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female .Earl: farwritetext LizEarlGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female .SurfPikachu: farwritetext LizSurfPikachuGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female .MooMooMilk: farwritetext LizMooMooMilkGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female .Salon: farwritetext LizSalonGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female .Whitney: farwritetext LizWhitneyGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female .BugCatchingContest: farwritetext LizBugCatchingContestGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female .BeautifulMon: farwritetext LizBeautifulMonGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female .Forgot: farwritetext LizForgotGossipText - buttonsound + promptbutton sjump PhoneScript_HangUpText_Female diff --git a/engine/phone/scripts/mom.asm b/engine/phone/scripts/mom.asm index 5b5ca7982..900e48be6 100644 --- a/engine/phone/scripts/mom.asm +++ b/engine/phone/scripts/mom.asm @@ -13,7 +13,7 @@ MomPhoneCalleeScript: checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 iftrue MomPhoneHangUpScript farwritetext MomPhoneGreetingText - buttonsound + promptbutton getcurlandmarkname STRING_BUFFER_3 readvar VAR_ROOFPALETTE ifequal 1, MomPhonePalette1 @@ -22,7 +22,7 @@ MomPhoneCalleeScript: MomPhoneLandmark: farwritetext MomPhoneLandmarkText - buttonsound + promptbutton sjump MomSavingMoney MomPhonePalette1: @@ -33,17 +33,17 @@ MomPhonePalette1: ifequal GROUP_AZALEA_TOWN, .azalea ifequal GROUP_GOLDENROD_CITY, .goldenrod farwritetext MomPhoneGenericAreaText - buttonsound + promptbutton sjump MomSavingMoney .newbark farwritetext MomPhoneNewBarkText - buttonsound + promptbutton sjump MomSavingMoney .cherrygrove farwritetext MomPhoneCherrygroveText - buttonsound + promptbutton sjump MomSavingMoney .violet @@ -58,12 +58,12 @@ MomPhonePalette1: MomPhonePalette2: farwritetext MomOtherAreaText - buttonsound + promptbutton sjump MomSavingMoney MomPhoneOther: farwritetext MomDeterminedText - buttonsound + promptbutton sjump MomSavingMoney MomSavingMoney: @@ -107,13 +107,13 @@ MomSavingMoney: MomPhoneSaveMoneyScript: setflag ENGINE_MOM_SAVING_MONEY farwritetext MomOKIllSaveText - buttonsound + promptbutton sjump MomPhoneHangUpScript MomPhoneWontSaveMoneyScript: clearflag ENGINE_MOM_SAVING_MONEY farwritetext MomPhoneWontSaveMoneyText - buttonsound + promptbutton sjump MomPhoneHangUpScript MomPhoneHangUpScript: diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 34a0f2bbe..9751a90cf 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -869,7 +869,7 @@ DayCareMon1: ld a, [wDayCareLady] bit DAYCARELADY_HAS_MON_F, a jr z, DayCareMonCursor - call ButtonSound + call PromptButton ld hl, wBreedMon2Nick call DayCareMonCompatibilityText jp PrintText @@ -882,7 +882,7 @@ DayCareMon2: ld a, [wDayCareMan] bit DAYCAREMAN_HAS_MON_F, a jr z, DayCareMonCursor - call ButtonSound + call PromptButton ld hl, wBreedMon1Nick call DayCareMonCompatibilityText jp PrintText diff --git a/engine/pokemon/european_mail.asm b/engine/pokemon/european_mail.asm index 38c542d35..eb9b7d5d9 100644 --- a/engine/pokemon/european_mail.asm +++ b/engine/pokemon/european_mail.asm @@ -38,15 +38,15 @@ INCBIN "gfx/font/french_german.1bpp" SpanishItalianFont: INCBIN "gfx/font/spanish_italian.1bpp" -HandleFrenchGermanMail: -; called if mail is french or german -; fix 's 't 'v +ConvertFrenchGermanMailToEnglish: +; Called if mail is French or German +; Converts 's 't 'v from French/German character set to English ld b, sPartyMon1MailAuthor - sPartyMon1Mail ld h, d ld l, e .loop ld a, [hl] - cp $dc ; 's in french/german font + cp $dc ; 's in French/German font jr nz, .check_intermediate_chars ld a, "'s" jr .replace @@ -67,12 +67,9 @@ HandleFrenchGermanMail: jr nz, .loop ret -LireLeCourrierAnglais: -DeutenEnglischenPost: -; Cette fonction convertit certains des caractères anglais pour -; leur équivalent dans le jeu de caractères français. -; Diese Funktion wandelt bestimmte englische Zeichen, um ihre -; Entsprechung in der Deutschen-Zeichensatz. +ConvertEnglishMailToFrenchGerman: +; Called if mail is English and game is French or German +; Converts 's 't 'v from English character set to French/German ld b, sPartyMon1MailAuthor - sPartyMon1Mail ld h, d ld l, e @@ -80,7 +77,7 @@ DeutenEnglischenPost: ld a, [hl] cp "'s" jr nz, .check_intermediate_chars - ld a, $dc + ld a, $dc ; 's in French/German font jr .replace .check_intermediate_chars @@ -99,15 +96,12 @@ DeutenEnglischenPost: jr nz, .loop ret -HandleSpanishItalianMail: -LeerCorreosIngleses: -LeggiPostaInglese: -; This function converts certain characters between -; the English and Spanish/Italian character sets. -; Esta función convierte ciertos caracteres entre -; el juego de caracteres Inglés y Español. -; Questa funzione converte alcuni caratteri tra -; l'inglese e il set di caratteri italiani. +ConvertSpanishItalianMailToEnglish: +; Called if mail is Spanish or Italian +; Converts 'd 'l 'm 'r 's 't 'v from Spanish/Italian character set to English +ConvertEnglishMailToSpanishItalian: +; Called if mail is English and game is Spanish or Italian +; Converts 'd 'l 'm 'r 's 't 'v from English character set to Spanish/Italian ld b, sPartyMon1MailAuthor - sPartyMon1Mail ld h, d ld l, e diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 0b19dcb14..f6fee4b9c 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -877,7 +877,7 @@ MoveScreenLoop: inc a ld [wPartyMenuCursor], a call SetUpMoveScreenBG - call Function132d3 + call PlaceMoveScreenArrows ld de, MoveScreenAttributes call SetMenuAttributes .loop @@ -1228,12 +1228,12 @@ String_MoveAtk: String_MoveNoPower: db "---@" -Function132d3: - call Function132da - call Function132fe +PlaceMoveScreenArrows: + call PlaceMoveScreenLeftArrow + call PlaceMoveScreenRightArrow ret -Function132da: +PlaceMoveScreenLeftArrow: ld a, [wCurPartyMon] and a ret z @@ -1262,7 +1262,7 @@ Function132da: ld [hl], "◀" ret -Function132fe: +PlaceMoveScreenRightArrow: ld a, [wCurPartyMon] inc a ld c, a diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index eb5afa9dc..8133e2671 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -132,7 +132,7 @@ rept NUM_MOVES + -1 ld [hli], a endr ld [hl], a - ld [wBuffer1], a + ld [wEvolutionOldSpecies], a predef FillMoves .next diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 49c2c4713..12036497d 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -246,10 +246,10 @@ PlacePartyMonLevel: jr nc, .ThreeDigits ld a, "<LV>" ld [hli], a - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 ; jr .okay .ThreeDigits: - lb bc, PRINTNUM_RIGHTALIGN | 1, 3 + lb bc, PRINTNUM_LEFTALIGN | 1, 3 ; .okay call PrintNum diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index ab47c5e56..da1012ff8 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -273,19 +273,19 @@ SetMinutes: DisplayMinutesWithMinString: ld de, wInitMinuteBuffer - call PrintTwoDigitNumberRightAlign + call PrintTwoDigitNumberLeftAlign inc hl ld de, String_min call PlaceString ret -PrintTwoDigitNumberRightAlign: +PrintTwoDigitNumberLeftAlign: push hl ld a, " " ld [hli], a ld [hl], a pop hl - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum ret @@ -684,7 +684,7 @@ PrintHour: call AdjustHourForAMorPM ld [wDeciramBuffer], a ld de, wDeciramBuffer - call PrintTwoDigitNumberRightAlign + call PrintTwoDigitNumberLeftAlign ret GetTimeOfDayString: diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index d596849d2..f8869b59b 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -259,7 +259,7 @@ TilesetChampionsRoomAnim: TilesetLighthouseAnim: TilesetPlayersRoomAnim: TilesetPokeComCenterAnim: -TilesetBattleTowerAnim: +TilesetBattleTowerInsideAnim: TilesetRuinsOfAlphAnim: TilesetRadioTowerAnim: TilesetUndergroundAnim: diff --git a/engine/tilesets/tileset_palettes.asm b/engine/tilesets/tileset_palettes.asm index 459cd74c2..994102238 100644 --- a/engine/tilesets/tileset_palettes.asm +++ b/engine/tilesets/tileset_palettes.asm @@ -2,8 +2,8 @@ LoadSpecialMapPalette: ld a, [wMapTileset] cp TILESET_POKECOM_CENTER jr z, .pokecom_2f - cp TILESET_BATTLE_TOWER - jr z, .battle_tower + cp TILESET_BATTLE_TOWER_INSIDE + jr z, .battle_tower_inside cp TILESET_ICE_PATH jr z, .ice_path cp TILESET_HOUSE @@ -19,8 +19,8 @@ LoadSpecialMapPalette: scf ret -.battle_tower - call LoadBattleTowerPalette +.battle_tower_inside + call LoadBattleTowerInsidePalette scf ret @@ -63,16 +63,16 @@ LoadPokeComPalette: PokeComPalette: INCLUDE "gfx/tilesets/pokecom_center.pal" -LoadBattleTowerPalette: +LoadBattleTowerInsidePalette: ld a, BANK(wBGPals1) ld de, wBGPals1 - ld hl, BattleTowerPalette + ld hl, BattleTowerInsidePalette ld bc, 8 palettes call FarCopyWRAM ret -BattleTowerPalette: -INCLUDE "gfx/tilesets/battle_tower.pal" +BattleTowerInsidePalette: +INCLUDE "gfx/tilesets/battle_tower_inside.pal" LoadIcePathPalette: ld a, BANK(wBGPals1) |