diff options
Diffstat (limited to 'engine/events')
25 files changed, 10 insertions, 99 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 59ec3a1a4..e51080ae0 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -264,7 +264,6 @@ RunBattleTowerTrainer: ld [wBattleTowerBattleEnded], a ret - ReadBTTrainerParty: ; Initialise the BattleTower-Trainer and his mon call CopyBTTrainer_FromBT_OT_TowBT_OTTemp @@ -555,7 +554,6 @@ Function17042c: INCLUDE "data/battle_tower/unknown_levels.asm" - CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; copy the BattleTower-Trainer data that lies at 'wBT_OTTrainer' to 'wBT_OTTemp' ld a, [rSVBK] @@ -672,12 +670,10 @@ Function1704e1: call .PlaceTextItems jr .NextJumptableFunction - .Jumptable_1: call SetPalettes call .NextJumptableFunction - .Jumptable_2: ld hl, hJoyPressed ld a, [hl] @@ -882,7 +878,6 @@ BattleTowerAction: ld l, a jp hl - .dw dw BattleTowerAction_CheckExplanationRead ; 0x00 dw BattleTowerAction_SetExplanationRead ; 0x01 @@ -917,7 +912,6 @@ BattleTowerAction: dw BattleTower_RandomlyChooseReward ; 0x1e dw BattleTower_SaveOptions ; 0x1f - ; Reset the save memory for BattleTower-Trainers (Counter and all 7 TrainerBytes) ResetBattleTowerTrainersSRAM: ; BattleTowerAction $1a ld a, BANK(sBTTrainers) @@ -1200,7 +1194,6 @@ BattleTower_CheckSaveFileExistsAndIsYours: ; BattleTowerAction $09 ld [wScriptVar], a ret - Function1708b1: ; BattleTowerAction $0a xor a ld [wMusicFade], a @@ -1260,7 +1253,6 @@ Function1708f0: ; BattleTowerAction $0d ld [wScriptVar], a ret - Function170923: ld a, $5 call GetSRAMBank @@ -1273,7 +1265,6 @@ Function170923: call CloseSRAM ret - BattleTowerAction_EggTicket: ; BattleTowerAction $0e xor a ld [wScriptVar], a diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index 3e6dead8a..2f34950b6 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -91,7 +91,6 @@ endc ret - Function_LoadRandomBattleTowerMon: ld c, BATTLETOWER_PARTY_LENGTH .loop diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm index 1172717d6..e2db148b7 100644 --- a/engine/events/battle_tower/trainer_text.asm +++ b/engine/events/battle_tower/trainer_text.asm @@ -88,7 +88,6 @@ INCLUDE "mobile/fixed_words.asm" INCLUDE "data/trainers/genders.asm" - BTMaleTrainerTexts: dw .Greetings dw .PlayerLost @@ -175,7 +174,6 @@ BTMaleTrainerTexts: dw BTWinM24 dw BTWinM25 - BTFemaleTrainerTexts: dw .Greetings dw .PlayerLost @@ -232,7 +230,6 @@ BTFemaleTrainerTexts: dw BTWinF14 dw BTWinF15 - BTGreetingM1: text_jump BattleTowerText_0x1ec000 db "@" @@ -533,9 +530,6 @@ BTWinM25: text_jump UnknownText_0x1ec99b db "@" - - - BTGreetingF1: text_jump UnknownText_0x1ec9bd db "@" diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index 0f5ff2b7c..d8f9d7657 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -125,10 +125,8 @@ LoadContestantName: ld bc, NAME_LENGTH jp CopyBytes - INCLUDE "data/events/bug_contest_winners.asm" - BugContest_GetPlayersResult: ld hl, wBugContestThirdPlaceWinnerID ld de, - BUG_CONTESTANT_SIZE diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index c0f4fcf36..76bdbaa76 100644 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -41,7 +41,6 @@ CelebiShrineEvent: pop bc jr .loop - .done pop af ld [wVramState], a @@ -49,7 +48,6 @@ CelebiShrineEvent: call CelebiEvent_SetBattleType ret - .RestorePlayerSprite_DespawnLeaves: ld hl, wVirtualOAMSprite00TileID xor a @@ -68,7 +66,6 @@ endr call ByteFill ret - LoadCelebiGFX: farcall ClearSpriteAnims ld de, SpecialCelebiLeafGFX @@ -83,7 +80,6 @@ LoadCelebiGFX: ld [wJumptableIndex], a ret - CelebiEvent_CountDown: ld hl, wFrameCounter ld a, [hl] @@ -92,13 +88,11 @@ CelebiEvent_CountDown: dec [hl] ret - .done ld hl, wJumptableIndex set 7, [hl] ret - CelebiEvent_SpawnLeaf: ; unused ld hl, wcf65 @@ -119,7 +113,6 @@ CelebiEvent_SpawnLeaf: ld [hl], $80 ret - SpecialCelebiLeafGFX: INCBIN "gfx/overworld/cut_grass.2bpp" @@ -129,7 +122,6 @@ INCBIN "gfx/overworld/celebi/2.2bpp" INCBIN "gfx/overworld/celebi/3.2bpp" INCBIN "gfx/overworld/celebi/4.2bpp" - UpdateCelebiPosition: ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc @@ -224,7 +216,6 @@ UpdateCelebiPosition: .done ret - .FreezeCelebiPosition: pop af ld hl, SPRITEANIMSTRUCT_FRAMESET_ID @@ -233,7 +224,6 @@ UpdateCelebiPosition: call ReinitSpriteAnimFrame ret - CelebiEvent_Cosine: ; a = d * cos(a * pi/32) add %010000 ; cos(x) = sin(x + pi/2) @@ -261,22 +251,18 @@ GetCelebiSpriteTile: jr c, .done jr .restart - .Frame1: ld a, SPECIALCELEBIEVENT_CELEBI jr .load_tile - .Frame2: ld a, SPECIALCELEBIEVENT_CELEBI + 4 jr .load_tile - .Frame3: ld a, SPECIALCELEBIEVENT_CELEBI + 8 jr .load_tile - .Frame4: ld a, SPECIALCELEBIEVENT_CELEBI + 12 @@ -286,7 +272,6 @@ GetCelebiSpriteTile: ld [hl], a jr .done - .restart pop de ld d, $ff @@ -298,7 +283,6 @@ GetCelebiSpriteTile: pop hl ret - .AddE: push af ld a, d @@ -307,13 +291,11 @@ GetCelebiSpriteTile: pop af ret - CelebiEvent_SetBattleType: ld a, BATTLETYPE_CELEBI ld [wBattleType], a ret - CheckCaughtCelebi: ld a, [wBattleResult] bit BATTLERESULT_CAUGHT_CELEBI, a @@ -322,11 +304,9 @@ CheckCaughtCelebi: ld [wScriptVar], a jr .done - .false xor a ; FALSE ld [wScriptVar], a .done ret - diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 76ef11d6a..705b24992 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -142,7 +142,6 @@ Elevator_WhichFloorText: text_jump UnknownText_0x1bd2bc db "@" - Elevator_GetCurrentFloorText: ld hl, wOptions ld a, [hl] @@ -164,7 +163,6 @@ Elevator_GetCurrentFloorText: Elevator_CurrentFloorText: db "Now on:@" - Elevator_GetCurrentFloorString: push hl ld a, [wElevatorOriginFloor] diff --git a/engine/events/engine_flags.asm b/engine/events/engine_flags.asm index 7c894587c..6c2148f79 100644 --- a/engine/events/engine_flags.asm +++ b/engine/events/engine_flags.asm @@ -7,7 +7,6 @@ EngineFlagAction:: ; ; Setting/resetting does not return a result. - ; 16-bit flag ids are considered invalid, but it's nice ; to know that the infrastructure is there. @@ -81,5 +80,4 @@ EngineFlagAction:: ld [de], a ret - INCLUDE "data/engine_flags.asm" diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index b8157fe38..f5ad049f2 100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -20,7 +20,7 @@ BlindingFlash: ShakeHeadbuttTree: farcall ClearSpriteAnims ld de, CutGrassGFX - ld hl, vTiles1 + ld hl, vTiles1 tile $00 lb bc, BANK(CutGrassGFX), 4 call Request2bpp ld de, HeadbuttTreeGFX @@ -134,11 +134,11 @@ OWCutAnimation: .LoadCutGFX: callfar ClearSpriteAnims ; pointless to farcall ld de, CutGrassGFX - ld hl, vTiles1 + ld hl, vTiles1 tile $00 lb bc, BANK(CutGrassGFX), 4 call Request2bpp ld de, CutTreeGFX - ld hl, vTiles1 tile $4 + ld hl, vTiles1 tile $04 lb bc, BANK(CutTreeGFX), 4 call Request2bpp ret @@ -161,14 +161,12 @@ OWCutJumptable: ld l, a jp hl - .dw dw Cut_SpawnAnimateTree dw Cut_SpawnAnimateLeaves dw Cut_StartWaiting dw Cut_WaitAnimSFX - Cut_SpawnAnimateTree: call Cut_Headbutt_GetPixelFacing ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree @@ -303,7 +301,6 @@ Cut_Headbutt_GetPixelFacing: dbpixel 8, 11 dbpixel 12, 11 - FlyFromAnim: call DelayFrame ld a, [wVramState] diff --git a/engine/events/fish.asm b/engine/events/fish.asm index 9d695a908..a1df536bb 100644 --- a/engine/events/fish.asm +++ b/engine/events/fish.asm @@ -21,7 +21,6 @@ endr pop af ret - .Fish: ; Fish for monsters with rod b from encounter data in FishGroup at hl. ; Return monster e at level d. @@ -90,7 +89,6 @@ endr inc hl ret - GetFishGroupIndex: ; Return the index of fishgroup d in de. @@ -126,5 +124,4 @@ GetFishGroupIndex: ld d, FISHGROUP_REMORAID_SWARM jr .done - INCLUDE "data/wild/fish.asm" diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 4e955147a..6d5ca6a1d 100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm @@ -94,10 +94,8 @@ GetFruitTreeItem: pop hl ret - INCLUDE "data/items/fruit_trees.asm" - FruitBearingTreeText: text_jump _FruitBearingTreeText db "@" diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 11107cdb3..6cbc749d5 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -134,7 +134,6 @@ AnimateHallOfFame: .String_NewHallOfFamer: db "New Hall of Famer!@" - GetHallOfFameParty: ld hl, wHallOfFamePokemonList ld bc, wHallOfFamePokemonListEnd - wHallOfFamePokemonList + 1 @@ -603,4 +602,3 @@ HOF_AnimatePlayerPic: .PlayTime: db "PLAY TIME@" - diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index d261caa3c..41f9a4411 100644 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm @@ -102,10 +102,8 @@ ChangeHappiness: ld [wBattleMonHappiness], a ret - INCLUDE "data/events/happiness_changes.asm" - StepHappiness:: ; Raise the party's happiness by 1 point every other step cycle. @@ -141,7 +139,6 @@ StepHappiness:: jr nz, .loop ret - DayCareStep:: ; Raise the experience of Day-Care Pokémon every step cycle. diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 31e8de201..7fe8adba7 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -139,7 +139,6 @@ CalcMagikarpLength: ; if b = 252-253: x = 65210, y = 5, z = 13 ; if b = 254: x = 65410, y = 2, z = 14 - ; bc = rrc(dv[0]) ++ rrc(dv[1]) ^ rrc(id) ; id @@ -302,8 +301,6 @@ CalcMagikarpLength: INCLUDE "data/events/magikarp_lengths.asm" - - MagikarpHouseSign: ld a, [wBestMagikarpLengthFeet] ld [wMagikarpLength], a diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index 1d8736e54..859f30034 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -96,7 +96,6 @@ ReturnFromMapSetupScript:: cp MAP_ROUTE_36_NATIONAL_PARK_GATE ret - PlaceMapNameSign:: ld hl, wLandmarkSignTimer ld a, [hl] @@ -125,7 +124,6 @@ PlaceMapNameSign:: ld [hLCDCPointer], a ret - LoadMapNameSignGFX: ld de, MapEntryFrameGFX ld hl, vTiles2 tile MAP_NAME_SIGN_START @@ -141,7 +139,6 @@ InitMapNameFrame: call PlaceMapNameFrame ret - PlaceMapNameCenterAlign: ld a, [wCurrentLandmark] ld e, a @@ -174,7 +171,6 @@ PlaceMapNameCenterAlign: pop hl ret - InitMapSignAttrMap: ld de, wAttrMap - wTileMap add hl, de diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index fa82da50a..dc10ede35 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -113,7 +113,6 @@ CheckBalance_MomItem2: farcall AddMoney ret - MomBuysItem_DeductFunds: call GetItemFromMom ld de, 3 ; cost @@ -129,7 +128,6 @@ MomBuysItem_DeductFunds: farcall TakeMoney ret - Mom_GiveItemOrDoll: call GetItemFromMom ld de, 6 ; item type @@ -153,7 +151,6 @@ Mom_GiveItemOrDoll: call ReceiveItem ret - Mom_GetScriptPointer: call GetItemFromMom ld de, 6 ; item type @@ -179,7 +176,6 @@ Mom_GetScriptPointer: writetext _MomText_ItsInRoom end - GetItemFromMom: ld a, [wWhichMomItemSet] and a diff --git a/engine/events/money.asm b/engine/events/money.asm index c4e20fc3e..c8f9d058e 100644 --- a/engine/events/money.asm +++ b/engine/events/money.asm @@ -25,7 +25,6 @@ GiveMoney:: MaxMoney: dt MAX_MONEY - TakeMoney:: ld a, 3 call SubtractMoney @@ -187,7 +186,6 @@ GiveCoins:: .maxcoins bigdw MAX_COINS - TakeCoins:: ld a, 2 ld de, wCoins diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index cd83f8cb3..9cff40a2b 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -271,7 +271,6 @@ DoNPCTrade: pop af ret - GetTradeAttribute: ld d, 0 push de @@ -384,10 +383,8 @@ GetTradeMonNames: ld [hl], "@" ret - INCLUDE "data/events/npc_trades.asm" - PrintTradeText: push af call GetTradeMonNames @@ -433,13 +430,11 @@ TradeTexts: dw TradeAfterText3 dw TradeAfterText4 - ConnectLinkCableText: ; OK, connect the Game Link Cable. text_jump UnknownText_0x1bd407 db "@" - TradedForText: ; traded givemon for getmon text_jump UnknownText_0x1bd429 @@ -456,7 +451,6 @@ TradedForText: text_jump UnknownText_0x1bd445 db "@" - TradeIntroText1: ; I collect #MON. Do you have @ ? Want to trade it for my @ ? text_jump UnknownText_0x1bd449 @@ -482,7 +476,6 @@ TradeAfterText1: text_jump UnknownText_0x1bd4f4 db "@" - TradeIntroText2: TradeIntroText3: ; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ? @@ -511,7 +504,6 @@ TradeAfterText2: text_jump UnknownText_0x1bd5f4 db "@" - TradeIntroText4: ; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ? text_jump UnknownText_0x1bd621 @@ -537,7 +529,6 @@ TradeAfterText4: text_jump UnknownText_0x1bd6f5 db "@" - TradeCompleteText3: ; Uh? What happened? text_jump UnknownText_0x1bd731 diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 749964707..e57635fef 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -276,10 +276,8 @@ CheckOverworldTileArrays: xor a ret - INCLUDE "data/events/field_move_blocks.asm" - OWFlash: call .CheckUseFlash and $7f diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index 6f30e24b8..dc99cb536 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -48,7 +48,6 @@ PokeSeer: call PrintSeerText ret - SeerAction: ld a, [wSeerAction] ld hl, SeerActions @@ -337,7 +336,6 @@ SeerCancelText: text_jump UnknownText_0x1c4955 db "@" - SeerAdvice: ld a, MON_LEVEL call GetPartyParamLocation @@ -398,7 +396,6 @@ SeerAdvice5: text_jump UnknownText_0x1c4ae5 db "@" - GetCaughtGender: ld hl, MON_CAUGHTGENDER add hl, bc diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index ed7087e35..9e231f449 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -1,3 +1,6 @@ +UNOWNSTAMP_BOLD_A EQUS "\"♂\"" ; $ef +UNOWNSTAMP_BOLD_B EQUS "\"♀\"" ; $f5 + _UnownPrinter: ld a, [wUnownDex] and a @@ -15,12 +18,12 @@ _UnownPrinter: call ClearTileMap ld de, UnownDexATile - ld hl, vTiles1 tile $6f + ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A lb bc, BANK(UnownDexBTile), 1 call Request1bpp ld de, UnownDexBTile - ld hl, vTiles1 tile $75 + ld hl, vTiles0 tile UNOWNSTAMP_BOLD_B lb bc, BANK(UnownDexBTile), 1 call Request1bpp @@ -200,8 +203,8 @@ UnownDexDoWhatString: db "Do what?@" UnownDexMenuString: - db "♂ PRINT" - next "♀ CANCEL" + db UNOWNSTAMP_BOLD_A, " PRINT" + next UNOWNSTAMP_BOLD_B, " CANCEL" next "← PREVIOUS" next "→ NEXT" db "@" diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index 6ac6eeb08..c6d909afe 100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -1,7 +1,6 @@ MANIA_OT_ID EQU 00518 GiveShuckle: - ; Adding to the party. xor a ld [wMonType], a diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 8d340a79d..35d32dde6 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -291,7 +291,6 @@ ActivateFishingSwarm: ld [wFishingSwarmFlag], a ret - StoreSwarmMapIndices:: ld a, c and a @@ -310,7 +309,6 @@ StoreSwarmMapIndices:: ld [wYanmaMapNumber], a ret - CheckPokerus: ; Check if a monster in your party has Pokerus farcall _CheckPokerus @@ -377,12 +375,10 @@ SnorlaxAwake: db 36, 9 ; right db -1 - PlayCurMonCry: ld a, [wCurPartySpecies] jp PlayMonCry - GameboyCheck: ld a, [hCGB] and a @@ -404,7 +400,6 @@ GameboyCheck: ld [wScriptVar], a ret - FadeOutMusic: ld a, LOW(MUSIC_NONE) ld [wMusicFadeID], a diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 222af41c7..28272405c 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -1850,7 +1850,6 @@ CoinVendor_IntroScript: closetext end - .MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 4, 15, TEXTBOX_Y - 1 @@ -1864,7 +1863,6 @@ CoinVendor_IntroScript: db "500 : ¥10000@" db "CANCEL@" - HappinessCheckScript: faceplayer opentext diff --git a/engine/events/treemons.asm b/engine/events/treemons.asm index 1fdeceb0a..cd78421d6 100644 --- a/engine/events/treemons.asm +++ b/engine/events/treemons.asm @@ -27,7 +27,6 @@ TreeMonEncounter: ret RockMonEncounter: - xor a ld [wTempWildMonSpecies], a ld [wCurPartyLevel], a diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index bf5a2257c..82b7a4868 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -59,7 +59,6 @@ HalveMoney: ld [hl], a ret - GetWhiteoutSpawn: ld a, [wLastSpawnMapGroup] ld d, a |