diff options
| author | Andrew Martinek <andrewrmartinek@gmail.com> | 2016-07-29 15:58:18 -0400 |
|---|---|---|
| committer | Andrew Martinek <andrewrmartinek@gmail.com> | 2016-07-29 15:58:18 -0400 |
| commit | 30a8cb35cf3ace29226f1c268db0d448cd23751d (patch) | |
| tree | 2948bafe0a8ee9f4edad001084985b612622a9fd /src/data | |
| parent | 8bfb38d813af48ed872443e90caaa3b32acca844 (diff) | |
Began Disassembling Scripting system and AI.
Diffstat (limited to 'src/data')
| -rwxr-xr-x | src/data/map_scripts.asm | 4 | ||||
| -rwxr-xr-x | src/data/unknownNPCData.asm | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index b85eb6f..ae4e355 100755 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -138,8 +138,8 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6157 - dw $613f + dw WaterClubAfterDuel + dw WaterClubMovePlayer dw $0000 ; LIGHTNING_CLUB_ENTRANCE diff --git a/src/data/unknownNPCData.asm b/src/data/unknownNPCData.asm index 6994cea..2786188 100755 --- a/src/data/unknownNPCData.asm +++ b/src/data/unknownNPCData.asm @@ -32,8 +32,8 @@ PointerTable_118f5: dw Data_11b3c
dw Data_11b49
dw Data_11b56
- dw Data_11b63
- dw Data_11b70
+ dw SaraData
+ dw AmandaData
dw Data_11b7d
dw Data_11b8a
dw Data_11b97
@@ -507,29 +507,29 @@ Data_11b56: db $11
db $03
db $16
-Data_11b63:
- db $1f
+SaraData:
+ db SARA ; trainer id
db $20
db $00
db $0e
db $00
- dw $6177 ; Pointer to NPC Data
+ dw OWSequence_Sara ; Pointer to NPC Data
db $bc
db $03
- db $24
+ db SARA_PIC ; battle profile picture
db $22
db $03
db $15
-Data_11b70:
- db $20
+AmandaData:
+ db AMANDA
db $20
db $00
db $16
db $00
- dw $619e ; Pointer to NPC Data
+ dw OWSequence_Amanda ; Pointer to NPC Data
db $bd
db $03
- db $25
+ db AMANDA_PIC
db $23
db $03
db $15
@@ -539,7 +539,7 @@ Data_11b7d: db $00
db $26
db $00
- dw $621c ; Pointer to NPC Data
+ dw OWSequence_Joshua ; Pointer to NPC Data
db $be
db $03
db $17
|