diff options
Diffstat (limited to 'engine/events')
41 files changed, 469 insertions, 680 deletions
diff --git a/engine/events/basement_key.asm b/engine/events/basement_key.asm index 64c172ac2..d30149fbe 100644 --- a/engine/events/basement_key.asm +++ b/engine/events/basement_key.asm @@ -27,7 +27,6 @@ _BasementKey: ld [wItemEffectSucceeded], a ret -.BasementKeyScript: ; 0x507e1 +.BasementKeyScript: closetext farjump BasementDoorScript -; 0x507e6 diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index e1aa177e9..59ec3a1a4 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -330,7 +330,7 @@ ReadBTTrainerParty: jr .done_trainer_name .trainer_name_okay - ld hl, wBT_OTTempName ; 0xc608 + ld hl, wBT_OTTempName .done_trainer_name ld de, wOTPlayerName @@ -1564,7 +1564,7 @@ BattleTowerAction_UbersCheck: ; BattleTowerAction $19 ld [wScriptVar], a ret -LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44 +LoadOpponentTrainerAndPokemonWithOTSprite: farcall Function_LoadOpponentTrainerAndPokemons ld a, [rSVBK] push af diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 49b7b1af0..6a2990118 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -20,11 +20,10 @@ CheckForMobileBattleRules: dw JumpText_NeedAtLeastThreeMon dw JumpText_EggDoesNotQualify -.ExcuseMeText: ; 0x8b1fc +.ExcuseMeText: ; Excuse me! text_jump UnknownText_0x1c5937 db "@" -; 0x8b201 _CheckForBattleTowerRules: ld hl, wStringBuffer2 @@ -56,58 +55,50 @@ _CheckForBattleTowerRules: dw JumpText_TheMonMustNotHoldTheSameItems dw JumpText_YouCantTakeAnEgg -JumpText_ExcuseMeYoureNotReady: ; 0x8b22c +JumpText_ExcuseMeYoureNotReady: ; Excuse me. You're not ready. text_jump Text_ExcuseMeYoureNotReady db "@" -; 0x8b231 BattleTower_PleaseReturnWhenReady: ld hl, .PleaseReturnWhenReady call PrintText ret -.PleaseReturnWhenReady: ; 0x8b238 +.PleaseReturnWhenReady: ; Please return when you're ready. text_jump UnknownText_0x1c5962 db "@" -; 0x8b23d -JumpText_NeedAtLeastThreeMon: ; 0x8b23d +JumpText_NeedAtLeastThreeMon: ; You need at least three #MON. text_jump UnknownText_0x1c5983 db "@" -; 0x8b242 -JumpText_EggDoesNotQualify: ; 0x8b242 +JumpText_EggDoesNotQualify: ; Sorry, an EGG doesn't qualify. text_jump UnknownText_0x1c59a3 db "@" -; 0x8b247 -JumpText_OnlyThreeMonMayBeEntered: ; 0x8b247 +JumpText_OnlyThreeMonMayBeEntered: ; Only three #MON may be entered. text_jump Text_OnlyThreeMonMayBeEntered db "@" -; 0x8b24c -JumpText_TheMonMustAllBeDifferentKinds: ; 0x8b24c +JumpText_TheMonMustAllBeDifferentKinds: ; The @ #MON must all be different kinds. text_jump Text_TheMonMustAllBeDifferentKinds db "@" -; 0x8b251 -JumpText_TheMonMustNotHoldTheSameItems: ; 0x8b251 +JumpText_TheMonMustNotHoldTheSameItems: ; The @ #MON must not hold the same items. text_jump Text_TheMonMustNotHoldTheSameItems db "@" -; 0x8b256 -JumpText_YouCantTakeAnEgg: ; 0x8b256 +JumpText_YouCantTakeAnEgg: ; You can't take an EGG! text_jump Text_YouCantTakeAnEgg db "@" -; 0x8b25b BattleTower_ExecuteJumptable: ld bc, 0 diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm index 968bd4366..1172717d6 100644 --- a/engine/events/battle_tower/trainer_text.asm +++ b/engine/events/battle_tower/trainer_text.asm @@ -233,485 +233,485 @@ BTFemaleTrainerTexts: dw BTWinF15 -BTGreetingM1: ; 0x11f42e +BTGreetingM1: text_jump BattleTowerText_0x1ec000 db "@" -BTLossM1: ; 0x11f433 +BTLossM1: text_jump BattleTowerText_0x1ec03b db "@" -BTWinM1: ; 0x11f438 +BTWinM1: text_jump UnknownText_0x1ec060 db "@" -BTGreetingM2: ; 0x11f43d +BTGreetingM2: text_jump BattleTowerText_0x1ec080 db "@" -BTLossM2: ; 0x11f442 +BTLossM2: text_jump UnknownText_0x1ec0a3 db "@" -BTWinM2: ; 0x11f447 +BTWinM2: text_jump UnknownText_0x1ec0c4 db "@" -BTGreetingM3: ; 0x11f44c +BTGreetingM3: text_jump UnknownText_0x1ec0e1 db "@" -BTLossM3: ; 0x11f451 +BTLossM3: text_jump UnknownText_0x1ec108 db "@" -BTWinM3: ; 0x11f456 +BTWinM3: text_jump UnknownText_0x1ec12a db "@" -BTGreetingM4: ; 0x11f45b +BTGreetingM4: text_jump UnknownText_0x1ec14d db "@" -BTLossM4: ; 0x11f460 +BTLossM4: text_jump UnknownText_0x1ec16f db "@" -BTWinM4: ; 0x11f465 +BTWinM4: text_jump UnknownText_0x1ec190 db "@" -BTGreetingM5: ; 0x11f46a +BTGreetingM5: text_jump UnknownText_0x1ec1ae db "@" -BTLossM5: ; 0x11f46f +BTLossM5: text_jump UnknownText_0x1ec1d0 db "@" -BTWinM5: ; 0x11f474 +BTWinM5: text_jump UnknownText_0x1ec1f4 db "@" -BTGreetingM6: ; 0x11f479 +BTGreetingM6: text_jump UnknownText_0x1ec216 db "@" -BTLossM6: ; 0x11f47e +BTLossM6: text_jump UnknownText_0x1ec238 db "@" -BTWinM6: ; 0x11f483 +BTWinM6: text_jump UnknownText_0x1ec259 db "@" -BTGreetingM7: ; 0x11f488 +BTGreetingM7: text_jump UnknownText_0x1ec27b db "@" -BTLossM7: ; 0x11f48d +BTLossM7: text_jump UnknownText_0x1ec2a0 db "@" -BTWinM7: ; 0x11f492 +BTWinM7: text_jump UnknownText_0x1ec2c0 db "@" -BTGreetingM8: ; 0x11f497 +BTGreetingM8: text_jump UnknownText_0x1ec2d9 db "@" -BTLossM8: ; 0x11f49c +BTLossM8: text_jump UnknownText_0x1ec2fe db "@" -BTWinM8: ; 0x11f4a1 +BTWinM8: text_jump UnknownText_0x1ec320 db "@" -BTGreetingM9: ; 0x11f4a6 +BTGreetingM9: text_jump UnknownText_0x1ec33f db "@" -BTLossM9: ; 0x11f4ab +BTLossM9: text_jump UnknownText_0x1ec36c db "@" -BTWinM9: ; 0x11f4b0 +BTWinM9: text_jump UnknownText_0x1ec389 db "@" -BTGreetingM10: ; 0x11f4b5 +BTGreetingM10: text_jump UnknownText_0x1ec3ad db "@" -BTLossM10: ; 0x11f4ba +BTLossM10: text_jump UnknownText_0x1ec3c5 db "@" -BTWinM10: ; 0x11f4bf +BTWinM10: text_jump UnknownText_0x1ec3e5 db "@" -BTGreetingM11: ; 0x11f4c4 +BTGreetingM11: text_jump UnknownText_0x1ec402 db "@" -BTLossM11: ; 0x11f4c9 +BTLossM11: text_jump UnknownText_0x1ec411 db "@" -BTWinM11: ; 0x11f4ce +BTWinM11: text_jump UnknownText_0x1ec41f db "@" -BTGreetingM12: ; 0x11f4d3 +BTGreetingM12: text_jump UnknownText_0x1ec42e db "@" -BTLossM12: ; 0x11f4d8 +BTLossM12: text_jump UnknownText_0x1ec461 db "@" -BTWinM12: ; 0x11f4dd +BTWinM12: text_jump UnknownText_0x1ec4a0 db "@" -BTGreetingM13: ; 0x11f4e2 +BTGreetingM13: text_jump UnknownText_0x1ec4d6 db "@" -BTLossM13: ; 0x11f4e7 +BTLossM13: text_jump UnknownText_0x1ec4f5 db "@" -BTWinM13: ; 0x11f4ec +BTWinM13: text_jump UnknownText_0x1ec512 db "@" -BTGreetingM14: ; 0x11f4f1 +BTGreetingM14: text_jump UnknownText_0x1ec532 db "@" -BTLossM14: ; 0x11f4f6 +BTLossM14: text_jump UnknownText_0x1ec54b db "@" -BTWinM14: ; 0x11f4fb +BTWinM14: text_jump UnknownText_0x1ec565 db "@" -BTGreetingM15: ; 0x11f500 +BTGreetingM15: text_jump UnknownText_0x1ec580 db "@" -BTLossM15: ; 0x11f505 +BTLossM15: text_jump UnknownText_0x1ec59d db "@" -BTWinM15: ; 0x11f50a +BTWinM15: text_jump UnknownText_0x1ec5b5 db "@" -BTGreetingM16: ; 0x11f50f +BTGreetingM16: text_jump UnknownText_0x1ec5d3 db "@" -BTLossM16: ; 0x11f514 +BTLossM16: text_jump UnknownText_0x1ec5ee db "@" -BTWinM16: ; 0x11f519 +BTWinM16: text_jump UnknownText_0x1ec60d db "@" -BTGreetingM17: ; 0x11f51e +BTGreetingM17: text_jump UnknownText_0x1ec631 db "@" -BTLossM17: ; 0x11f523 +BTLossM17: text_jump UnknownText_0x1ec651 db "@" -BTWinM17: ; 0x11f528 +BTWinM17: text_jump UnknownText_0x1ec68f db "@" -BTGreetingM18: ; 0x11f52d +BTGreetingM18: text_jump UnknownText_0x1ec6b1 db "@" -BTLossM18: ; 0x11f532 +BTLossM18: text_jump UnknownText_0x1ec6d0 db "@" -BTWinM18: ; 0x11f537 +BTWinM18: text_jump UnknownText_0x1ec708 db "@" -BTGreetingM19: ; 0x11f53c +BTGreetingM19: text_jump UnknownText_0x1ec720 db "@" -BTLossM19: ; 0x11f541 +BTLossM19: text_jump UnknownText_0x1ec73e db "@" -BTWinM19: ; 0x11f546 +BTWinM19: text_jump UnknownText_0x1ec75b db "@" -BTGreetingM20: ; 0x11f54b +BTGreetingM20: text_jump UnknownText_0x1ec77f db "@" -BTLossM20: ; 0x11f550 +BTLossM20: text_jump UnknownText_0x1ec798 db "@" -BTWinM20: ; 0x11f555 +BTWinM20: text_jump UnknownText_0x1ec7bb db "@" -BTGreetingM21: ; 0x11f55a +BTGreetingM21: text_jump UnknownText_0x1ec7d8 db "@" -BTLossM21: ; 0x11f55f +BTLossM21: text_jump UnknownText_0x1ec818 db "@" -BTWinM21: ; 0x11f564 +BTWinM21: text_jump UnknownText_0x1ec837 db "@" -BTGreetingM22: ; 0x11f569 +BTGreetingM22: text_jump UnknownText_0x1ec858 db "@" -BTLossM22: ; 0x11f56e +BTLossM22: text_jump UnknownText_0x1ec876 db "@" -BTWinM22: ; 0x11f573 +BTWinM22: text_jump UnknownText_0x1ec898 db "@" -BTGreetingM23: ; 0x11f578 +BTGreetingM23: text_jump UnknownText_0x1ec8b1 db "@" -BTLossM23: ; 0x11f57d +BTLossM23: text_jump UnknownText_0x1ec8d5 db "@" -BTWinM23: ; 0x11f582 +BTWinM23: text_jump UnknownText_0x1ec8f0 db "@" -BTGreetingM24: ; 0x11f587 +BTGreetingM24: text_jump UnknownText_0x1ec911 db "@" -BTLossM24: ; 0x11f58c +BTLossM24: text_jump UnknownText_0x1ec928 db "@" -BTWinM24: ; 0x11f591 +BTWinM24: text_jump UnknownText_0x1ec949 db "@" -BTGreetingM25: ; 0x11f596 +BTGreetingM25: text_jump UnknownText_0x1ec969 db "@" -BTLossM25: ; 0x11f59b +BTLossM25: text_jump UnknownText_0x1ec986 db "@" -BTWinM25: ; 0x11f5a0 +BTWinM25: text_jump UnknownText_0x1ec99b db "@" -BTGreetingF1: ; 0x11f5a5 +BTGreetingF1: text_jump UnknownText_0x1ec9bd db "@" -BTLossF1: ; 0x11f5aa +BTLossF1: text_jump UnknownText_0x1ec9d9 db "@" -BTWinF1: ; 0x11f5af +BTWinF1: text_jump UnknownText_0x1ec9f7 db "@" -BTGreetingF2: ; 0x11f5b4 +BTGreetingF2: text_jump UnknownText_0x1eca0a db "@" -BTLossF2: ; 0x11f5b9 +BTLossF2: text_jump UnknownText_0x1eca2a db "@" -BTWinF2: ; 0x11f5be +BTWinF2: text_jump UnknownText_0x1eca47 db "@" -BTGreetingF3: ; 0x11f5c3 +BTGreetingF3: text_jump UnknownText_0x1eca64 db "@" -BTLossF3: ; 0x11f5c8 +BTLossF3: text_jump UnknownText_0x1eca82 db "@" -BTWinF3: ; 0x11f5cd +BTWinF3: text_jump UnknownText_0x1eca9d db "@" -BTGreetingF4: ; 0x11f5d2 +BTGreetingF4: text_jump UnknownText_0x1ecabf db "@" -BTLossF4: ; 0x11f5d7 +BTLossF4: text_jump UnknownText_0x1ecade db "@" -BTWinF4: ; 0x11f5dc +BTWinF4: text_jump UnknownText_0x1ecafa db "@" -BTGreetingF5: ; 0x11f5e1 +BTGreetingF5: text_jump UnknownText_0x1ecb19 db "@" -BTLossF5: ; 0x11f5e6 +BTLossF5: text_jump UnknownText_0x1ecb37 db "@" -BTWinF5: ; 0x11f5eb +BTWinF5: text_jump UnknownText_0x1ecb55 db "@" -BTGreetingF6: ; 0x11f5f0 +BTGreetingF6: text_jump UnknownText_0x1ecb70 db "@" -BTLossF6: ; 0x11f5f5 +BTLossF6: text_jump UnknownText_0x1ecb92 db "@" -BTWinF6: ; 0x11f5fa +BTWinF6: text_jump UnknownText_0x1ecbb6 db "@" -BTGreetingF7: ; 0x11f5ff +BTGreetingF7: text_jump UnknownText_0x1ecbd9 db "@" -BTLossF7: ; 0x11f604 +BTLossF7: text_jump UnknownText_0x1ecbf3 db "@" -BTWinF7: ; 0x11f609 +BTWinF7: text_jump UnknownText_0x1ecc15 db "@" -BTGreetingF8: ; 0x11f60e +BTGreetingF8: text_jump UnknownText_0x1ecc39 db "@" -BTLossF8: ; 0x11f613 +BTLossF8: text_jump UnknownText_0x1ecc55 db "@" -BTWinF8: ; 0x11f618 +BTWinF8: text_jump UnknownText_0x1ecc75 db "@" -BTGreetingF9: ; 0x11f61d +BTGreetingF9: text_jump UnknownText_0x1ecc92 db "@" -BTLossF9: ; 0x11f622 +BTLossF9: text_jump UnknownText_0x1ecca7 db "@" -BTWinF9: ; 0x11f627 +BTWinF9: text_jump UnknownText_0x1eccc1 db "@" -BTGreetingF10: ; 0x11f62c +BTGreetingF10: text_jump UnknownText_0x1eccd7 db "@" -BTLossF10: ; 0x11f631 +BTLossF10: text_jump UnknownText_0x1eccef db "@" -BTWinF10: ; 0x11f636 +BTWinF10: text_jump UnknownText_0x1ecd0e db "@" -BTGreetingF11: ; 0x11f63b +BTGreetingF11: text_jump UnknownText_0x1ecd2b db "@" -BTLossF11: ; 0x11f640 +BTLossF11: text_jump UnknownText_0x1ecd4d db "@" -BTWinF11: ; 0x11f645 +BTWinF11: text_jump UnknownText_0x1ecd6b db "@" -BTGreetingF12: ; 0x11f64a +BTGreetingF12: text_jump UnknownText_0x1ecd8d db "@" -BTLossF12: ; 0x11f64f +BTLossF12: text_jump UnknownText_0x1ecdaf db "@" -BTWinF12: ; 0x11f654 +BTWinF12: text_jump UnknownText_0x1ecdcf db "@" -BTGreetingF13: ; 0x11f659 +BTGreetingF13: text_jump UnknownText_0x1ecded db "@" -BTLossF13: ; 0x11f65e +BTLossF13: text_jump UnknownText_0x1ece0d db "@" -BTWinF13: ; 0x11f663 +BTWinF13: text_jump UnknownText_0x1ece2a db "@" -BTGreetingF14: ; 0x11f668 +BTGreetingF14: text_jump UnknownText_0x1ece4b db "@" -BTLossF14: ; 0x11f66d +BTLossF14: text_jump UnknownText_0x1ece70 db "@" -BTWinF14: ; 0x11f672 +BTWinF14: text_jump UnknownText_0x1ece8a db "@" -BTGreetingF15: ; 0x11f677 +BTGreetingF15: text_jump UnknownText_0x1ecea8 db "@" -BTLossF15: ; 0x11f67c +BTLossF15: text_jump UnknownText_0x1ecec9 db "@" -BTWinF15: ; 0x11f681 +BTWinF15: text_jump UnknownText_0x1ecee8 db "@" diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 637fa0862..c5260760a 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -27,21 +27,19 @@ BuenasPassword: ld [wScriptVar], a ret -.MenuHeader: ; 0x8afa9 +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, 7 dw .MenuData db 1 ; default option -; 0x8afb1 db 0 -.MenuData: ; 0x8afb2 +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 0 ; items dw .PasswordIndices dw .PlacePasswordChoices -; 0x8afb4 .PasswordIndices: db NUM_PASSWORDS_PER_CATEGORY @@ -148,40 +146,34 @@ BuenaPrize: call PlayClickSFX ret -.Text_AskWhichPrize: ; 0x8b072 +.Text_AskWhichPrize: ; Which prize would you like? text_jump UnknownText_0x1c589f db "@" -; 0x8b077 -.Text_IsThatRight: ; 0x8b077 +.Text_IsThatRight: ; ? Is that right? text_jump UnknownText_0x1c58bc db "@" -; 0x8b07c .Text_HereYouGo: ; Here you go! text_jump UnknownText_0x1c58d1 db "@" -; 0x8b081 -.Text_NotEnoughPoints: ; 0x8b081 +.Text_NotEnoughPoints: ; You don't have enough points. text_jump UnknownText_0x1c58e0 db "@" -; 0x8b086 -.Text_NoRoom: ; 0x8b086 +.Text_NoRoom: ; You have no room for it. text_jump UnknownText_0x1c58ff db "@" -; 0x8b08b -.Text_PleaseComeBackAgain: ; 0x8b08b +.Text_PleaseComeBackAgain: ; Oh. Please come back again! text_jump UnknownText_0x1c591a db "@" -; 0x8b090 Buena_DisplayBlueCardBalance: ld hl, BlueCardBalanceMenuHeader @@ -220,7 +212,7 @@ PrintBlueCardBalance: .Points_string: db "Points@" -BlueCardBalanceMenuHeader: ; 0x8b0d1 +BlueCardBalanceMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 11, 11, 13 @@ -229,7 +221,7 @@ Buena_PlacePrizeMenuBox: call LoadMenuHeader ret -.MenuHeader ; 0x8b0dd +.MenuHeader db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 17, TEXTBOX_Y - 1 @@ -259,16 +251,15 @@ Buena_PrizeMenu: xor a ret -.MenuHeader: ; 0x8b113 +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 1, 1, 16, 9 dw .MenuData db 1 ; default option -; 0x8b11b db 0 -.MenuData: ; 0x8b11c +.MenuData: db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 13 ; rows, columns db 1 ; spacing diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm index fcde2b70a..45212ae3e 100644 --- a/engine/events/bug_contest/caught_mon.asm +++ b/engine/events/bug_contest/caught_mon.asm @@ -32,7 +32,7 @@ BugContest_SetCaughtContestMon: ld hl, wContestMon jp GeneratePartyMonStats -.caughttext ; 0xe71d +.caughttext ; Caught @ ! text_jump UnknownText_0x1c10c0 db "@" diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index e08a434e0..4cf4f949a 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -6,7 +6,7 @@ GiveParkBalls: farcall StartBugContestTimer ret -BugCatchingContestBattleScript:: ; 0x135eb +BugCatchingContestBattleScript:: writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST randomwildmon startbattle @@ -15,29 +15,29 @@ BugCatchingContestBattleScript:: ; 0x135eb iffalse BugCatchingContestOutOfBallsScript end -BugCatchingContestOverScript:: ; 0x135f8 +BugCatchingContestOverScript:: playsound SFX_ELEVATOR_END opentext writetext BugCatchingContestText_BeeepTimesUp waitbutton jump BugCatchingContestReturnToGateScript -BugCatchingContestOutOfBallsScript: ; 0x13603 +BugCatchingContestOutOfBallsScript: playsound SFX_ELEVATOR_END opentext writetext BugCatchingContestText_ContestIsOver waitbutton -BugCatchingContestReturnToGateScript: ; 0x1360b +BugCatchingContestReturnToGateScript: closetext jumpstd bugcontestresultswarp -BugCatchingContestText_BeeepTimesUp: ; 0x1360f +BugCatchingContestText_BeeepTimesUp: ; ANNOUNCER: BEEEP! Time's up! text_jump UnknownText_0x1bd2ca db "@" -BugCatchingContestText_ContestIsOver: ; 0x13614 +BugCatchingContestText_ContestIsOver: ; ANNOUNCER: The Contest is over! text_jump UnknownText_0x1bd2e7 db "@" diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 21380149b..94a5e9511 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -96,7 +96,7 @@ DisplayAlreadyCaughtText: ld hl, .AlreadyCaughtText jp PrintText -.AlreadyCaughtText: ; 0xcc0d0 +.AlreadyCaughtText: ; You already caught a @ . text_jump UnknownText_0x1c10dd db "@" diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index 8a77f6ab7..0f5ff2b7c 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -25,7 +25,7 @@ _BugContestJudging: call PrintText jp BugContest_GetPlayersResult -BugContest_FirstPlaceText: ; 0x136eb +BugContest_FirstPlaceText: text_jump ContestJudging_FirstPlaceText start_asm ld de, SFX_1ST_PLACE @@ -34,13 +34,12 @@ BugContest_FirstPlaceText: ; 0x136eb ld hl, BugContest_FirstPlaceScoreText ret -BugContest_FirstPlaceScoreText: ; 0x136fd +BugContest_FirstPlaceScoreText: ; The winning score was @ points! text_jump ContestJudging_FirstPlaceScoreText db "@" -; 0x13702 -BugContest_SecondPlaceText: ; 0x13702 +BugContest_SecondPlaceText: ; Placing second was @ , who caught a @ !@ @ text_jump ContestJudging_SecondPlaceText start_asm @@ -50,13 +49,12 @@ BugContest_SecondPlaceText: ; 0x13702 ld hl, BugContest_SecondPlaceScoreText ret -BugContest_SecondPlaceScoreText: ; 0x13714 +BugContest_SecondPlaceScoreText: ; The score was @ points! text_jump ContestJudging_SecondPlaceScoreText db "@" -; 0x13719 -BugContest_ThirdPlaceText: ; 0x13719 +BugContest_ThirdPlaceText: ; Placing third was @ , who caught a @ !@ @ text_jump ContestJudging_ThirdPlaceText start_asm @@ -66,11 +64,10 @@ BugContest_ThirdPlaceText: ; 0x13719 ld hl, BugContest_ThirdPlaceScoreText ret -BugContest_ThirdPlaceScoreText: ; 0x1372b +BugContest_ThirdPlaceScoreText: ; The score was @ points! text_jump ContestJudging_ThirdPlaceScoreText db "@" -; 0x13730 LoadContestantName: ; If a = 1, get your name. diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm index 6a2dda75d..eb013cfa2 100644 --- a/engine/events/card_key.asm +++ b/engine/events/card_key.asm @@ -32,7 +32,6 @@ _CardKey: ld [wItemEffectSucceeded], a ret -.CardKeyScript: ; 0x507af +.CardKeyScript: closetext farjump CardKeySlotScript -; 0x507b4 diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 904a4b698..5904a476d 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -166,11 +166,10 @@ DayCareAskDepositPokemon: scf ret -.DummyText: ; 0x167f1 +.DummyText: ; text_jump UnknownText_0x1bdaa7 db "@" -; 0x167f6 DayCare_DepositPokemonText: ld a, DAYCARETEXT_DEPOSIT @@ -296,125 +295,105 @@ PrintDayCareText: dw .OhFineThen ; 12 dw .ComeAgain ; 13 -.DayCareManIntro: ; 0x168d2 +.DayCareManIntro: ; I'm the DAY-CARE MAN. Want me to raise a #MON? text_jump UnknownText_0x1bdaa9 db "@" -; 0x168d7 -.DayCareManOddEgg: ; 0x168d7 +.DayCareManOddEgg: ; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON? text_jump UnknownText_0x1bdad8 db "@" -; 0x168dc -.DayCareLadyIntro: ; 0x168dc +.DayCareLadyIntro: ; I'm the DAY-CARE LADY. Should I raise a #MON for you? text_jump UnknownText_0x1bdb85 db "@" -; 0x168e1 -.DayCareLadyOddEgg: ; 0x168e1 +.DayCareLadyOddEgg: ; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you? text_jump UnknownText_0x1bdbbb db "@" -; 0x168e6 -.WhichOne: ; 0x168e6 +.WhichOne: ; What should I raise for you? text_jump UnknownText_0x1bdc79 db "@" -; 0x168eb -.JustOneMon: ; 0x168eb +.JustOneMon: ; Oh? But you have just one #MON. text_jump UnknownText_0x1bdc97 db "@" -; 0x168f0 -.CantAcceptEgg: ; 0x168f0 +.CantAcceptEgg: ; Sorry, but I can't accept an EGG. text_jump UnknownText_0x1bdcb8 db "@" -; 0x168f5 -.RemoveMail: ; 0x168f5 +.RemoveMail: ; Remove MAIL before you come see me. text_jump UnknownText_0x1bdcda db "@" -; 0x168fa -.LastHealthyMon: ; 0x168fa +.LastHealthyMon: ; If you give me that, what will you battle with? text_jump UnknownText_0x1bdcff db "@" -; 0x168ff -.OkayIllRaiseYourMon: ; 0x168ff +.OkayIllRaiseYourMon: ; OK. I'll raise your @ . text_jump UnknownText_0x1bdd30 db "@" -; 0x16904 -.ComeBackForItLater: ; 0x16904 +.ComeBackForItLater: ; Come back for it later. text_jump UnknownText_0x1bdd4b db "@" -; 0x16909 -.AreWeGeniusesOrWhat: ; 0x16909 +.AreWeGeniusesOrWhat: ; Are we geniuses or what? Want to see your @ ? text_jump UnknownText_0x1bdd64 db "@" -; 0x1690e -.AskRetrieveMon: ; 0x1690e +.AskRetrieveMon: ; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ . text_jump UnknownText_0x1bdd96 db "@" -; 0x16913 -.PerfectHeresYourMon: ; 0x16913 +.PerfectHeresYourMon: ; Perfect! Here's your #MON. text_jump UnknownText_0x1bde04 db "@" -; 0x16918 -.GotBackMon: ; 0x16918 +.GotBackMon: ; got back @ . text_jump UnknownText_0x1bde1f db "@" -; 0x1691d -.ImmediatelyWithdrawMon: ; 0x1691d +.ImmediatelyWithdrawMon: ; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100. text_jump UnknownText_0x1bde32 db "@" -; 0x16922 -.PartyFull: ; 0x16922 +.PartyFull: ; You have no room for it. text_jump UnknownText_0x1bdea2 db "@" -; 0x16927 -.NotEnoughMoney: ; 0x16927 +.NotEnoughMoney: ; You don't have enough money. text_jump UnknownText_0x1bdebc db "@" -; 0x1692c -.OhFineThen: ; 0x1692c +.OhFineThen: ; Oh, fine then. text_jump UnknownText_0x1bded9 db "@" -; 0x16931 -.ComeAgain: ; 0x16931 +.ComeAgain: ; Come again. text_jump UnknownText_0x1bdee9 db "@" -; 0x16936 DayCareManOutside: ld hl, wDayCareMan @@ -424,11 +403,10 @@ DayCareManOutside: call PrintText ret -.NotYet: ; 0x16944 +.NotYet: ; Not yet… text_jump UnknownText_0x1bdef6 db "@" -; 0x16949 .AskGiveEgg: ld hl, .IntroText @@ -467,35 +445,30 @@ DayCareManOutside: ld [wScriptVar], a ret -.IntroText: ; 0x16993 +.IntroText: ; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it? text_jump UnknownText_0x1bdf00 db "@" -; 0x16998 -.GotEggText: ; 0x16998 +.GotEggText: ; received the EGG! text_jump UnknownText_0x1bdfa5 db "@" -; 0x1699d -.TakeGoodCareOfItText: ; 0x1699d +.TakeGoodCareOfItText: ; Take good care of it. text_jump UnknownText_0x1bdfba db "@" -; 0x169a2 -.IllKeepItThanksText: ; 0x169a2 +.IllKeepItThanksText: ; Well then, I'll keep it. Thanks! text_jump UnknownText_0x1bdfd1 db "@" -; 0x169a7 -.PartyFullText: ; 0x169a7 +.PartyFullText: ; You have no room in your party. Come back later. text_jump UnknownText_0x1bdff2 db "@" -; 0x169ac DayCare_GiveEgg: ld a, [wEggMonLevel] diff --git a/engine/events/dratini.asm b/engine/events/dratini.asm index 7d8a224ba..2dd97eaee 100644 --- a/engine/events/dratini.asm +++ b/engine/events/dratini.asm @@ -1,4 +1,4 @@ -GiveDratini: ; 0x8b170 +GiveDratini: ; if wScriptVar is 0 or 1, change the moveset of the last Dratini in the party. ; 0: give it a special moveset with Extremespeed. ; 1: give it the normal moveset of a level 15 Dratini. @@ -84,7 +84,7 @@ GiveDratini: ; 0x8b170 db TWISTER db 0 -.GetNthPartyMon: ; 0x8b1ce +.GetNthPartyMon: ; inputs: ; hl must be set to 0 before calling this function. ; a must be set to the number of Pokémon in the party. diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 377560071..76ef11d6a 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -137,11 +137,10 @@ Elevator_AskWhichFloor: scf ret -Elevator_WhichFloorText: ; 0x1350d +Elevator_WhichFloorText: ; Which floor? text_jump UnknownText_0x1bd2bc db "@" -; 0x13512 Elevator_GetCurrentFloorText: @@ -178,14 +177,13 @@ Elevator_GetCurrentFloorString: call GetFloorString ret -Elevator_MenuHeader: ; 0x13550 +Elevator_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 12, 1, 18, 9 dw Elevator_MenuData db 1 ; default option -; 0x13558 -Elevator_MenuData: ; 0x13558 +Elevator_MenuData: db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 0 ; rows, columns db 1 ; horizontal spacing diff --git a/engine/events/forced_movement.asm b/engine/events/forced_movement.asm index 2d03659ff..69f27bfe2 100644 --- a/engine/events/forced_movement.asm +++ b/engine/events/forced_movement.asm @@ -1,60 +1,51 @@ -Script_ForcedMovement:: ; 0x1253d +Script_ForcedMovement:: checkcode VAR_FACING ifequal DOWN, .down ifequal UP, .up ifequal LEFT, .left ifequal RIGHT, .right end -; 0x12550 -.up ; 0x12550 +.up applymovement PLAYER, .MovementData_up end -; 0x12555 -.down ; 0x12555 +.down applymovement PLAYER, .MovementData_down end -; 0x1255a -.right ; 0x1255a +.right applymovement PLAYER, .MovementData_right end -; 0x1255f -.left ; 0x1255f +.left applymovement PLAYER, .MovementData_left end -; 0x12564 -.MovementData_up: ; 0x12564 +.MovementData_up: step_dig 16 turn_in DOWN step_dig 16 turn_head DOWN step_end -; 0x1256b -.MovementData_down: ; 0x1256b +.MovementData_down: step_dig 16 turn_in UP step_dig 16 turn_head UP step_end -; 0x12572 -.MovementData_right: ; 0x12572 +.MovementData_right: step_dig 16 turn_in LEFT step_dig 16 turn_head LEFT step_end -; 0x12579 -.MovementData_left: ; 0x12579 +.MovementData_left: step_dig 16 turn_in RIGHT step_dig 16 turn_head RIGHT step_end -; 0x12580 diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 803fc8005..11107cdb3 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -1,6 +1,6 @@ HALLOFFAME_COLON EQU $63 -HallOfFame:: ; 0x8640e +HallOfFame:: call HallOfFame_FadeOutMusic ld a, [wStatusFlags] push af @@ -33,7 +33,6 @@ HallOfFame:: ; 0x8640e ld b, a farcall Credits ret -; 0x86455 RedCredits:: ld a, LOW(MUSIC_NONE) diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm index 9727cdac9..6a4d6edf3 100644 --- a/engine/events/itemfinder.asm +++ b/engine/events/itemfinder.asm @@ -26,31 +26,27 @@ ItemFinder: jr nz, .sfx_loop ret -.Script_FoundSomething: ; 0x125ad +.Script_FoundSomething: reloadmappart special UpdateTimePals callasm .ItemfinderSound writetext .Text_FoundSomething closetext end -; 0x125ba -.Script_FoundNothing: ; 0x125ba +.Script_FoundNothing: reloadmappart special UpdateTimePals writetext .Text_FoundNothing closetext end -; 0x125c3 -.Text_FoundSomething: ; 0x125c3 +.Text_FoundSomething: ; Yes! ITEMFINDER indicates there's an item nearby. text_jump UnknownText_0x1c0a77 db "@" -; 0x125c8 -.Text_FoundNothing: ; 0x125c8 +.Text_FoundNothing: ; Nope! ITEMFINDER isn't responding. text_jump UnknownText_0x1c0aa9 db "@" -; 0x125cd diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index a40702f9e..d4342b3e4 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -3,22 +3,20 @@ Kurt_PrintTextWhichApricorn: call PrintText ret -.Text: ; 0x88007 +.Text: ; Which APRICORN should I use? text_jump UnknownText_0x1bc06b db "@" -; 0x8800c Kurt_PrintTextHowMany: ld hl, .Text call PrintText ret -.Text: ; 0x88013 +.Text: ; How many should I make? text_jump UnknownText_0x1bc089 db "@" -; 0x88018 SelectApricornForKurt: call LoadStandardMenuHeader @@ -79,16 +77,15 @@ Kurt_SelectApricorn: ld c, a ret -.MenuHeader: ; 0x88086 +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 1, 1, 13, 10 dw .MenuData db 1 ; default option -; 0x8808e db 0 ; XXX -.MenuData: ; 0x8808f +.MenuData: db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 7 db 1 @@ -150,7 +147,7 @@ Kurt_SelectQuantity: call CloseWindow ret -.MenuHeader: ; 0x8810d +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 6, 9, SCREEN_WIDTH - 1, 12 dw NULL diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 2dff44fcf..c5d6d18e0 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -206,12 +206,12 @@ CheckForLuckyNumberWinners: dba sBox13 dba sBox14 -.FoundPartymonText: ; 0x4d9c9 +.FoundPartymonText: ; Congratulations! We have a match with the ID number of @ in your party. text_jump UnknownText_0x1c1261 db "@" -.FoundBoxmonText: ; 0x4d9ce +.FoundBoxmonText: ; Congratulations! We have a match with the ID number of @ in your PC BOX. text_jump UnknownText_0x1c12ae db "@" diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 06f077b62..31e8de201 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -71,11 +71,10 @@ CheckMagikarpLength: ld [wScriptVar], a ret -.MeasureItText: ; 0xfbba9 +.MeasureItText: ; Let me measure that MAGIKARP. …Hm, it measures @ . text_jump UnknownText_0x1c1203 db "@" -; 0xfbbae Magikarp_LoadFeetInchesChars: ld hl, vTiles2 tile "′" ; $6e @@ -315,8 +314,7 @@ MagikarpHouseSign: call PrintText ret -.CurrentRecordtext: ; 0xfbce8 +.CurrentRecordtext: ; "CURRENT RECORD" text_jump UnknownText_0x1c123a db "@" -; 0xfbced diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index 5e78f079e..f88e72c45 100644 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -1,4 +1,4 @@ -Script_AbortBugContest: ; 0x122c1 +Script_AbortBugContest: checkflag ENGINE_BUG_CONTEST_TIMER iffalse .finish setflag ENGINE_DAILY_BUG_CONTEST @@ -6,7 +6,7 @@ Script_AbortBugContest: ; 0x122c1 .finish end -FindItemInBallScript:: ; 0x122ce +FindItemInBallScript:: callasm .TryReceiveItem iffalse .no_room disappear LAST_TALKED @@ -17,9 +17,8 @@ FindItemInBallScript:: ; 0x122ce itemnotify closetext end -; 0x122e3 -.no_room ; 0x122e3 +.no_room opentext writetext .text_found waitbutton @@ -27,19 +26,16 @@ FindItemInBallScript:: ; 0x122ce waitbutton closetext end -; 0x122ee -.text_found ; 0x122ee +.text_found ; found @ ! text_jump UnknownText_0x1c0a1c db "@" -; 0x122f3 -.text_bag_full ; 0x122f3 +.text_bag_full ; But can't carry any more items. text_jump UnknownText_0x1c0a2c db "@" -; 0x122f8 .TryReceiveItem: xor a diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm index e02476816..cb26ce12e 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/misc_scripts_2.asm @@ -1,16 +1,16 @@ -RepelWoreOffScript:: ; 0x13619 +RepelWoreOffScript:: opentext writetext .text waitbutton closetext end -.text ; 0x13620 +.text ; REPEL's effect wore off. text_jump UnknownText_0x1bd308 db "@" -HiddenItemScript:: ; 0x13625 +HiddenItemScript:: opentext copybytetovar wEngineBuffer3 itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0 @@ -22,7 +22,7 @@ HiddenItemScript:: ; 0x13625 itemnotify jump .finish -.bag_full ; 0x1363e +.bag_full buttonsound writetext .no_room_text waitbutton @@ -31,12 +31,12 @@ HiddenItemScript:: ; 0x13625 closetext end -.found_text ; 0x13645 +.found_text ; found @ ! text_jump UnknownText_0x1bd321 db "@" -.no_room_text ; 0x1364a +.no_room_text ; But has no space left… text_jump UnknownText_0x1bd331 db "@" diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 0648ae542..adaee701f 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -389,42 +389,36 @@ DSTChecks: call ClearBox ret -.Text_AdjustClock: ; 0x164f4 +.Text_AdjustClock: ; Do you want to adjust your clock for Daylight Saving Time? text_jump UnknownText_0x1c6095 db "@" -; 0x164f9 -.Text_LostInstructionBooklet: ; 0x164f9 +.Text_LostInstructionBooklet: ; I lost the instruction booklet for the POKéGEAR. ; Come back again in a while. text_jump UnknownText_0x1c60d1 db "@" -; 0x164fe -.Text_SwitchToDST: ; 0x164fe +.Text_SwitchToDST: ; Do you want to switch to Daylight Saving Time? text_jump UnknownText_0x1c6000 db "@" -; 0x16503 -.Text_SetClockForward: ; 0x16503 +.Text_SetClockForward: ; I set the clock forward by one hour. text_jump UnknownText_0x1c6030 db "@" -; 0x16508 -.Text_IsDSTOver: ; 0x16508 +.Text_IsDSTOver: ; Is Daylight Saving Time over? text_jump UnknownText_0x1c6056 db "@" -; 0x1650d -.Text_SetClockBack: ; 0x1650d +.Text_SetClockBack: ; I put the clock back one hour. text_jump UnknownText_0x1c6075 db "@" -; 0x16512 Mom_SetUpWithdrawMenu: ld de, Mon_WithdrawString @@ -596,101 +590,85 @@ Mom_WithdrawDepositMenuJoypad: dt 90 dt 9 -UnknownText_0x16649: ; 0x16649 +UnknownText_0x16649: ; Wow, that's a cute #MON. Where did you get it? … So, you're leaving on an adventure… OK! I'll help too. But what can I do for you? I know! I'll save money for you. On a long journey, money's important. Do you want me to save your money? text_jump UnknownText_0x1bd77f db "@" -; 0x1664e -UnknownText_0x1664e: ; 0x1664e +UnknownText_0x1664e: ; OK, I'll take care of your money. text_jump UnknownText_0x1bd868 db "@" -; 0x16653 -UnknownText_0x16653: ; 0x16653 +UnknownText_0x16653: ; Be careful. #MON are your friends. You need to work as a team. Now, go on! text_jump UnknownText_0x1bd88e db "@" -; 0x16658 -UnknownText_0x16658: ; 0x16658 +UnknownText_0x16658: ; Hi! Welcome home! You're trying very hard, I see. I've kept your room tidy. Or is this about your money? text_jump UnknownText_0x1bd8da db "@" -; 0x1665d -UnknownText_0x1665d: ; 0x1665d +UnknownText_0x1665d: ; What do you want to do? text_jump UnknownText_0x1bd942 db "@" -; 0x16662 -UnknownText_0x16662: ; 0x16662 +UnknownText_0x16662: ; How much do you want to save? text_jump UnknownText_0x1bd95b db "@" -; 0x16667 -UnknownText_0x16667: ; 0x16667 +UnknownText_0x16667: ; How much do you want to take? text_jump UnknownText_0x1bd97a db "@" -; 0x1666c -UnknownText_0x1666c: ; 0x1666c +UnknownText_0x1666c: ; Do you want to save some money? text_jump UnknownText_0x1bd999 db "@" -; 0x16671 -UnknownText_0x16671: ; 0x16671 +UnknownText_0x16671: ; You haven't saved that much. text_jump UnknownText_0x1bd9ba db "@" -; 0x16676 -UnknownText_0x16676: ; 0x16676 +UnknownText_0x16676: ; You can't take that much. text_jump UnknownText_0x1bd9d7 db "@" -; 0x1667b -UnknownText_0x1667b: ; 0x1667b +UnknownText_0x1667b: ; You don't have that much. text_jump UnknownText_0x1bd9f1 db "@" -; 0x16680 -UnknownText_0x16680: ; 0x16680 +UnknownText_0x16680: ; You can't save that much. text_jump UnknownText_0x1bda0b db "@" -; 0x16685 -UnknownText_0x16685: ; 0x16685 +UnknownText_0x16685: ; OK, I'll save your money. Trust me! , stick with it! text_jump UnknownText_0x1bda25 db "@" -; 0x1668a -UnknownText_0x1668a: ; 0x1668a +UnknownText_0x1668a: ; Your money's safe here! Get going! text_jump UnknownText_0x1bda5b db "@" -; 0x1668f -UnknownText_0x1668f: ; 0x1668f +UnknownText_0x1668f: ; , don't give up! text_jump UnknownText_0x1bda7e db "@" -; 0x16694 -UnknownText_0x16694: ; 0x16694 +UnknownText_0x16694: ; Just do what you can. text_jump UnknownText_0x1bda90 db "@" -; 0x16699 Mom_SavedString: db "SAVED@" @@ -704,18 +682,16 @@ Mom_DepositString: Mom_HeldString: db "HELD@" -MenuHeader_0x166b5: ; 0x166b5 +MenuHeader_0x166b5: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, 10 dw MenuData_0x166bd db 1 ; default option -; 0x166bd -MenuData_0x166bd: ; 0x166bd +MenuData_0x166bd: db STATICMENU_CURSOR ; flags db 4 ; items db "GET@" db "SAVE@" db "CHANGE@" db "CANCEL@" -; 0x166d6 diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index d82690940..fa82da50a 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -24,10 +24,9 @@ MomTriesToBuySomething:: scf ret -.Script: ; 0xfd00f +.Script: callasm .ASMFunction farjump Script_ReceivePhoneCall -; 0xfd017 .ASMFunction: call MomBuysItem_DeductFunds @@ -166,21 +165,19 @@ Mom_GetScriptPointer: ld de, .DollScript ret -.ItemScript: ; 0xfd0fd +.ItemScript: writetext _MomText_HiHowAreYou writetext _MomText_FoundAnItem writetext _MomText_BoughtWithYourMoney writetext _MomText_ItsInPC end -; 0xfd10a -.DollScript: ; 0xfd10a +.DollScript: writetext _MomText_HiHowAreYou writetext _MomText_FoundADoll writetext _MomText_BoughtWithYourMoney writetext _MomText_ItsInRoom end -; 0xfd117 GetItemFromMom: @@ -213,41 +210,35 @@ INCLUDE "data/items/mom_phone.asm" db 0, 0, 0 ; unused -_MomText_HiHowAreYou: ; 0xfd1b1 +_MomText_HiHowAreYou: ; Hi, ! How are you? text_jump UnknownText_0x1bc615 db "@" -; 0xfd1b6 -_MomText_FoundAnItem: ; 0xfd1b6 +_MomText_FoundAnItem: ; I found a useful item shopping, so text_jump UnknownText_0x1bc62a db "@" -; 0xfd1bb -_MomText_BoughtWithYourMoney: ; 0xfd1bb +_MomText_BoughtWithYourMoney: ; I bought it with your money. Sorry! text_jump UnknownText_0x1bc64e db "@" -; 0xfd1c0 -_MomText_ItsInPC: ; 0xfd1c0 +_MomText_ItsInPC: ; It's in your PC. You'll like it! text_jump UnknownText_0x1bc673 db "@" -; 0xfd1c5 -_MomText_FoundADoll: ; 0xfd1c5 +_MomText_FoundADoll: ; While shopping today, I saw this adorable doll, so text_jump UnknownText_0x1bc693 db "@" -; 0xfd1ca -_MomText_ItsInRoom: ; 0xfd1ca +_MomText_ItsInRoom: ; It's in your room. You'll love it! text_jump UnknownText_0x1bc6c7 db "@" -; 0xfd1cf db 0 ; unused diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index 1b8e1a169..f2b827227 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -59,53 +59,45 @@ MoveDeletion: call PrintText ret -.OnlyOneMoveText: ; 0x2c5d1 +.OnlyOneMoveText: ; That #MON knows only one move. text_jump UnknownText_0x1c5eba db "@" -; 0x2c5d6 -.ConfirmDeleteText: ; 0x2c5d6 +.ConfirmDeleteText: ; Oh, make it forget @ ? text_jump UnknownText_0x1c5eda db "@" -; 0x2c5db -.MoveDeletedText: ; 0x2c5db +.MoveDeletedText: ; Done! Your #MON forgot the move. text_jump UnknownText_0x1c5ef5 db "@" -; 0x2c5e0 -.EggText: ; 0x2c5e0 +.EggText: ; An EGG doesn't know any moves! text_jump UnknownText_0x1c5f17 db "@" -; 0x2c5e5 -.DeclinedDeletionText: ; 0x2c5e5 +.DeclinedDeletionText: ; No? Come visit me again. text_jump UnknownText_0x1c5f36 db "@" -; 0x2c5ea -.AskWhichMoveText: ; 0x2c5ea +.AskWhichMoveText: ; Which move should it forget, then? text_jump UnknownText_0x1c5f50 db "@" -; 0x2c5ef -.IntroText: ; 0x2c5ef +.IntroText: ; Um… Oh, yes, I'm the MOVE DELETER. I can make #MON forget moves. Shall I make a #MON forget? text_jump UnknownText_0x1c5f74 db "@" -; 0x2c5f4 -.AskWhichMonText: ; 0x2c5f4 +.AskWhichMonText: ; Which #MON? text_jump UnknownText_0x1c5fd1 db "@" -; 0x2c5f9 .DeleteMove: ld a, b diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index a7805b6d0..67d0ca528 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -98,6 +98,6 @@ CheckCanLearnMoveTutorMove: scf ret -.MenuHeader: ; 0x4930a +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index 87d35e8ed..593d51c69 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -178,68 +178,58 @@ GetNicknameLength: jr nz, .loop ret -NameRaterIntroText: ; 0xfb80f +NameRaterIntroText: ; Hello, hello! I'm the NAME RATER. ; I rate the names of #MON. ; Would you like me to rate names? text_jump UnknownText_0x1c0043 db "@" -; 0xfb814 -NameRaterWhichMonText: ; 0xfb814 +NameRaterWhichMonText: ; Which #MON's nickname should I rate for you? text_jump UnknownText_0x1c00a0 db "@" -; 0xfb819 -NameRaterIsGoodText: ; 0xfb819 +NameRaterIsGoodText: ; Hm… @ … That's a fairly decent name. ; But, how about a slightly better nickname? ; Want me to give it a better name? text_jump UnknownText_0x1c00cd db "@" -; 0xfb81e -NameRaterWhichNameText: ; 0xfb81e +NameRaterWhichNameText: ; All right. What name should we give it, then? text_jump UnknownText_0x1c0142 db "@" -; 0xfb823 -NameRaterEvenBetterText: ; 0xfb823 +NameRaterEvenBetterText: ; That's a better name than before! Well done! text_jump UnknownText_0x1c0171 db "@" -; 0xfb828 -NameRaterCancelText: ; 0xfb828 +NameRaterCancelText: ; OK, then. Come again sometime. text_jump UnknownText_0x1c019e db "@" -; 0xfb82d -NameRaterTradedText: ; 0xfb82d +NameRaterTradedText: ; Hm… @ ? What a great name! It's perfect. ; Treat @ with loving care. text_jump UnknownText_0x1c01be db "@" -; 0xfb832 -NameRaterEggText: ; 0xfb832 +NameRaterEggText: ; Whoa… That's just an EGG. text_jump UnknownText_0x1c0208 db "@" -; 0xfb837 -NameRaterSameAsBeforeText: ; 0xfb837 +NameRaterSameAsBeforeText: ; It might look the different as before, ; but this new name is much better! Well done! text_jump UnknownText_0x1c0222 db "@" -; 0xfb83c -NameRaterDoneText: ; 0xfb83c +NameRaterDoneText: ; All right. This #MON is now named @ . text_jump UnknownText_0x1c0272 db "@" -; 0xfb841 diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index 26a5559dd..cd83f8cb3 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -272,7 +272,7 @@ DoNPCTrade: ret -GetTradeAttribute: ; 0xfcdc2 +GetTradeAttribute: ld d, 0 push de ld a, [wJumptableIndex] @@ -286,7 +286,6 @@ GetTradeAttribute: ; 0xfcdc2 pop de add hl, de ret -; 0xfcdd7 Trade_GetAttributeOfCurrentPartymon: ld a, [wCurPartyMon] @@ -435,14 +434,13 @@ TradeTexts: dw TradeAfterText4 -ConnectLinkCableText: ; 0xfcf7b +ConnectLinkCableText: ; OK, connect the Game Link Cable. text_jump UnknownText_0x1bd407 db "@" -; 0xfcf80 -TradedForText: ; 0xfcf80 +TradedForText: ; traded givemon for getmon text_jump UnknownText_0x1bd429 start_asm @@ -457,113 +455,95 @@ TradedForText: ; 0xfcf80 ; interpret_data text_jump UnknownText_0x1bd445 db "@" -; 0xfcf97 -TradeIntroText1: ; 0xfcf97 +TradeIntroText1: ; I collect #MON. Do you have @ ? Want to trade it for my @ ? text_jump UnknownText_0x1bd449 db "@" -; 0xfcf9c -TradeCancelText1: ; 0xfcf9c +TradeCancelText1: ; You don't want to trade? Aww… text_jump UnknownText_0x1bd48c db "@" -; 0xfcfa1 -TradeWrongText1: ; 0xfcfa1 +TradeWrongText1: ; Huh? That's not @ . What a letdown… text_jump UnknownText_0x1bd4aa db "@" -; 0xfcfa6 -TradeCompleteText1: ; 0xfcfa6 +TradeCompleteText1: ; Yay! I got myself @ ! Thanks! text_jump UnknownText_0x1bd4d2 db "@" -; 0xfcfab -TradeAfterText1: ; 0xfcfab +TradeAfterText1: ; Hi, how's my old @ doing? text_jump UnknownText_0x1bd4f4 db "@" -; 0xfcfb0 TradeIntroText2: -TradeIntroText3: ; 0xfcfb0 +TradeIntroText3: ; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ? text_jump UnknownText_0x1bd512 db "@" -; 0xfcfb5 TradeCancelText2: -TradeCancelText3: ; 0xfcfb5 +TradeCancelText3: ; You don't have one either? Gee, that's really disappointing… text_jump UnknownText_0x1bd565 db "@" -; 0xfcfba TradeWrongText2: -TradeWrongText3: ; 0xfcfba +TradeWrongText3: ; You don't have @ ? That's too bad, then. text_jump UnknownText_0x1bd5a1 db "@" -; 0xfcfbf -TradeCompleteText2: ; 0xfcfbf +TradeCompleteText2: ; Great! Thank you! I finally got @ . text_jump UnknownText_0x1bd5cc db "@" -; 0xfcfc4 -TradeAfterText2: ; 0xfcfc4 +TradeAfterText2: ; Hi! The @ you traded me is doing great! text_jump UnknownText_0x1bd5f4 db "@" -; 0xfcfc9 -TradeIntroText4: ; 0xfcfc9 +TradeIntroText4: ; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ? text_jump UnknownText_0x1bd621 db "@" -; 0xfcfce -TradeCancelText4: ; 0xfcfce +TradeCancelText4: ; You don't want to trade? Oh, darn… text_jump UnknownText_0x1bd673 db "@" -; 0xfcfd3 -TradeWrongText4: ; 0xfcfd3 +TradeWrongText4: ; That's not @ . Please trade with me if you get one. text_jump UnknownText_0x1bd696 db "@" -; 0xfcfd8 -TradeCompleteText4: ; 0xfcfd8 +TradeCompleteText4: ; Wow! Thank you! I always wanted @ ! text_jump UnknownText_0x1bd6cd db "@" -; 0xfcfdd -TradeAfterText4: ; 0xfcfdd +TradeAfterText4: ; How is that @ I traded you doing? Your @ 's so cute! text_jump UnknownText_0x1bd6f5 db "@" -; 0xfcfe2 -TradeCompleteText3: ; 0xfcfe2 +TradeCompleteText3: ; Uh? What happened? text_jump UnknownText_0x1bd731 db "@" -; 0xfcfe7 -TradeAfterText3: ; 0xfcfe7 +TradeAfterText3: ; Trading is so odd… I still have a lot to learn about it. text_jump UnknownText_0x1bd745 db "@" -; 0xfcfec diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index b4e95987c..749964707 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -112,7 +112,7 @@ FieldMoveFailed: call MenuTextBoxBackup ret -.CantUseHere: ; 0xc780 +.CantUseHere: ; Can't use that here. text_jump UnknownText_0x1c05c8 db "@" @@ -161,12 +161,12 @@ CutFunction: ld a, $80 ret -Text_UsedCut: ; 0xc7c4 +Text_UsedCut: ; used CUT! text_jump UnknownText_0x1c05dd db "@" -Text_NothingToCut: ; 0xc7c9 +Text_NothingToCut: ; There's nothing to CUT here. text_jump UnknownText_0x1c05ec db "@" @@ -210,7 +210,7 @@ Script_CutFromMenu: reloadmappart special UpdateTimePals -Script_Cut: ; 0xc802 +Script_Cut: callasm GetPartyNick writetext Text_UsedCut reloadmappart @@ -316,7 +316,7 @@ UseFlash: ld hl, Script_UseFlash jp QueueScript -Script_UseFlash: ; 0xc8e6 +Script_UseFlash: reloadmappart special UpdateTimePals writetext UnknownText_0xc8f3 @@ -324,7 +324,7 @@ Script_UseFlash: ; 0xc8e6 closetext end -UnknownText_0xc8f3: ; 0xc8f3 +UnknownText_0xc8f3: text_jump UnknownText_0x1c0609 start_asm call WaitSFX @@ -334,7 +334,7 @@ UnknownText_0xc8f3: ; 0xc8f3 ld hl, .BlankText ret -.BlankText: ; 0xc908 +.BlankText: db "@" SurfFunction: @@ -617,7 +617,7 @@ FlyFunction: ld a, $82 ret -.FlyScript: ; 0xcaa3 +.FlyScript: reloadmappart callasm HideSprites special UpdateTimePals @@ -678,11 +678,11 @@ CheckMapCanWaterfall: scf ret -Script_WaterfallFromMenu: ; 0xcb1c +Script_WaterfallFromMenu: reloadmappart special UpdateTimePals -Script_UsedWaterfall: ; 0xcb20 +Script_UsedWaterfall: callasm GetPartyNick writetext .Text_UsedWaterfall waitbutton @@ -709,7 +709,7 @@ Script_UsedWaterfall: ; 0xcb20 turn_waterfall UP step_end -.Text_UsedWaterfall: ; 0xcb51 +.Text_UsedWaterfall: ; used WATERFALL! text_jump UnknownText_0x1c068e db "@" @@ -736,15 +736,15 @@ TryWaterfallOW:: scf ret -Script_CantDoWaterfall: ; 0xcb7e +Script_CantDoWaterfall: jumptext .Text_CantDoWaterfall -.Text_CantDoWaterfall: ; 0xcb81 +.Text_CantDoWaterfall: ; Wow, it's a huge waterfall. text_jump UnknownText_0x1c06a3 db "@" -Script_AskWaterfall: ; 0xcb86 +Script_AskWaterfall: opentext writetext .AskUseWaterfall yesorno @@ -752,7 +752,7 @@ Script_AskWaterfall: ; 0xcb86 closetext end -.AskUseWaterfall: ; 0xcb90 +.AskUseWaterfall: ; Do you want to use WATERFALL? text_jump UnknownText_0x1c06bf db "@" @@ -839,33 +839,33 @@ dig_incave ld a, $80 ret -.Text_UsedDig: ; 0xcc1c +.Text_UsedDig: ; used DIG! text_jump UnknownText_0x1c06de db "@" -.Text_UsedEscapeRope: ; 0xcc21 +.Text_UsedEscapeRope: ; used an ESCAPE ROPE. text_jump UnknownText_0x1c06ed db "@" -.Text_CantUseHere: ; 0xcc26 +.Text_CantUseHere: ; Can't use that here. text_jump UnknownText_0x1c0705 db "@" -.UsedEscapeRopeScript: ; 0xcc2b +.UsedEscapeRopeScript: reloadmappart special UpdateTimePals writetext .Text_UsedEscapeRope jump .UsedDigOrEscapeRopeScript -.UsedDigScript: ; 0xcc35 +.UsedDigScript: reloadmappart special UpdateTimePals writetext .Text_UsedDig -.UsedDigOrEscapeRopeScript: ; 0xcc3c +.UsedDigOrEscapeRopeScript: waitbutton closetext playsound SFX_WARP_TO @@ -878,12 +878,12 @@ dig_incave applymovement PLAYER, .DigReturn end -.DigOut: ; 0xcc59 +.DigOut: step_dig 32 hide_object step_end -.DigReturn: ; 0xcc5d +.DigReturn: show_object return_dig 32 step_end @@ -938,17 +938,17 @@ TeleportFunction: ld a, $80 ret -.Text_ReturnToLastMonCenter: ; 0xccb1 +.Text_ReturnToLastMonCenter: ; Return to the last #MON CENTER. text_jump UnknownText_0x1c071a db "@" -.Text_CantUseHere: ; 0xccb6 +.Text_CantUseHere: ; Can't use that here. text_jump UnknownText_0x1c073b db "@" -.TeleportScript: ; 0xccbb +.TeleportScript: reloadmappart special UpdateTimePals writetext .Text_ReturnToLastMonCenter @@ -992,7 +992,7 @@ StrengthFunction: ld a, $80 ret -.JumpText: ; 0xcd01 +.JumpText: text_jump UnknownText_0x1c0751 db "@" @@ -1019,11 +1019,11 @@ SetStrengthFlag: call GetPartyNick ret -Script_StrengthFromMenu: ; 0xcd29 +Script_StrengthFromMenu: reloadmappart special UpdateTimePals -Script_UsedStrength: ; 0xcd2d +Script_UsedStrength: callasm SetStrengthFlag writetext .UsedStrength copybytetovar wBuffer6 @@ -1033,11 +1033,11 @@ Script_UsedStrength: ; 0xcd2d closetext end -.UsedStrength: ; 0xcd41 +.UsedStrength: text_jump UnknownText_0x1c0774 db "@" -.StrengthAllowedItToMoveBoulders: ; 0xcd46 +.StrengthAllowedItToMoveBoulders: text_jump UnknownText_0x1c0788 db "@" @@ -1047,13 +1047,13 @@ AskStrengthScript: ifequal $1, .DontMeetRequirements jump .AlreadyUsedStrength -.DontMeetRequirements: ; 0xcd59 +.DontMeetRequirements: jumptext UnknownText_0xcd73 -.AlreadyUsedStrength: ; 0xcd5c +.AlreadyUsedStrength: jumptext UnknownText_0xcd6e -.AskStrength: ; 0xcd5f +.AskStrength: opentext writetext UnknownText_0xcd69 yesorno @@ -1061,17 +1061,17 @@ AskStrengthScript: closetext end -UnknownText_0xcd69: ; 0xcd69 +UnknownText_0xcd69: ; A #MON may be able to move this. Want to use STRENGTH? text_jump UnknownText_0x1c07a0 db "@" -UnknownText_0xcd6e: ; 0xcd6e +UnknownText_0xcd6e: ; Boulders may now be moved! text_jump UnknownText_0x1c07d8 db "@" -UnknownText_0xcd73: ; 0xcd73 +UnknownText_0xcd73: ; A #MON may be able to move this. text_jump UnknownText_0x1c07f4 db "@" @@ -1147,7 +1147,7 @@ Jumptable_cdae: ld a, $80 ret -Text_UsedWhirlpool: ; 0xcdd9 +Text_UsedWhirlpool: ; used WHIRLPOOL! text_jump UnknownText_0x1c0816 db "@" @@ -1181,11 +1181,11 @@ TryWhirlpoolMenu: scf ret -Script_WhirlpoolFromMenu: ; 0xce0b +Script_WhirlpoolFromMenu: reloadmappart special UpdateTimePals -Script_UsedWhirlpool: ; 0xce0f +Script_UsedWhirlpool: callasm GetPartyNick writetext Text_UsedWhirlpool reloadmappart @@ -1232,14 +1232,14 @@ TryWhirlpoolOW:: scf ret -Script_MightyWhirlpool: ; 0xce66 +Script_MightyWhirlpool: jumptext .MightyWhirlpoolText -.MightyWhirlpoolText: ; 0xce69 +.MightyWhirlpoolText: text_jump UnknownText_0x1c082b db "@" -Script_AskWhirlpoolOW: ; 0xce6e +Script_AskWhirlpoolOW: opentext writetext UnknownText_0xce78 yesorno @@ -1247,7 +1247,7 @@ Script_AskWhirlpoolOW: ; 0xce6e closetext end -UnknownText_0xce78: ; 0xce78 +UnknownText_0xce78: text_jump UnknownText_0x1c0864 db "@" @@ -1272,21 +1272,21 @@ TryHeadbuttFromMenu: ld a, $80 ret -UnknownText_0xce9d: ; 0xce9d +UnknownText_0xce9d: ; did a HEADBUTT! text_jump UnknownText_0x1c0897 db "@" -UnknownText_0xcea2: ; 0xcea2 +UnknownText_0xcea2: ; Nope. Nothing… text_jump UnknownText_0x1c08ac db "@" -HeadbuttFromMenuScript: ; 0xcea7 +HeadbuttFromMenuScript: reloadmappart special UpdateTimePals -HeadbuttScript: ; 0xceab +HeadbuttScript: callasm GetPartyNick writetext UnknownText_0xce9d @@ -1322,7 +1322,7 @@ TryHeadbuttOW:: xor a ret -AskHeadbuttScript: ; 0xcedc +AskHeadbuttScript: opentext writetext UnknownText_0xcee6 yesorno @@ -1330,7 +1330,7 @@ AskHeadbuttScript: ; 0xcedc closetext end -UnknownText_0xcee6: ; 0xcee6 +UnknownText_0xcee6: ; A #MON could be in this tree. Want to HEADBUTT it? text_jump UnknownText_0x1c08bc db "@" @@ -1380,7 +1380,7 @@ GetFacingObject: scf ret -RockSmashFromMenuScript: ; 0xcf2e +RockSmashFromMenuScript: reloadmappart special UpdateTimePals @@ -1403,15 +1403,15 @@ RockSmashScript: .done end -MovementData_0xcf55: ; 0xcf55 +MovementData_0xcf55: rock_smash 10 step_end -UnknownText_0xcf58: ; 0xcf58 +UnknownText_0xcf58: text_jump UnknownText_0x1c08f0 db "@" -AskRockSmashScript: ; 0xcf5d +AskRockSmashScript: callasm HasRockSmash ifequal 1, .no @@ -1424,12 +1424,12 @@ AskRockSmashScript: ; 0xcf5d .no jumptext UnknownText_0xcf72 -UnknownText_0xcf72: ; 0xcf72 +UnknownText_0xcf72: ; Maybe a #MON can break this. text_jump UnknownText_0x1c0906 db "@" -UnknownText_0xcf77: ; 0xcf77 +UnknownText_0xcf77: ; This rock looks breakable. Want to use ROCK SMASH? text_jump UnknownText_0x1c0924 db "@" @@ -1538,32 +1538,32 @@ FishFunction: ld a, $81 ret -Script_NotEvenANibble: ; 0xd01e +Script_NotEvenANibble: scall Script_FishCastRod writetext UnknownText_0xd0a9 jump Script_NotEvenANibble_FallThrough -Script_NotEvenANibble2: ; 0xd027 +Script_NotEvenANibble2: scall Script_FishCastRod writetext UnknownText_0xd0a9 -Script_NotEvenANibble_FallThrough: ; 0xd02d +Script_NotEvenANibble_FallThrough: loademote EMOTE_SHADOW callasm PutTheRodAway closetext end -Script_GotABite: ; 0xd035 +Script_GotABite: scall Script_FishCastRod callasm Fishing_CheckFacingUp iffalse .NotFacingUp applymovement PLAYER, .Movement_FacingUp jump .FightTheHookedPokemon -.NotFacingUp: ; 0xd046 +.NotFacingUp: applymovement PLAYER, .Movement_NotFacingUp -.FightTheHookedPokemon: ; 0xd04a +.FightTheHookedPokemon: pause 40 applymovement PLAYER, .Movement_RestoreRod writetext UnknownText_0xd0a4 @@ -1608,7 +1608,7 @@ Fishing_CheckFacingUp: ld [wScriptVar], a ret -Script_FishCastRod: ; 0xd07c +Script_FishCastRod: reloadmappart loadvar hBGMapMode, $0 special UpdateTimePals @@ -1632,12 +1632,12 @@ PutTheRodAway: call ReplaceKrisSprite ret -UnknownText_0xd0a4: ; 0xd0a4 +UnknownText_0xd0a4: ; Oh! A bite! text_jump UnknownText_0x1c0958 db "@" -UnknownText_0xd0a9: ; 0xd0a9 +UnknownText_0xd0a9: ; Not even a nibble! text_jump UnknownText_0x1c0965 db "@" @@ -1733,7 +1733,7 @@ BikeFunction: scf ret -Script_GetOnBike: ; 0xd13e +Script_GetOnBike: reloadmappart special UpdateTimePals writecode VAR_MOVEMENT, PLAYER_BIKE @@ -1743,7 +1743,7 @@ Script_GetOnBike: ; 0xd13e special ReplaceKrisSprite end -Script_GetOnBike_Register: ; 0xd14e +Script_GetOnBike_Register: writecode VAR_MOVEMENT, PLAYER_BIKE closetext special ReplaceKrisSprite @@ -1753,7 +1753,7 @@ Script_GetOnBike_Register: ; 0xd14e nop ret -Script_GetOffBike: ; 0xd158 +Script_GetOffBike: reloadmappart special UpdateTimePals writecode VAR_MOVEMENT, PLAYER_NORMAL @@ -1766,27 +1766,27 @@ FinishGettingOffBike: special PlayMapMusic end -Script_GetOffBike_Register: ; 0xd16b +Script_GetOffBike_Register: writecode VAR_MOVEMENT, PLAYER_NORMAL jump FinishGettingOffBike -Script_CantGetOffBike: ; 0xd171 +Script_CantGetOffBike: writetext .CantGetOffBikeText waitbutton closetext end -.CantGetOffBikeText: ; 0xd177 +.CantGetOffBikeText: ; You can't get off here! text_jump UnknownText_0x1c099a db "@" -GotOnTheBikeText: ; 0xd17c +GotOnTheBikeText: ; got on the @ . text_jump UnknownText_0x1c09b2 db "@" -GotOffTheBikeText: ; 0xd181 +GotOffTheBikeText: ; got off the @ . text_jump UnknownText_0x1c09c7 db "@" @@ -1813,7 +1813,7 @@ TryCutOW:: scf ret -AskCutScript: ; 0xd1a9 +AskCutScript: opentext writetext UnknownText_0xd1c8 yesorno @@ -1833,13 +1833,13 @@ AskCutScript: ; 0xd1a9 ld [wScriptVar], a ret -UnknownText_0xd1c8: ; 0xd1c8 +UnknownText_0xd1c8: text_jump UnknownText_0x1c09dd db "@" -CantCutScript: ; 0xd1cd +CantCutScript: jumptext UnknownText_0xd1d0 -UnknownText_0xd1d0: ; 0xd1d0 +UnknownText_0xd1d0: text_jump UnknownText_0x1c0a05 db "@" diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index 2a4177178..6f30e24b8 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -297,53 +297,45 @@ SeerTexts: dw SeerEggText dw SeerLevelOnlyText -SeerIntroText: ; 0x4f28c +SeerIntroText: ; I see all. I know all… Certainly, I know of your #MON! text_jump UnknownText_0x1c475f db "@" -; 0x4f291 -SeerCantTellText: ; 0x4f291 +SeerCantTellText: ; Whaaaat? I can't tell a thing! How could I not know of this? text_jump UnknownText_0x1c4797 db "@" -; 0x4f296 -SeerMetAtText: ; 0x4f296 +SeerMetAtText: ; Hm… I see you met @ here: @ ! text_jump UnknownText_0x1c47d4 db "@" -; 0x4f29b -SeerTimeLevelText: ; 0x4f29b +SeerTimeLevelText: ; The time was @ ! Its level was @ ! Am I good or what? text_jump UnknownText_0x1c47fa db "@" -; 0x4f2a0 -SeerTradedText: ; 0x4f2a0 +SeerTradedText: ; Hm… @ came from @ in a trade? @ was where @ met @ ! text_jump UnknownText_0x1c4837 db "@" -; 0x4f2a5 -SeerLevelOnlyText: ; 0x4f2a5 +SeerLevelOnlyText: ; What!? Incredible! I don't understand how, but it is incredible! You are special. I can't tell where you met it, but it was at level @ . Am I good or what? text_jump UnknownText_0x1c487f db "@" -; 0x4f2aa -SeerEggText: ; 0x4f2aa +SeerEggText: ; Hey! That's an EGG! You can't say that you've met it yet… text_jump UnknownText_0x1c491d db "@" -; 0x4f2af -SeerCancelText: ; 0x4f2af +SeerCancelText: ; Fufufu! I saw that you'd do nothing! text_jump UnknownText_0x1c4955 db "@" -; 0x4f2b4 SeerAdvice: @@ -381,35 +373,30 @@ SeerAdviceTexts: dbw 100, SeerAdvice5 dbw 255, SeerAdvice1 -SeerAdvice1: ; 0x4f2e8 +SeerAdvice1: ; Incidentally… It would be wise to raise your #MON with a little more care. text_jump UnknownText_0x1c497a db "@" -; 0x4f2ed -SeerAdvice2: ; 0x4f2ed +SeerAdvice2: ; Incidentally… It seems to have grown a little. @ seems to be becoming more confident. text_jump UnknownText_0x1c49c6 db "@" -; 0x4f2f2 -SeerAdvice3: ; 0x4f2f2 +SeerAdvice3: ; Incidentally… @ has grown. It's gained much strength. text_jump UnknownText_0x1c4a21 db "@" -; 0x4f2f7 -SeerAdvice4: ; 0x4f2f7 +SeerAdvice4: ; Incidentally… It certainly has grown mighty! This @ must have come through numerous #MON battles. It looks brimming with confidence. text_jump UnknownText_0x1c4a5b db "@" -; 0x4f2fc -SeerAdvice5: ; 0x4f2fc +SeerAdvice5: ; Incidentally… I'm impressed by your dedication. It's been a long time since I've seen a #MON as mighty as this @ . I'm sure that seeing @ in battle would excite anyone. text_jump UnknownText_0x1c4ae5 db "@" -; 0x4f301 GetCaughtGender: diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 2d4ee28c5..f1a593b5a 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -113,7 +113,6 @@ PC_CheckPartyForPokemon: ; Bzzzzt! You must have a #MON to use this! text_jump UnknownText_0x1c1328 db "@" -; 0x15668 BillsPC: call PC_PlayChoosePCSound @@ -200,11 +199,10 @@ _PlayersHousePC: ld c, $1 ret -UnknownText_0x156ff: ; 0x156ff +UnknownText_0x156ff: ; turned on the PC. text_jump UnknownText_0x1c1353 db "@" -; 0x15704 _PlayersPC: ld a, b @@ -236,7 +234,7 @@ Function15715: call ExitMenu ret -PlayersPCMenuData: ; 0x15736 +PlayersPCMenuData: db MENU_BACKUP_TILES ; flags db 0, 0 ; top left corner coords (y, x) db 12, 15 ; bottom right corner coords (y, x) @@ -258,7 +256,7 @@ PLAYERSPC_DECORATION EQU 4 PLAYERSPC_TURN_OFF EQU 5 PLAYERSPC_LOG_OFF EQU 6 -.PlayersPCMenuPointers: ; 0x15746 +.PlayersPCMenuPointers: ; entries correspond to PLAYERSPC_* constants dw PlayerWithdrawItemMenu, .WithdrawItem dw PlayerDepositItemMenu, .DepositItem @@ -305,13 +303,12 @@ PC_DisplayTextWaitMenu: ld [wOptions], a ret -UnknownText_0x157cc: ; 0x157cc +UnknownText_0x157cc: ; What do you want to do? text_jump UnknownText_0x1c1368 db "@" -; 0x157d1 -PlayerWithdrawItemMenu: ; 0x157d1 +PlayerWithdrawItemMenu: call LoadStandardMenuHeader farcall ClearPCItemScreen .loop @@ -375,19 +372,19 @@ PlayerWithdrawItemMenu: ; 0x157d1 .done ret -.HowManyText: ; 0x15850 +.HowManyText: text_jump _PlayersPCHowManyWithdrawText db "@" -.WithdrewText: ; 0x15855 +.WithdrewText: text_jump _PlayersPCWithdrewItemsText db "@" -.NoRoomText: ; 0x1585a +.NoRoomText: text_jump _PlayersPCNoRoomWithdrawText db "@" -PlayerTossItemMenu: ; 0x1585f +PlayerTossItemMenu: call LoadStandardMenuHeader farcall ClearPCItemScreen .loop @@ -401,24 +398,21 @@ PlayerTossItemMenu: ; 0x1585f call CloseSubmenu xor a ret -; 0x1587d -PlayerDecorationMenu: ; 0x1587d +PlayerDecorationMenu: farcall _PlayerDecorationMenu ld a, c and a ret z scf ret -; 0x15888 -PlayerLogOffMenu: ; 0x15888 +PlayerLogOffMenu: xor a scf ret -; 0x1588b -PlayerDepositItemMenu: ; 0x1588b +PlayerDepositItemMenu: call .CheckItemsInBag jr c, .nope call DisableSpriteUpdates @@ -538,25 +532,24 @@ PlayerDepositItemMenu: ; 0x1588b and a ret -.HowManyText: ; 0x1596e +.HowManyText: text_jump _PlayersPCHowManyDepositText db "@" -.DepositText: ; 0x15973 +.DepositText: text_jump _PlayersPCDepositItemsText db "@" -.NoRoomText: ; 0x15978 +.NoRoomText: text_jump _PlayersPCNoRoomDepositText db "@" -PlayerMailBoxMenu: ; 0x1597d +PlayerMailBoxMenu: farcall _PlayerMailBoxMenu xor a ret -; 0x15985 -PCItemsJoypad: ; 0x15985 +PCItemsJoypad: xor a ld [wSwitchItem], a .loop @@ -645,38 +638,32 @@ PC_DisplayText: call ExitMenu ret -PokecenterPCText_BootedUpPC: ; 0x15a27 +PokecenterPCText_BootedUpPC: ; turned on the PC. text_jump UnknownText_0x1c144d db "@" -; 0x15a2c -PokecenterPCText_AccessWhosePC: ; 0x15a2c +PokecenterPCText_AccessWhosePC: ; Access whose PC? text_jump UnknownText_0x1c1462 db "@" -; 0x15a31 -PokecenterPCText_AccessedBillsPC: ; 0x15a31 +PokecenterPCText_AccessedBillsPC: ; BILL's PC accessed. #MON Storage System opened. text_jump UnknownText_0x1c1474 db "@" -; 0x15a36 -PokecenterPCText_AccessedOwnPC: ; 0x15a36 +PokecenterPCText_AccessedOwnPC: ; Accessed own PC. Item Storage System opened. text_jump UnknownText_0x1c14a4 db "@" -; 0x15a3b -PokecenterPCText_AccessedOaksPC: ; 0x15a3b +PokecenterPCText_AccessedOaksPC: ; PROF.OAK's PC accessed. #DEX Rating System opened. text_jump UnknownText_0x1c14d2 db "@" -; 0x15a40 -PokecenterPCText_LinkClosed: ; 0x15a40 +PokecenterPCText_LinkClosed: ; … Link closed… text_jump UnknownText_0x1c1505 db "@" -; 0x15a45 diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm index b866c4f0d..10ca4280b 100644 --- a/engine/events/pokepic.asm +++ b/engine/events/pokepic.asm @@ -41,7 +41,7 @@ ClosePokepic:: call LoadStandardFont ret -PokepicMenuHeader: ; 0x24547 +PokepicMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 6, 4, 14, 13 dw NULL diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index 524533abc..cb29693af 100644 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -29,32 +29,27 @@ PhotoStudio: call PrintText ret -.Text_AskWhichMon: ; 0x16e04 +.Text_AskWhichMon: ; Which #MON should I photo- graph? text_jump UnknownText_0x1be024 db "@" -; 0x16e09 -.Text_HoldStill: ; 0x16e09 +.Text_HoldStill: ; All righty. Hold still for a bit. text_jump UnknownText_0x1be047 db "@" -; 0x16e0e -.Text_Presto: ; 0x16e0e +.Text_Presto: ; Presto! All done. Come again, OK? text_jump UnknownText_0x1be06a db "@" -; 0x16e13 -.Text_NoPicture: ; 0x16e13 +.Text_NoPicture: ; Oh, no picture? Come again, OK? text_jump UnknownText_0x1c0000 db "@" -; 0x16e18 -.Text_Egg: ; 0x16e18 +.Text_Egg: ; An EGG? My talent is worth more… text_jump UnknownText_0x1c0021 db "@" -; 0x16e1d diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index b80efe75b..df55394aa 100644 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -1,4 +1,4 @@ -ProfOaksPC: ; 0x265d3 +ProfOaksPC: ld hl, OakPCText1 call MenuTextBox call YesNoBox @@ -11,7 +11,7 @@ ProfOaksPC: ; 0x265d3 call ExitMenu ret -ProfOaksPCBoot ; 0x265ee +ProfOaksPCBoot: ld hl, OakPCText2 call PrintText call Rate @@ -20,7 +20,7 @@ ProfOaksPCBoot ; 0x265ee call WaitSFX ret -ProfOaksPCRating: ; 0x26601 +ProfOaksPCRating: call Rate push de ld de, MUSIC_NONE @@ -31,7 +31,7 @@ ProfOaksPCRating: ; 0x26601 call WaitSFX ret -Rate: ; 0x26616 +Rate: ; calculate Seen/Owned ld hl, wPokedexSeen ld b, wEndPokedexSeen - wPokedexSeen @@ -55,7 +55,7 @@ Rate: ; 0x26616 pop de ret -.UpdateRatingBuffers: ; 0x26647 +.UpdateRatingBuffers: ld hl, wStringBuffer3 ld de, wd002 call .UpdateRatingBuffer @@ -64,7 +64,7 @@ Rate: ; 0x26616 call .UpdateRatingBuffer ret -.UpdateRatingBuffer: ; 0x2665a +.UpdateRatingBuffer: push hl ld a, "@" ld bc, ITEM_NAME_LENGTH @@ -74,7 +74,7 @@ Rate: ; 0x26616 call PrintNum ret -FindOakRating: ; 0x2666b +FindOakRating: ; return sound effect in de ; return text pointer in hl nop @@ -100,15 +100,15 @@ endr INCLUDE "data/events/pokedex_ratings.asm" -OakPCText1: ; 0x266de +OakPCText1: text_jump _OakPCText1 db "@" -OakPCText2: ; 0x266e3 +OakPCText2: text_jump _OakPCText2 db "@" -OakPCText3: ; 0x266e8 +OakPCText3: text_jump _OakPCText3 db "@" @@ -188,6 +188,6 @@ OakRating19: text_jump _OakRating19 db "@" -OakPCText4: ; 0x2674c +OakPCText4: text_jump _OakPCText4 db "@" diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index cf1570ee4..32f24253c 100644 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm @@ -46,7 +46,7 @@ CheckAnyFaintedMon: scf ret -SacredAshScript: ; 0x50821 +SacredAshScript: special HealParty reloadmappart playsound SFX_WARP_TO @@ -63,10 +63,8 @@ SacredAshScript: ; 0x50821 waitbutton closetext end -; 0x50845 -UnknownText_0x50845: ; 0x50845 +UnknownText_0x50845: ; 's #MON were all healed! text_jump UnknownText_0x1c0b65 db "@" -; 0x5084a diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 65c353d0e..8d340a79d 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -83,7 +83,7 @@ FoundNone: ld [wScriptVar], a ret -NameRival: ; 0xc29d +NameRival: ld b, $2 ; rival ld de, wRivalName farcall _NamingScreen @@ -95,7 +95,6 @@ NameRival: ; 0xc29d .default db "SILVER@" -; 0xc2b9 NameRater: farcall _NameRater @@ -168,11 +167,10 @@ GetMysteryGiftItem: ld [wScriptVar], a ret -.ReceiveItemText: ; 0xc345 +.ReceiveItemText: ; received item text_jump UnknownText_0x1bd3be db "@" -; 0xc34a BugContestJudging: farcall _BugContestJudging @@ -257,17 +255,15 @@ CheckCoinsAndCoinCase: scf ret -.NoCoinsText: ; 0xc3d1 +.NoCoinsText: ; You have no coins. text_jump UnknownText_0x1bd3d7 db "@" -; 0xc3d6 -.NoCoinCaseText: ; 0xc3d6 +.NoCoinCaseText: ; You don't have a COIN CASE. text_jump UnknownText_0x1bd3eb db "@" -; 0xc3db ClearBGPalettesBufferScreen: call ClearBGPalettes @@ -331,7 +327,7 @@ CheckLuckyNumberShowFlag: farcall _CheckLuckyNumberShowFlag jp ScriptReturnCarry -SnorlaxAwake: ; 0xc43d +SnorlaxAwake: ; Check if the Poké Flute channel is playing, and if the player is standing ; next to Snorlax. @@ -430,7 +426,7 @@ PrintDiploma: call ExitAllMenus ret -TrainerHouse: ; 0xc4b9 +TrainerHouse: ld a, BANK(sMysteryGiftTrainerHouseFlag) call GetSRAMBank ld a, [sMysteryGiftTrainerHouseFlag] diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm index 320953cf9..0e06b03c8 100644 --- a/engine/events/std_collision.asm +++ b/engine/events/std_collision.asm @@ -25,5 +25,5 @@ CheckFacingTileForStdScript:: INCLUDE "data/events/collision_stdscripts.asm" -Script_JumpStdFromRAM: ; 0x1369a +Script_JumpStdFromRAM: jump wJumpStdScriptBuffer diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 0831f92e0..222af41c7 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -216,7 +216,7 @@ Radio2Script: closetext end -TrashCanScript: ; 0xbc1a5 +TrashCanScript: farjumptext TrashCanText PCScript: @@ -335,9 +335,8 @@ BugContestResults_DidNotWin: farwritetext ContestResults_DidNotWinText buttonsound jump BugContestResults_FinishUp -; 0xbc2b1 -BugContestResults_ReturnAfterWinnersPrize: ; 0xbc2b1 +BugContestResults_ReturnAfterWinnersPrize: farwritetext ContestResults_JoinUsNextTimeText buttonsound @@ -381,9 +380,8 @@ BugContestResults_CleanUp: setflag ENGINE_DAILY_BUG_CONTEST special PlayMapMusic end -; 0xbc31e -BugContestResults_FirstPlace: ; 0xbc31e +BugContestResults_FirstPlace: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 itemtotext SUN_STONE, MEM_BUFFER_1 farwritetext ContestResults_PlayerWonAPrizeText @@ -391,55 +389,48 @@ BugContestResults_FirstPlace: ; 0xbc31e verbosegiveitem SUN_STONE iffalse BugContestResults_NoRoomForSunStone jump BugContestResults_ReturnAfterWinnersPrize -; 0xbc332 -BugContestResults_SecondPlace: ; 0xbc332 +BugContestResults_SecondPlace: itemtotext EVERSTONE, MEM_BUFFER_1 farwritetext ContestResults_PlayerWonAPrizeText waitbutton verbosegiveitem EVERSTONE iffalse BugContestResults_NoRoomForEverstone jump BugContestResults_ReturnAfterWinnersPrize -; 0xbc343 -BugContestResults_ThirdPlace: ; 0xbc343 +BugContestResults_ThirdPlace: itemtotext GOLD_BERRY, MEM_BUFFER_1 farwritetext ContestResults_PlayerWonAPrizeText waitbutton verbosegiveitem GOLD_BERRY iffalse BugContestResults_NoRoomForGoldBerry jump BugContestResults_ReturnAfterWinnersPrize -; 0xbc354 -BugContestResults_NoRoomForSunStone: ; 0xbc354 +BugContestResults_NoRoomForSunStone: farwritetext BugContestPrizeNoRoomText buttonsound setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE jump BugContestResults_ReturnAfterWinnersPrize -; 0xbc35f -BugContestResults_NoRoomForEverstone: ; 0xbc35f +BugContestResults_NoRoomForEverstone: farwritetext BugContestPrizeNoRoomText buttonsound setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE jump BugContestResults_ReturnAfterWinnersPrize -; 0xbc36a -BugContestResults_NoRoomForGoldBerry: ; 0xbc36a +BugContestResults_NoRoomForGoldBerry: farwritetext BugContestPrizeNoRoomText buttonsound setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY jump BugContestResults_ReturnAfterWinnersPrize -; 0xbc375 -BugContestResults_NoRoomForBerry: ; 0xbc375 +BugContestResults_NoRoomForBerry: farwritetext BugContestPrizeNoRoomText buttonsound setevent EVENT_CONTEST_OFFICER_HAS_BERRY jump BugContestResults_DidNotWin -; 0xbc380 -BugContestResults_CopyContestantsToResults: ; 0xbc380 +BugContestResults_CopyContestantsToResults: checkevent EVENT_BUG_CATCHING_CONTESTANT_1A iftrue .skip1 clearevent EVENT_BUG_CATCHING_CONTESTANT_1B @@ -1489,7 +1480,7 @@ RegisteredNumberFScript: buttonsound end -NumberAcceptedFScript: ; 0xbcbd3 +NumberAcceptedFScript: checkcode VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth @@ -1777,23 +1768,21 @@ GymStatue2Script: closetext end -ReceiveItemScript: ; 0xbcdb9 +ReceiveItemScript: waitsfx farwritetext ReceivedItemText playsound SFX_ITEM waitsfx end -; 0xbcdc3 -ReceiveTogepiEggScript: ; 0xbcdc3 +ReceiveTogepiEggScript: waitsfx farwritetext ReceivedItemText playsound SFX_GET_EGG_FROM_DAY_CARE_LADY waitsfx end -; 0xbcdcd -GameCornerCoinVendorScript: ; 0xbcdcd +GameCornerCoinVendorScript: faceplayer opentext farwritetext CoinVendor_WelcomeText @@ -1804,12 +1793,11 @@ GameCornerCoinVendorScript: ; 0xbcdcd waitbutton closetext end -; 0xbcde0 -CoinVendor_IntroScript: ; 0xbcde0 +CoinVendor_IntroScript: farwritetext CoinVendor_IntroText -.loop ; 0xbcde4 +.loop special DisplayMoneyAndCoinBalance loadmenu .MenuHeader verticalmenu @@ -1817,9 +1805,8 @@ CoinVendor_IntroScript: ; 0xbcde0 ifequal 1, .Buy50 ifequal 2, .Buy500 jump .Cancel -; 0xbcdf7 -.Buy50: ; 0xbcdf7 +.Buy50: checkcoins MAX_COINS - 50 ifequal HAVE_MORE, .CoinCaseFull checkmoney YOUR_MONEY, 1000 @@ -1831,9 +1818,8 @@ CoinVendor_IntroScript: ; 0xbcde0 farwritetext CoinVendor_Buy50CoinsText waitbutton jump .loop -; 0xbce1b -.Buy500: ; 0xbce1b +.Buy500: checkcoins MAX_COINS - 500 ifequal HAVE_MORE, .CoinCaseFull checkmoney YOUR_MONEY, 10000 @@ -1845,28 +1831,24 @@ CoinVendor_IntroScript: ; 0xbcde0 farwritetext CoinVendor_Buy500CoinsText waitbutton jump .loop -; 0xbce3f -.NotEnoughMoney: ; 0xbce3f +.NotEnoughMoney: farwritetext CoinVendor_NotEnoughMoneyText waitbutton closetext end -; 0xbce46 -.CoinCaseFull: ; 0xbce46 +.CoinCaseFull: farwritetext CoinVendor_CoinCaseFullText waitbutton closetext end -; 0xbce4d -.Cancel: ; 0xbce4d +.Cancel: farwritetext CoinVendor_CancelText waitbutton closetext end -; 0xbce54 .MenuHeader: @@ -1881,7 +1863,6 @@ CoinVendor_IntroScript: ; 0xbcde0 db " 50 : ¥1000@" db "500 : ¥10000@" db "CANCEL@" -; 0xbce7f HappinessCheckScript: diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 7c6df4948..1a378ede8 100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -5,7 +5,7 @@ SweetScentFromMenu: ld [wFieldMoveSucceeded], a ret -.SweetScent: ; 0x506c8 +.SweetScent: reloadmappart special UpdateTimePals callasm GetPartyNick @@ -19,18 +19,15 @@ SweetScentFromMenu: startbattle reloadmapafterbattle end -; 0x506e5 -.BugCatchingContest: ; 0x506e5 +.BugCatchingContest: farjump BugCatchingContestBattleScript -; 0x506e9 -SweetScentNothing: ; 0x506e9 +SweetScentNothing: writetext UnknownText_0x5072b waitbutton closetext end -; 0x506ef SweetScentEncounter: farcall CanUseSweetScent @@ -60,14 +57,12 @@ SweetScentEncounter: ld [wBattleType], a ret -UnknownText_0x50726: ; 0x50726 +UnknownText_0x50726: ; used SWEET SCENT! text_jump UnknownText_0x1c0b03 db "@" -; 0x5072b -UnknownText_0x5072b: ; 0x5072b +UnknownText_0x5072b: ; Looks like there's nothing here… text_jump UnknownText_0x1c0b1a db "@" -; 0x50730 diff --git a/engine/events/trainer_scripts.asm b/engine/events/trainer_scripts.asm index abfcd8dee..6f0bb2d29 100644 --- a/engine/events/trainer_scripts.asm +++ b/engine/events/trainer_scripts.asm @@ -1,4 +1,4 @@ -TalkToTrainerScript:: ; 0xbe66a +TalkToTrainerScript:: faceplayer trainerflagaction CHECK_FLAG iftrue AlreadyBeatenTrainerScript @@ -6,7 +6,7 @@ TalkToTrainerScript:: ; 0xbe66a encountermusic jump StartBattleWithMapTrainerScript -SeenByTrainerScript:: ; 0xbe675 +SeenByTrainerScript:: loadmemtrainer encountermusic showemote EMOTE_SHOCK, LAST_TALKED, 30 @@ -16,7 +16,7 @@ SeenByTrainerScript:: ; 0xbe675 faceobject PLAYER, LAST_TALKED jump StartBattleWithMapTrainerScript -StartBattleWithMapTrainerScript: ; 0xbe68a +StartBattleWithMapTrainerScript: opentext trainertext $0 waitbutton diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index 4b4aaaf87..105337630 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -1,4 +1,4 @@ -HoOhChamber: ; 0x8addb +HoOhChamber: ld hl, wPartySpecies ld a, [hl] cp HO_OH ; is Ho-oh the first Pokémon in the party? @@ -9,7 +9,6 @@ HoOhChamber: ; 0x8addb call EventFlagAction .done ret -; 0x8adef OmanyteChamber: call GetMapAttributesPointer ; pointless? diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 2eb24487c..bf5a2257c 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -1,13 +1,12 @@ -Script_BattleWhiteout:: ; 0x124c1 +Script_BattleWhiteout:: callasm BattleBGMap jump Script_Whiteout -; 0x124c8 -Script_OverworldWhiteout:: ; 0x124c8 +Script_OverworldWhiteout:: refreshscreen callasm OverworldBGMap -Script_Whiteout: ; 0x124ce +Script_Whiteout: writetext .WhitedOutText waitbutton special FadeOutPalettes @@ -24,13 +23,11 @@ Script_Whiteout: ; 0x124ce .bug_contest jumpstd bugcontestresultswarp -; 0x124f5 -.WhitedOutText: ; 0x124f5 +.WhitedOutText: ; is out of useable #MON! whited out! text_jump UnknownText_0x1c0a4e db "@" -; 0x124fa OverworldBGMap: call ClearPalettes |