diff options
| author | E <shealyrd@email.uscupstate.edu> | 2020-12-10 14:28:38 -0600 |
|---|---|---|
| committer | E <shealyrd@email.uscupstate.edu> | 2020-12-10 14:28:38 -0600 |
| commit | e6d288a61c8a4ad06efda838084ed59d7864d2d1 (patch) | |
| tree | f0c7a02687e4be35960386de99d6422753196d57 /src | |
| parent | 2a777c9c4f5474226dc1d335cd9e4724e4fc8257 (diff) | |
| parent | 8ed3bdae90bc13a921ceaccb55fb4eb37ecb79e1 (diff) | |
Merge branch 'master' of https://github.com/shealyrd/poketcg
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank03.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 1bda8fe..58367e2 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -4015,7 +4015,7 @@ FightingClubAfterDuel: ; dda3 (3:5da3) db $00 ; ddc3 -;ScriptCommand_JumpBasedOnFightingClubPupilStatus + Script_Mitch: ; ddc3 (3:5dc3) start_script run_command ScriptCommand_TryGivePCPack @@ -5537,7 +5537,7 @@ Script_Clerk7: ; eb53 (3:6b53) INCROM $eb53, $eb57 -ScienceClubLobbyAfterDuel; eb57 (3:6b57) +ScienceClubLobbyAfterDuel:; eb57 (3:6b57) ld hl, .after_duel_table call FindEndOfBattleScript ret @@ -5724,7 +5724,7 @@ Script_Ken: ; ef22 (3:6f22) db EVENT_FLAG_23 dw .have_300_cards run_command ScriptCommand_CheckRawAmountOfCardsOwned - dw 300; + dw 300 dw .have_300_cards run_command ScriptCommand_JumpIfFlagZero1 db EVENT_FLAG_24 @@ -5806,7 +5806,7 @@ Script_LoseToKen: ; ef78 (3:6f78) run_command ScriptCommand_QuitScriptFully ; 0xef83 -Script_KenBattle_AlreadyHaveMedal; ef83 (3:6f83) +Script_KenBattle_AlreadyHaveMedal: ; ef83 (3:6f83) run_command ScriptCommand_PrintTextString tx Text06c6 run_command ScriptCommand_AskQuestionJump |