diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/map_scripts.asm | 2 | ||||
| -rw-r--r-- | src/engine/bank03.asm | 18 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index 3757b52..b65b2b0 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -278,7 +278,7 @@ MapScripts: ; 1162a (4:562a) dw FireClubLobbyObjects dw FireClubPressedA dw $0000 - dw $6d49 + dw FireClubLobbbyAfterDuel dw $0000 dw $0000 diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 5033048..bb1c33c 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -5326,7 +5326,23 @@ ScriptJump_FinishedSecondRonaldFight ; e959 (3:6959) run_command ScriptCommand_QuitScriptFully ; 0xe963 - INCROM $e963, $ed57 + INCROM $e963, $ed49 + +FireClubLobbbyAfterDuel: ; ed49 (3:6d49) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xed50 + +.after_duel_table + db NPC_JESSICA + db NPC_JESSICA + dw $6dba + dw $6dce + db $00 + +; 0xed57 + FireClubPressedA: ; ed57 (3:6d57) ld hl, SlowpokePaintingObjectTable |