From a13f3a5f4fb4052a8e2b2ea47168ba17df1b5db1 Mon Sep 17 00:00:00 2001 From: E Date: Thu, 3 Dec 2020 19:47:40 -0600 Subject: Ken interaction script --- src/data/npcs.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/data') diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 99979ce..fac14bf 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -772,7 +772,7 @@ KenData: db $04 db $1e db $00 - dw $6f22 ; Pointer to Script + dw ScriptKen ; Pointer to Script tx Text03d3 db KEN_PIC db FIRE_CHARGE_DECK_ID -- cgit v1.2.3 From 9f4c89f35717a703e00be12eb1a429f7d6ca2ed5 Mon Sep 17 00:00:00 2001 From: E Date: Thu, 3 Dec 2020 21:09:31 -0600 Subject: Updating friendly name for Func_cf0c and Func_cf12 --- src/data/npcs.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/data') diff --git a/src/data/npcs.asm b/src/data/npcs.asm index fac14bf..8969296 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -772,7 +772,7 @@ KenData: db $04 db $1e db $00 - dw ScriptKen ; Pointer to Script + dw Script_Ken ; Pointer to Script tx Text03d3 db KEN_PIC db FIRE_CHARGE_DECK_ID -- cgit v1.2.3 From 8a22bc67c3ba83fc472b7656602109fb99dcb562 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 5 Dec 2020 17:39:37 -0600 Subject: Adding Mitch interaction + Fighting club after duel table --- src/data/map_scripts.asm | 2 +- src/data/npcs.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/data') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index f969d45..1b9906c 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -78,7 +78,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $5da3 + dw FightingClubAfterDuel dw $0000 dw $0000 diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 8969296..dac4cf0 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -424,7 +424,7 @@ MitchData: db $00 db $0e db $00 - dw $5dc3 ; Pointer to Script + dw Script_Mitch ; Pointer to Script tx Text03b7 db MITCH_PIC db FIRST_STRIKE_DECK_ID @@ -772,7 +772,7 @@ KenData: db $04 db $1e db $00 - dw Script_Ken ; Pointer to Script + dw ScriptCommand_CheckIfCardInCollection ; Pointer to Script tx Text03d3 db KEN_PIC db FIRE_CHARGE_DECK_ID -- cgit v1.2.3 From d1ca8c6a6a425dc34c399ec3ed751e519d9ac397 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 5 Dec 2020 17:43:18 -0600 Subject: Fixing some references --- src/data/map_scripts.asm | 2 +- src/data/npcs.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/data') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index 1b9906c..3757b52 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -288,7 +288,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6e93 + dw FireClubAfterDuel dw $0000 dw $0000 diff --git a/src/data/npcs.asm b/src/data/npcs.asm index dac4cf0..334fd85 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -772,7 +772,7 @@ KenData: db $04 db $1e db $00 - dw ScriptCommand_CheckIfCardInCollection ; Pointer to Script + dw Script_Ken ; Pointer to Script tx Text03d3 db KEN_PIC db FIRE_CHARGE_DECK_ID -- cgit v1.2.3 From 488c10aea82907742629d560fb0b26bb13e19fb3 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 5 Dec 2020 19:06:48 -0600 Subject: Adding FireClubLobbbyAfterDuel --- src/data/map_scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/data') 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 -- cgit v1.2.3 From 5b32b681bcaa7e4ab0cdd383c8d2c27cdc726275 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 5 Dec 2020 19:12:09 -0600 Subject: Fixing spelling --- src/data/map_scripts.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/data') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index b65b2b0..b05eccd 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 FireClubLobbbyAfterDuel + dw FireClubLobbyAfterDuel dw $0000 dw $0000 -- cgit v1.2.3 From 6c71c05f0e8a703c04f27dd73116c873ec3d61d7 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 5 Dec 2020 21:46:24 -0600 Subject: Adding the after duel tables to the rest of the club lobbies --- src/data/map_scripts.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/data') 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 -- cgit v1.2.3