From c82deab86fc984b6af4686d88b42042be4f6cd9e Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sat, 5 May 2018 09:19:04 +0200 Subject: [PATCH] fix-various-little-things MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A compilation of suggestions from the discord that don't deserve separate commits and are not questionable at all™. --- constants/sprite_constants.asm | 2 +- data/moves/animations.asm | 2 +- data/wild/flee_mons.asm | 1 - docs/bugs_and_glitches.md | 2 +- engine/battle/core.asm | 2 +- engine/events/std_scripts.asm | 28 ++++++++++++++-------------- engine/overworld/map_objects.asm | 4 ++-- engine/overworld/wildmons.asm | 8 ++++---- engine/phone/phone.asm | 2 +- engine/pokemon/breeding.asm | 2 +- engine/pokemon/evolve.asm | 2 +- macros/scripts/events.asm | 14 +++++++------- macros/scripts/movement.asm | 2 +- maps/OaksLab.asm | 2 +- maps/Route31.asm | 2 +- maps/Route35GoldenrodGate.asm | 2 +- mobile/mobile_40.asm | 4 ++-- mobile/mobile_42.asm | 2 +- 18 files changed, 41 insertions(+), 42 deletions(-) diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 0e63cce52..caa6743c2 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -1,5 +1,5 @@ ; sprite ids -; OverworldSprites indexes (see data/sprites.asm) +; OverworldSprites indexes (see data/sprites/sprites.asm) const_def const SPRITE_NONE ; 00 const SPRITE_CHRIS ; 01 diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 030aa2fa3..037e5f1d2 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -303,7 +303,7 @@ BattleAnim_SweetScent2: ; c929c anim_ret ; c92c1 -BattleAnim_ThrowPokeBall +BattleAnim_ThrowPokeBall: anim_if_param_equal NO_ITEM, .TheTrainerBlockedTheBall anim_if_param_equal MASTER_BALL, .MasterBall anim_if_param_equal ULTRA_BALL, .UltraBall diff --git a/data/wild/flee_mons.asm b/data/wild/flee_mons.asm index 1b1cea036..2c235d2e6 100644 --- a/data/wild/flee_mons.asm +++ b/data/wild/flee_mons.asm @@ -31,6 +31,5 @@ OftenFleeMons: ; 3c5a8 AlwaysFleeMons: ; 3c5b1 db RAIKOU db ENTEI -; db SUICUNE db -1 ; 3c5b4 diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 2e83e6908..f7675ae78 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -1122,7 +1122,7 @@ The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActi ```asm .Cry: ; 40340 - ld a, [CurPartySpecies] + ld a, [wCurPartySpecies] call PlayMonCry ret ``` diff --git a/engine/battle/core.asm b/engine/battle/core.asm index ce5088fc2..3055f4e90 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6451,7 +6451,7 @@ LoadEnemyMon: ; 3e8eb .InitRoamHP: ; HP only uses the lo byte in the RoamMon struct since -; Raikou/Entei/Suicune will have < 256 hp at level 40 +; Raikou and Entei will have < 256 hp at level 40 ld a, [wEnemyMonHP + 1] ld [hl], a jr .Moves diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 85d6e7dc5..6e873a7c7 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -240,7 +240,7 @@ SmashRockScript: PokecenterSignScript: farjumptext PokecenterSignText -MartSignScript +MartSignScript: farjumptext MartSignText DayToTextScript: @@ -331,30 +331,30 @@ BugContestResultsScript: verbosegiveitem BERRY iffalse BugContestResults_NoRoomForBerry -BugContestResults_DidNotWin +BugContestResults_DidNotWin: farwritetext ContestResults_DidNotWinText buttonsound jump BugContestResults_FinishUp ; 0xbc2b1 -BugContestResults_ReturnAfterWinnersPrize ; 0xbc2b1 +BugContestResults_ReturnAfterWinnersPrize: ; 0xbc2b1 farwritetext ContestResults_JoinUsNextTimeText buttonsound -BugContestResults_FinishUp +BugContestResults_FinishUp: checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER iffalse BugContestResults_DidNotLeaveMons farwritetext ContestResults_ReturnPartyText waitbutton special ContestReturnMons -BugContestResults_DidNotLeaveMons +BugContestResults_DidNotLeaveMons: special CheckPartyFullAfterContest ifequal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp ifequal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp ; BUGCONTEST_BOXED_MON farwritetext ContestResults_PartyFullText waitbutton -BugContestResults_CleanUp +BugContestResults_CleanUp: closetext setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOTHING @@ -383,7 +383,7 @@ BugContestResults_CleanUp end ; 0xbc31e -BugContestResults_FirstPlace ; 0xbc31e +BugContestResults_FirstPlace: ; 0xbc31e setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 itemtotext SUN_STONE, MEM_BUFFER_1 farwritetext ContestResults_PlayerWonAPrizeText @@ -393,7 +393,7 @@ BugContestResults_FirstPlace ; 0xbc31e jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc332 -BugContestResults_SecondPlace ; 0xbc332 +BugContestResults_SecondPlace: ; 0xbc332 itemtotext EVERSTONE, MEM_BUFFER_1 farwritetext ContestResults_PlayerWonAPrizeText waitbutton @@ -402,7 +402,7 @@ BugContestResults_SecondPlace ; 0xbc332 jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc343 -BugContestResults_ThirdPlace ; 0xbc343 +BugContestResults_ThirdPlace: ; 0xbc343 itemtotext GOLD_BERRY, MEM_BUFFER_1 farwritetext ContestResults_PlayerWonAPrizeText waitbutton @@ -411,35 +411,35 @@ BugContestResults_ThirdPlace ; 0xbc343 jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc354 -BugContestResults_NoRoomForSunStone ; 0xbc354 +BugContestResults_NoRoomForSunStone: ; 0xbc354 farwritetext BugContestPrizeNoRoomText buttonsound setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc35f -BugContestResults_NoRoomForEverstone ; 0xbc35f +BugContestResults_NoRoomForEverstone: ; 0xbc35f farwritetext BugContestPrizeNoRoomText buttonsound setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc36a -BugContestResults_NoRoomForGoldBerry ; 0xbc36a +BugContestResults_NoRoomForGoldBerry: ; 0xbc36a farwritetext BugContestPrizeNoRoomText buttonsound setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc375 -BugContestResults_NoRoomForBerry ; 0xbc375 +BugContestResults_NoRoomForBerry: ; 0xbc375 farwritetext BugContestPrizeNoRoomText buttonsound setevent EVENT_CONTEST_OFFICER_HAS_BERRY jump BugContestResults_DidNotWin ; 0xbc380 -BugContestResults_CopyContestantsToResults ; 0xbc380 +BugContestResults_CopyContestantsToResults: ; 0xbc380 checkevent EVENT_BUG_CATCHING_CONTESTANT_1A iftrue .skip1 clearevent EVENT_BUG_CATCHING_CONTESTANT_1B diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 8d6f4082f..1573a27b5 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -163,12 +163,12 @@ Function4440: ; 4440 add hl, bc bit INVISIBLE, [hl] jr nz, SetFacingStanding -asm_4448 +asm_4448: ld de, ObjectActionPairPointers + 2 ; use second column jr _HandleObjectAction ; 444d -_HandleObjectAction +_HandleObjectAction: ; call [4 * wObjectStructs[ObjInd, OBJECT_ACTION] + de] ld hl, OBJECT_ACTION add hl, bc diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index 494e8d2a4..20375ba6c 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -417,7 +417,7 @@ _WaterWildmonLookup: ; 2a21d ld bc, WATER_WILDDATA_LENGTH jr _NormalWildmonOK -_JohtoWildmonCheck +_JohtoWildmonCheck: call IsInJohto and a ret z @@ -425,7 +425,7 @@ _JohtoWildmonCheck ld l, e ret -_SwarmWildmonCheck +_SwarmWildmonCheck: call CopyCurrMapDE push hl ld hl, wSwarmFlags @@ -460,11 +460,11 @@ _SwarmWildmonCheck scf ret -_NoSwarmWildmon +_NoSwarmWildmon: and a ret -_NormalWildmonOK +_NormalWildmonOK: call CopyCurrMapDE jr LookUpWildmonsForMapDE ; 2a27f diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 633096cd9..41f7bf47f 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -604,7 +604,7 @@ Phone_StartRinging: ; 9033f HangUp_Wait20Frames: ; 90355 jr Phone_Wait20Frames -Phone_Wait20Frames +Phone_Wait20Frames: ld c, 20 call DelayFrames farcall PhoneRing_CopyTilemapAtOnce diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 58b42953c..e32d1a3a6 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -24,7 +24,7 @@ CheckBreedmonCompatibility: ; 16e1d ld [wTempMonDVs], a ld a, [wBreedMon2DVs + 1] ld [wTempMonDVs + 1], a - ld a, $3 + ld a, TEMPMON ld [wMonType], a predef GetGender pop bc diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 5a7e75dfa..291bd79b0 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -18,7 +18,7 @@ EvolveAfterBattle: ; 421e6 push hl -EvolveAfterBattle_MasterLoop +EvolveAfterBattle_MasterLoop: ld hl, wCurPartyMon inc [hl] diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 3723a3a8d..a8f6c2015 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -1,4 +1,4 @@ -; ScriptCommandTable indexes (see engine/scripting.asm) +; ScriptCommandTable indexes (see engine/overworld/scripting.asm) enum_start enum scall_command ; $00 @@ -315,15 +315,15 @@ giveegg: MACRO db \2 ; level ENDM - enum givepokeitem_command ; $2f -givepokeitem: MACRO - db givepokeitem_command + enum givepokemail_command ; $2f +givepokemail: MACRO + db givepokemail_command dw \1 ; pointer ENDM - enum checkpokeitem_command ; $30 -checkpokeitem: MACRO - db checkpokeitem_command + enum checkpokemail_command ; $30 +checkpokemail: MACRO + db checkpokemail_command dw \1 ; pointer ENDM diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm index 451608723..83d1ad0e6 100644 --- a/macros/scripts/movement.asm +++ b/macros/scripts/movement.asm @@ -1,4 +1,4 @@ -; MovementPointers indexes (see engine/movement.asm) +; MovementPointers indexes (see engine/overworld/movement.asm) enum_start ; Directional movements diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 1931747e5..86ac71ac0 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -223,7 +223,7 @@ OaksLabPoster2Text: line "manner." done -OaksLabTrashcanText +OaksLabTrashcanText: text "There's nothing in" line "here…" done diff --git a/maps/Route31.asm b/maps/Route31.asm index 36bf98412..1a7ba7205 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -195,7 +195,7 @@ Route31MailRecipientScript: .TryGiveKenya: writetext Text_Route31SleepyManGotMail buttonsound - checkpokeitem ReceivedSpearowMailText + checkpokemail ReceivedSpearowMailText ifequal POKEMAIL_WRONG_MAIL, .WrongMail ifequal POKEMAIL_REFUSED, .Refused ifequal POKEMAIL_NO_MAIL, .NoMail diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 79adcf93e..52089c4db 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -29,7 +29,7 @@ RandyScript: playsound SFX_KEY_ITEM waitsfx givepoke SPEAROW, 10, NO_ITEM, TRUE, GiftSpearowName, GiftSpearowOTName - givepokeitem GiftSpearowMail + givepokemail GiftSpearowMail setevent EVENT_GOT_KENYA .alreadyhavekenya writetext UnknownText_0x69ed6 diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 79324161a..c64e348de 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -2320,7 +2320,7 @@ Function100eb4: ; 100eb4 and a call Function100eca -asm_100eb8 +asm_100eb8: ld hl, wcd68 inc [hl] ld a, [hl] @@ -2332,7 +2332,7 @@ asm_100eb8 Function100ec4: ; 100ec4 ret -Function100ec5 +Function100ec5: ld hl, wcd67 inc [hl] ret diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index eeedffb5a..566b00755 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1293,7 +1293,7 @@ MobileTradeAnim_DisplayReceivedMon: call MobileTradeAnim_MonDisplay_UpdateBGMap ret -MobileTradeAnim_DisplayEggData +MobileTradeAnim_DisplayEggData: call WaitTop call MobileTradeAnim_ClearTilemap ld a, HIGH(vBGMap1)