Minor optimizations in src/scripts files

Sha0den · Aug 29, 2024 · 4366d41 · 4366d41
1 parent 66b1e80
commit 4366d41
Show file tree

Hide file tree

Showing 24 changed files with 92 additions and 113 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/src/scripts/deck_machine_room.asm b/src/scripts/deck_machine_room.asm
@@ -1,7 +1,6 @@
 DeckMachineRoomAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_AARON

diff --git a/src/scripts/fighting_club.asm b/src/scripts/fighting_club.asm
@@ -1,7 +1,6 @@
 FightingClubAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_CHRIS

diff --git a/src/scripts/fighting_club_lobby.asm b/src/scripts/fighting_club_lobby.asm
@@ -1,7 +1,6 @@
 FightingClubLobbyAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_IMAKUNI

diff --git a/src/scripts/fire_club.asm b/src/scripts/fire_club.asm
@@ -1,7 +1,6 @@
 FireClubAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_JOHN

diff --git a/src/scripts/fire_club_lobby.asm b/src/scripts/fire_club_lobby.asm
@@ -1,7 +1,6 @@
 FireClubLobbyAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_JESSICA
@@ -10,16 +9,15 @@ FireClubLobbyAfterDuel:
 	dw Script_LostToJessicaInFireClubLobby
 	db $00
 
-FireClubPressedA:
-	ld hl, SlowpokePaintingObjectTable
-	call FindExtraInteractableObjects
-	ret
-
 SlowpokePaintingObjectTable:
 	db 16, 2, NORTH
 	dw Script_ee76
 	db $00
 
+FireClubPressedA:
+	ld hl, SlowpokePaintingObjectTable
+;	fallthrough
+
 ; Given a table with data of the form:
 ;	X, Y, Dir, Script
 ; Searches to try to find a match, and starts a Script if possible

diff --git a/src/scripts/grass_club.asm b/src/scripts/grass_club.asm
@@ -1,7 +1,6 @@
 GrassClubAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_KRISTIN

diff --git a/src/scripts/grass_club_entrance.asm b/src/scripts/grass_club_entrance.asm
@@ -1,7 +1,6 @@
 GrassClubEntranceAfterDuel:
 	ld hl, GrassClubEntranceAfterDuelTable
-	call FindEndOfDuelScript
-	ret
+;	fallthrough
 
 FindEndOfDuelScript:
 	ld c, 0

diff --git a/src/scripts/grass_club_lobby.asm b/src/scripts/grass_club_lobby.asm
@@ -1,7 +1,6 @@
 GrassClubLobbyAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_BRITTANY

diff --git a/src/scripts/hall_of_honor.asm b/src/scripts/hall_of_honor.asm
@@ -1,7 +1,6 @@
 HallOfHonorLoadMap:
 	ld a, SFX_LEGENDARY_CARDS
-	call PlaySFX
-	ret
+	jp PlaySFX
 
 Script_fbe1:
 	start_script

diff --git a/src/scripts/ishiharas_house.asm b/src/scripts/ishiharas_house.asm
@@ -213,7 +213,3 @@ Script_Ronald:
 
 .ows_dc60
 	print_text_quit_fully Text0743
-
-	; could be a commented function, or could be placed by mistake from
-	; someone thinking that the Ronald script ended with more code execution
-	ret
diff --git a/src/scripts/lightning_club.asm b/src/scripts/lightning_club.asm
@@ -1,7 +1,6 @@
 LightningClubAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_JENNIFER

diff --git a/src/scripts/lightning_club_lobby.asm b/src/scripts/lightning_club_lobby.asm
@@ -1,7 +1,6 @@
 LightningClubLobbyAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_IMAKUNI

diff --git a/src/scripts/mason_laboratory.asm b/src/scripts/mason_laboratory.asm
@@ -8,8 +8,7 @@ Script_BeginGame:
 
 MasonLaboratoryAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_SAM

diff --git a/src/scripts/pokemon_dome.asm b/src/scripts/pokemon_dome.asm
@@ -14,8 +14,7 @@ PokemonDomeMovePlayer:
 
 PokemonDomeAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_COURTNEY

diff --git a/src/scripts/psychic_club.asm b/src/scripts/psychic_club.asm
@@ -1,7 +1,6 @@
 PsychicClubAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_DANIEL

diff --git a/src/scripts/psychic_club_entrance.asm b/src/scripts/psychic_club_entrance.asm
@@ -188,7 +188,7 @@ NPCMovement_e90f:
 Preload_Ronald3InClubEntrance:
 	get_event_value EVENT_RONALD_SECOND_DUEL_STATE
 	ld e, 5 ; medal requirement for ronald duel
-	jp Func_e8a0
+	jr Func_e8a0
 
 Script_SecondRonaldDuel:
 	start_script

diff --git a/src/scripts/psychic_club_lobby.asm b/src/scripts/psychic_club_lobby.asm
@@ -1,7 +1,6 @@
 PsychicClubLobbyAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_ROBERT

diff --git a/src/scripts/rock_club.asm b/src/scripts/rock_club.asm
@@ -1,7 +1,6 @@
 RockClubAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_RYAN
@@ -119,4 +118,3 @@ Script_LostToGene:
 
 .ows_e09a
 	print_text_quit_fully Text07b0
-	ret
diff --git a/src/scripts/rock_club_lobby.asm b/src/scripts/rock_club_lobby.asm
@@ -1,7 +1,6 @@
 RockClubLobbyAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_CHRIS

diff --git a/src/scripts/science_club.asm b/src/scripts/science_club.asm
@@ -1,7 +1,6 @@
 ScienceClubAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_JOSEPH

diff --git a/src/scripts/science_club_lobby.asm b/src/scripts/science_club_lobby.asm
@@ -1,7 +1,6 @@
 ScienceClubLobbyAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_IMAKUNI

diff --git a/src/scripts/water_club.asm b/src/scripts/water_club.asm
@@ -12,8 +12,7 @@ WaterClubMovePlayer:
 
 WaterClubAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_SARA
@@ -77,7 +76,7 @@ Script_BeatAmanda:
 	start_script
 	max_out_event_value EVENT_BEAT_AMANDA
 	print_npc_text AmandaPlayerWon1Text
-	give_booster_packs BOOSTER_MYSTERY_LIGHTNING_COLORLESS, BOOSTER_MYSTERY_LIGHTNING_COLORLESS, NO_BOOSTER
+	give_booster_packs BOOSTER_MYSTERY_WATER_COLORLESS, BOOSTER_MYSTERY_WATER_COLORLESS, NO_BOOSTER
 	print_npc_text AmandaPlayerWon2Text
 	quit_script_fully
 

diff --git a/src/scripts/water_club_lobby.asm b/src/scripts/water_club_lobby.asm
@@ -1,7 +1,6 @@
 WaterClubLobbyAfterDuel:
 	ld hl, .after_duel_table
-	call FindEndOfDuelScript
-	ret
+	jp FindEndOfDuelScript
 
 .after_duel_table
 	db NPC_IMAKUNI