summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-08-03 06:55:42 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-08-03 06:55:42 +0800
commit6a063cf74ad8168e9080c1f3be20e5dfe3c3187c (patch)
treefb1c3ab1ea836434cdd86be3b4e59a5fc8b8571f /data
parent742a7ee1beab323e30d60c599697a2a831c4f4de (diff)
ported battle_controller_opponent from pokeem and corrected lots of stuff
Diffstat (limited to 'data')
-rw-r--r--data/data.s5
1 files changed, 2 insertions, 3 deletions
diff --git a/data/data.s b/data/data.s
index 8b3e66bdc..0a2298a65 100644
--- a/data/data.s
+++ b/data/data.s
@@ -145,7 +145,7 @@ gMonShinyPaletteTable:: @ 82380CC
gTrainerFrontAnimsPtrTable:: @ 82390DC
.incbin "baserom.gba", 0x2390DC, 0x250
-gUnknown_823932C:: @ 823932C
+gTrainerFrontPicCoords:: @ 823932C
.incbin "baserom.gba", 0x23932C, 0x250
gTrainerFrontPicTable:: @ 823957C
@@ -350,8 +350,7 @@ gSpriteSheet_EnemyShadow:: @ 8250A0C
gSpriteTemplate_EnemyShadow:: @ 8250A1C
.incbin "baserom.gba", 0x250A1C, 0x18
-gUnknown_8250A34:: @ 8250A34
- .incbin "baserom.gba", 0x250A34, 0xEC
+ .section .rodata.8250B20
gUnknown_8250B20:: @ 8250B20
.incbin "baserom.gba", 0x250B20, 0xE4