do some labeling

This commit is contained in:
camthesaxman 2017-07-10 23:33:46 -05:00
parent 24ac9f1767
commit cb6e1059e6
7 changed files with 909 additions and 850 deletions

View File

@ -3,7 +3,7 @@
#include "string_util.h"
void sub_80A3684(void);
void ResetBagScrollPositions(void);
void ClearBag(void);
void sub_80A3E0C(void);
void sub_80A3FA0(u16 *a, u8 b, u8 c, u8 d, u8 e, u16 f);

View File

@ -374,7 +374,7 @@ static void sub_81466E8(u8 taskId, s8 direction)
lsls r0, 3\n\
ldr r1, _08146748 @ =gTasks + 0x8\n\
adds r6, r0, r1\n\
ldr r4, _0814674C @ =gUnknown_03005D10\n\
ldr r4, _0814674C @ =gBagPocketScrollStates\n\
movs r0, 0xC\n\
adds r0, r4\n\
mov r8, r0\n\
@ -412,7 +412,7 @@ _08146728:\n\
b _08146766\n\
.align 2, 0\n\
_08146748: .4byte gTasks + 0x8\n\
_0814674C: .4byte gUnknown_03005D10\n\
_0814674C: .4byte gBagPocketScrollStates\n\
_08146750:\n\
mov r4, r8\n\
ldrb r0, [r4, 0x2]\n\
@ -487,7 +487,7 @@ static void sub_8146810(s8 berry)
asrs r1, r0, 24\n\
cmp r1, 0\n\
ble _08146848\n\
ldr r0, _08146840 @ =gUnknown_03005D10\n\
ldr r0, _08146840 @ =gBagPocketScrollStates\n\
adds r4, r0, 0\n\
adds r4, 0xC\n\
ldrb r2, [r0, 0xC]\n\
@ -504,12 +504,12 @@ static void sub_8146810(s8 berry)
movs r0, 0x7\n\
b _0814686E\n\
.align 2, 0\n\
_08146840: .4byte gUnknown_03005D10\n\
_08146840: .4byte gBagPocketScrollStates\n\
_08146844:\n\
adds r0, r2, r3\n\
b _0814686E\n\
_08146848:\n\
ldr r0, _08146868 @ =gUnknown_03005D10\n\
ldr r0, _08146868 @ =gBagPocketScrollStates\n\
adds r5, r0, 0\n\
adds r5, 0xC\n\
ldrb r2, [r0, 0xC]\n\
@ -525,7 +525,7 @@ _08146848:\n\
strb r1, [r6, 0xC]\n\
b _08146870\n\
.align 2, 0\n\
_08146868: .4byte gUnknown_03005D10\n\
_08146868: .4byte gBagPocketScrollStates\n\
_0814686C:\n\
adds r0, r2, r4\n\
_0814686E:\n\
@ -538,7 +538,7 @@ _08146870:\n\
ldrb r1, [r0, 0x1]\n\
ldrb r0, [r0]\n\
adds r1, r0\n\
ldr r0, _081468B0 @ =gUnknown_03005D24\n\
ldr r0, _081468B0 @ =gCurrentBagPocketItemSlots\n\
ldr r0, [r0]\n\
lsls r1, 2\n\
adds r1, r0\n\
@ -559,7 +559,7 @@ _08146870:\n\
bx r0\n\
.align 2, 0\n\
_081468AC: .4byte gScriptItemId\n\
_081468B0: .4byte gUnknown_03005D24\n\
_081468B0: .4byte gCurrentBagPocketItemSlots\n\
_081468B4: .4byte gUnknown_0203932C\n\
_081468B8: .4byte gSprites\n\
.syntax divided\n");

File diff suppressed because it is too large Load Diff

View File

@ -114,7 +114,7 @@ void sub_8052E4C(void)
sub_808C0A0();
ZeroPlayerPartyMons();
ZeroEnemyPartyMons();
sub_80A3684();
ResetBagScrollPositions();
}
void NewGameInitData(void)

View File

@ -94,13 +94,13 @@ gUnknown_030006DC: @ 30006DC
.include "src/field_effect.o"
gUnknown_03000700: @ 3000700
sPopupMenuSelection: @ 3000700
.space 0x1
gUnknown_03000701: @ 3000701
sReturnLocation: @ 3000701
.space 0x3
gUnknown_03000704: @ 3000704
sPopupMenuActionList: @ 3000704
.space 0x4
gUnknown_03000708: @ 3000708

View File

@ -234,10 +234,10 @@ gUnknown_03005CF0: @ 3005CF0
gUnknown_03005D00: @ 3005D00
.space 0x10
gUnknown_03005D10: @ 3005D10
gBagPocketScrollStates: @ 3005D10
.space 0x14
gUnknown_03005D24: @ 3005D24
gCurrentBagPocketItemSlots: @ 3005D24
.space 0x4
gUnknown_03005D28: @ 3005D28

View File

@ -606,40 +606,9 @@ gUnknown_020384F8: @ 20384F8
.include "src/map_name_popup.o"
.include "src/item_menu.o"
.align 2
gUnknown_0203853C: @ 203853C
.space 0x4
gUnknown_02038540: @ 2038540
.space 0x4
gUnknown_02038544: @ 2038544
.space 0xC
gUnknown_02038550: @ 2038550
.space 0x4
gUnknown_02038554: @ 2038554
.space 0x4
gUnknown_02038558: @ 2038558
.space 0x1
gUnknown_02038559: @ 2038559
.space 0x1
gUnknown_0203855A: @ 203855A
.space 0x1
gUnknown_0203855B: @ 203855B
.space 0x1
gUnknown_0203855C: @ 203855C
.space 0x2
gScriptItemId: @ 203855E
.space 0x2
gUnknown_02038560: @ 2038560
.space 0x1
@ -655,7 +624,7 @@ gUnknown_02038563: @ 2038563
gUnknown_02038564: @ 2038564
.space 0x4
gUnknown_02038568: @ 2038568
sPokeballSpriteId: @ 2038568
.space 0x4
gUnknown_0203856C: @ 203856C