diff options
| author | E <shealyrd@email.uscupstate.edu> | 2020-12-05 21:46:24 -0600 |
|---|---|---|
| committer | E <shealyrd@email.uscupstate.edu> | 2020-12-05 21:46:24 -0600 |
| commit | 6c71c05f0e8a703c04f27dd73116c873ec3d61d7 (patch) | |
| tree | 126b763ba6f1b9d2e21f1d8b18c8d1300470417d /src | |
| parent | 5b32b681bcaa7e4ab0cdd383c8d2c27cdc726275 (diff) | |
Adding the after duel tables to the rest of the club lobbies
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/map_scripts.asm | 10 | ||||
| -rw-r--r-- | src/engine/bank03.asm | 91 |
2 files changed, 93 insertions, 8 deletions
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index b05eccd..3084f8b 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -98,7 +98,7 @@ MapScripts: ; 1162a (4:562a) dw RockClubLobbyObjects dw $0000 dw $0000 - dw $5ed5 + dw RockClubLobbyAfterDuel dw $0000 dw $0000 @@ -128,7 +128,7 @@ MapScripts: ; 1162a (4:562a) dw WaterClubLobbyObjects dw $0000 dw $0000 - dw $60a2 + dw WaterClubLobbyAfterDuel dw $0000 dw $0000 @@ -158,7 +158,7 @@ MapScripts: ; 1162a (4:562a) dw LightningClubLobbyObjects dw $0000 dw $0000 - dw $636d + dw LightningClubLobbyAfterDuel dw $0000 dw $0000 @@ -218,7 +218,7 @@ MapScripts: ; 1162a (4:562a) dw PsychicClubLobbyObjects dw $0000 dw $6971 - dw $6963 + dw PsychicClubLobbyAfterDuel dw $0000 dw $0000 @@ -248,7 +248,7 @@ MapScripts: ; 1162a (4:562a) dw ScienceClubLobbyObjects dw $0000 dw $0000 - dw $6b57 + dw ScienceClubLobbyAfterDuel dw $0000 dw $0000 diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 1005ffc..62b0709 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -4105,7 +4105,45 @@ Script_Mitch_PrintTrainHarderText tx Text0488 ; 0xde43 - INCROM $de43, $e0b0 + INCROM $de43, $ded5 + + +RockClubLobbyAfterDuel; ded5 (3:5ed5) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xdedc + +.after_duel_table + + db NPC_CHRIS + db NPC_CHRIS + dw $5f0c + dw $5f20 + db $00 + + db NPC_MATTHEW + db NPC_MATTHEW + dw $5f63 + dw $5f78 + db $00 +; 0xdee9 + + INCROM $dee9, $e0a2 + +WaterClubLobbyAfterDuel: ; e0a2 (3:60a2) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xe0a9 + +.after_duel_table + db NPC_IMAKUNI + db NPC_IMAKUNI + dw Script_BeatImakuni + dw Script_LostToImakuni + db $00 +; 0xe0b0 Preload_ImakuniInWaterClubLobby: ; e0b0 (3:60b0) get_flag_value EVENT_IMAKUNI_STATE @@ -4742,7 +4780,23 @@ ScriptJump_TalkToAmyAgain: ; e356 (3:6356) run_command ScriptCommand_QuitScriptFully ; 0xe369 - INCROM $e369, $e525 + INCROM $e369, $e36d + +LightningClubLobbyAfterDuel: ; e36d (3:636d) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xe374 + +.after_duel_table + db NPC_IMAKUNI + db NPC_IMAKUNI + dw Script_BeatImakuni + dw Script_LostToImakuni + db $00 +; 0xe37B + + INCROM $e37B, $e525 GrassClubEntranceAfterDuel: ; e525 (3:6525) ld hl, GrassClubEntranceAfterDuelTable @@ -5326,7 +5380,38 @@ ScriptJump_FinishedSecondRonaldFight ; e959 (3:6959) run_command ScriptCommand_QuitScriptFully ; 0xe963 - INCROM $e963, $ed49 +PsychicClubLobbyAfterDuel: ; e963 (3:6963) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xe96a + +.after_duel_table + + db NPC_ROBERT + db NPC_ROBERT + dw $6995 + dw $69a1 + db $00 + + INCROM $e971, $eb57 + +ScienceClubLobbyAfterDuel; eb57 (3:6b57) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xeb5e + +.after_duel_table + + db NPC_IMAKUNI + db NPC_IMAKUNI + dw Script_BeatImakuni + dw Script_LostToImakuni + db $00 +; 0xeb65 + + INCROM $eb65, $ed49 FireClubLobbyAfterDuel: ; ed49 (3:6d49) ld hl, .after_duel_table |