From 9dcdad5e60fbc10ba81ae127743c78a6b00d3dd5 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 26 Oct 2020 15:45:57 -0400 Subject: Comment, remove, or revise many unreferenced labels --- engine/overworld/scripting.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'engine/overworld/scripting.asm') diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 7e86795fc..457b75a5d 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -2173,8 +2173,7 @@ Script_warpcheck: farcall EnableEvents ret -Script_enableevents: -; unused +Script_enableevents: ; unreferenced farcall EnableEvents ret -- cgit v1.2.3 From 6d333bed5fde0c2da0a6a9df2ccae83933400e42 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 28 Oct 2020 10:21:10 -0400 Subject: Replace many '; unused' with '; unreferenced' --- engine/overworld/scripting.asm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'engine/overworld/scripting.asm') diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 457b75a5d..9ba79f5e0 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -2203,7 +2203,8 @@ Script_writeunusedbytebuffer: ld [wUnusedScriptByteBuffer], a ret - db closetext_command ; unused +UnusedClosetextScript: ; unreferenced + closetext Script_closetext: call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap @@ -2352,7 +2353,7 @@ Script_checksave: ld [wScriptVar], a ret -; unused +Script_checkver_duplicate: ; unreferenced ld a, [.gs_version] ld [wScriptVar], a ret -- cgit v1.2.3 From ea426a88794b1d216a278b54d18cefafbf7d8771 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 28 Oct 2020 13:35:39 -0400 Subject: Identify more WRAM labels, and start a _DummyFunction label convention --- engine/overworld/scripting.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engine/overworld/scripting.asm') diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 9ba79f5e0..8258ea830 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -458,11 +458,11 @@ Script_verbosegiveitem: ld de, GiveItemScript jp ScriptCall -ret_96f76: +GiveItemScript_DummyFunction: ret GiveItemScript: - callasm ret_96f76 + callasm GiveItemScript_DummyFunction writetext .ReceivedItemText iffalse .Full waitsfx @@ -2316,13 +2316,13 @@ Script_endall: ret Script_halloffame: - ld hl, wGameTimerPause - res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] + ld hl, wGameTimerPaused + res GAME_TIMER_PAUSED_F, [hl] farcall StubbedTrainerRankings_HallOfFame farcall StubbedTrainerRankings_HallOfFame2 farcall HallOfFame - ld hl, wGameTimerPause - set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] + ld hl, wGameTimerPaused + set GAME_TIMER_PAUSED_F, [hl] jr ReturnFromCredits Script_credits: -- cgit v1.2.3 From bcc0d633e948227e68da8a264d1533771a54b5c4 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 29 Oct 2020 14:45:40 -0400 Subject: Identify the remaining (non-mobile) uses of another WRAM union --- engine/overworld/scripting.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/overworld/scripting.asm') diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 8258ea830..d9878269b 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -1703,7 +1703,7 @@ Script_givepokemail: push bc inc hl ld bc, MAIL_MSG_LENGTH - ld de, wd002 + ld de, wMonMailMessageBuffer ld a, [wScriptBank] call FarCopyBytes pop bc -- cgit v1.2.3