diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-29 06:47:34 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-31 07:58:08 +0800 |
| commit | a4263a6bd8fa3a31d2b1de1279414b403a58e28b (patch) | |
| tree | 0e078ce0ceecc2c99bdc89c81171baad0a8ffb02 /data | |
| parent | 935f93a0752604f1375c79e6225baa6774b60280 (diff) | |
ported battle_controller_safari from pokeem
Diffstat (limited to 'data')
| -rw-r--r-- | data/data.s | 2 | ||||
| -rw-r--r-- | data/data_83FECCC.s | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/data/data.s b/data/data.s index 943c71678..41bbdfade 100644 --- a/data/data.s +++ b/data/data.s @@ -157,7 +157,7 @@ gTrainerFrontPicPaletteTable:: @ 8239A1C gTrainerBackAnimsPtrTable:: @ 8239F74 .incbin "baserom.gba", 0x239F74, 0x18 -gUnknown_8239F8C:: @ 8239F8C +gTrainerBackPicCoords:: @ 8239F8C .incbin "baserom.gba", 0x239F8C, 0x18 gTrainerBackPicTable:: @ 8239FA4 diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 6aade55b6..196468ace 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -24,8 +24,10 @@ gUnknown_83FECF4:: @ 83FECF4 gUnknown_83FECFA:: @ 83FECFA .incbin "baserom.gba", 0x3FECFA, 0x6 -gUnknown_83FED00:: @ 83FED00 - .incbin "baserom.gba", 0x3FED00, 0x380 + .section .rodata.83FEDE4 + +gUnknown_83FEDE4:: @ 83FEDE4 + .incbin "baserom.gba", 0x3FEDE4, 0x29C gUnknown_83FF080:: @ 83FF080 .incbin "baserom.gba", 0x3FF080, 0xB0 |