From c88c9c6edfb7122524b319e4601c5d2b97bf06ca Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 31 Jul 2019 07:57:24 +0800 Subject: progress #1 on porting battle_util --- data/battle_scripts_1.s | 2 +- data/data.s | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index c604211bc..317a4991f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -183,7 +183,7 @@ gUnknown_81D8E0B:: @ 81D8E0B BattleScript_MonTookFutureAttack:: @ 81D8E12 .incbin "baserom.gba", 0x1D8E12, 0x8E -gUnknown_81D8EA0:: @ 81D8EA0 +BattleScript_NoMovesLeft:: @ 81D8EA0 .incbin "baserom.gba", 0x1D8EA0, 0x4 BattleScript_SelectingMoveWithNoPP:: @ 81D8EA4 diff --git a/data/data.s b/data/data.s index 05747376d..e8ce97d9c 100644 --- a/data/data.s +++ b/data/data.s @@ -278,9 +278,9 @@ gUnknown_82500C4:: @ 82500C4 gUnknown_82500CC:: @ 82500CC .incbin "baserom.gba", 0x2500CC, 0x38 -sSoundMovesTable:: @ 8250104 - .incbin "baserom.gba", 0x250104, 0x18 + .section .rodata.825011C + .balign 4 gUnknown_825011C:: @ 825011C .incbin "baserom.gba", 0x25011C, 0x3E0 -- cgit v1.2.3