diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-12-10 16:06:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 16:06:34 -0600 |
| commit | d8f98d97bcd41f710d51925470dc799a6051f022 (patch) | |
| tree | f0c7a02687e4be35960386de99d6422753196d57 /src/data | |
| parent | ec1e57b155d040beeb309a1524d496c6582da384 (diff) | |
| parent | e6d288a61c8a4ad06efda838084ed59d7864d2d1 (diff) | |
Merge pull request #77 from shealyrd/master
[Ken/Mitch interaction scripts] & [All Club After Duel Tables] & function friendly names
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/map_scripts.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index f969d45..3084f8b 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 @@ -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 @@ -278,7 +278,7 @@ MapScripts: ; 1162a (4:562a) dw FireClubLobbyObjects dw FireClubPressedA dw $0000 - dw $6d49 + dw FireClubLobbyAfterDuel dw $0000 dw $0000 @@ -288,7 +288,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6e93 + dw FireClubAfterDuel dw $0000 dw $0000 |