diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-05 08:15:58 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-05 08:15:58 +0800 |
| commit | b9d547a02f615b991713158bb7068ce0d7169088 (patch) | |
| tree | b09fb1c380e86fa9c2ba181dd669eead85f556b9 /data | |
| parent | 5568895b043dc37e95be0e99787541d78a7c6fee (diff) | |
ported battle_controller_player from pokeem and matched several new functions
Diffstat (limited to 'data')
| -rw-r--r-- | data/data.s | 10 | ||||
| -rw-r--r-- | data/data_83F5738.s | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/data/data.s b/data/data.s index 83621f378..cc024364c 100644 --- a/data/data.s +++ b/data/data.s @@ -163,7 +163,7 @@ gTrainerBackPicCoords:: @ 8239F8C gTrainerBackPicTable:: @ 8239FA4 .incbin "baserom.gba", 0x239FA4, 0x30 -gUnknown_8239FD4:: @ 8239FD4 +gTrainerBackPicPaletteTable:: @ 8239FD4 .incbin "baserom.gba", 0x239FD4, 0x30 gEnemyMonElevation:: @ 823A004 @@ -236,7 +236,7 @@ gUnknown_824F048:: @ 824F048 gTypeEffectiveness:: @ 824F050 .incbin "baserom.gba", 0x24F050, 0x150 -gUnknown_824F1A0:: @ 824F1A0 +gTypeNames:: @ 824F1A0 .incbin "baserom.gba", 0x24F1A0, 0x80 gUnknown_824F220:: @ 824F220 @@ -329,11 +329,7 @@ gUnknown_8250888:: @ 8250888 gUnknown_8250892:: @ 8250892 .incbin "baserom.gba", 0x250892, 0xA -gUnknown_825089C:: @ 825089C - .incbin "baserom.gba", 0x25089C, 0xE4 - -gUnknown_8250980:: @ 8250980 - .incbin "baserom.gba", 0x250980, 0xC + .section .rodata.825098C gUnknown_825098C:: @ 825098C .incbin "baserom.gba", 0x25098C, 0x8 diff --git a/data/data_83F5738.s b/data/data_83F5738.s index dc09b0532..2b5b1d1f9 100644 --- a/data/data_83F5738.s +++ b/data/data_83F5738.s @@ -387,7 +387,7 @@ gUnknown_83FE6B5:: @ 83FE6B5 gUnknown_83FE6D0:: @ 83FE6D0 .incbin "baserom.gba", 0x3FE6D0, 0x5 -gUnknown_83FE6D5:: @ 83FE6D5 +gText_WhatWillPkmnDo:: @ 83FE6D5 .incbin "baserom.gba", 0x3FE6D5, 0x11 gUnknown_83FE6E6:: @ 83FE6E6 @@ -396,7 +396,7 @@ gUnknown_83FE6E6:: @ 83FE6E6 gUnknown_83FE6FA:: @ 83FE6FA .incbin "baserom.gba", 0x3FE6FA, 0x1A -gUnknown_83FE714:: @ 83FE714 +gText_LinkStandby:: @ 83FE714 .incbin "baserom.gba", 0x3FE714, 0x11 gUnknown_83FE725:: @ 83FE725 @@ -405,10 +405,10 @@ gUnknown_83FE725:: @ 83FE725 gUnknown_83FE747:: @ 83FE747 .incbin "baserom.gba", 0x3FE747, 0x1F -gUnknown_83FE766:: @ 83FE766 +gText_MoveInterfacePP:: @ 83FE766 .incbin "baserom.gba", 0x3FE766, 0x4 -gUnknown_83FE76A:: @ 83FE76A +gText_MoveInterfaceType:: @ 83FE76A .incbin "baserom.gba", 0x3FE76A, 0x6 gUnknown_83FE770:: @ 83FE770 @@ -417,7 +417,7 @@ gUnknown_83FE770:: @ 83FE770 gUnknown_83FE791:: @ 83FE791 .incbin "baserom.gba", 0x3FE791, 0xF -gUnknown_83FE7A0:: @ 83FE7A0 +gText_BattleSwitchWhich:: @ 83FE7A0 .incbin "baserom.gba", 0x3FE7A0, 0x6C gUnknown_83FE80C:: @ 83FE80C |