dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #69 from pret/item_pc

Browse Source 
Item pc
This commit is contained in:
PikalaxALT
2019-06-17 13:46:53 -04:00
committed by GitHub
parent e28c767612 2b750cf444
commit e3de3422a8
75 changed files with 1588 additions and 3281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+13 -1
View File
@@ -61,6 +61,16 @@ MAPJSON := tools/mapjson/mapjson
$(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR)) $(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR))
infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
# Build tools when building the rom
# Disable dependency scanning for clean/tidy/tools
ifeq (,$(filter-out all compare,$(MAKECMDGOALS)))
$(call infoshell, $(MAKE) tools)
else
NODEP := 1
endif
C_SRCS := $(wildcard $(C_SUBDIR)/*.c) C_SRCS := $(wildcard $(C_SUBDIR)/*.c)
C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS)) C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
@@ -76,9 +86,11 @@ SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS))
OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS)
OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS)) OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
MAKEFLAGS += --no-print-directory
all: rom all: rom
rom: tools $(ROM) rom: $(ROM)
tools: tools:
@$(MAKE) -C tools/gbagfx @$(MAKE) -C tools/gbagfx
asm/battle_1.s
+3 -3
View File
@@ -223,11 +223,11 @@ sub_800F380: @ 800F380
movs r0, 0x2 movs r0, 0x2
movs r1, 0x12 movs r1, 0x12
movs r2, 0x10 movs r2, 0x10
bl sub_815001C bl TextWindow_SetUserSelectedFrame
movs r0, 0x2 movs r0, 0x2
movs r1, 0x22 movs r1, 0x22
movs r2, 0x10 movs r2, 0x10
bl sub_815001C bl TextWindow_SetUserSelectedFrame
ldr r4, _0800F3F0 @ =gPlttBufferUnfaded ldr r4, _0800F3F0 @ =gPlttBufferUnfaded
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0xB8 adds r0, 0xB8
@@ -257,7 +257,7 @@ sub_800F380: @ 800F380
movs r0, 0 movs r0, 0
movs r1, 0x30 movs r1, 0x30
movs r2, 0x70 movs r2, 0x70
bl sub_814FEAC bl TextWindow_SetBubbleFrame_841F1C8
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0xEC adds r0, 0xEC
movs r1, 0 movs r1, 0
asm/berry_crush_3.s
+4 -4
View File
@@ -2097,7 +2097,7 @@ _0814E6E0:
ldr r4, _0814E700 @ =0x0000021d ldr r4, _0814E700 @ =0x0000021d
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD0 movs r2, 0xD0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
adds r2, r4, 0 adds r2, r4, 0
@@ -2246,7 +2246,7 @@ sub_814E80C: @ 814E80C
adds r5, r4, r0 adds r5, r4, r0
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r5] ldrb r0, [r5]
bl RemoveWindow bl RemoveWindow
adds r0, r4, 0 adds r0, r4, 0
@@ -2309,7 +2309,7 @@ _0814E876:
ldr r4, _0814E8AC @ =0x0000021d ldr r4, _0814E8AC @ =0x0000021d
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD0 movs r2, 0xD0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r7, 0x2] ldrb r0, [r7, 0x2]
movs r1, 0 movs r1, 0
adds r2, r4, 0 adds r2, r4, 0
@@ -2499,7 +2499,7 @@ _0814EA3C: .4byte gMain
_0814EA40: _0814EA40:
ldrb r0, [r7, 0x2] ldrb r0, [r7, 0x2]
movs r1, 0x1 movs r1, 0x1
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r7, 0x2] ldrb r0, [r7, 0x2]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r7, 0x2] ldrb r0, [r7, 0x2]
asm/berry_pouch.s
+13 -13
View File
@@ -130,7 +130,7 @@ _0813CE32:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _0813CE56 beq _0813CE56
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -199,10 +199,10 @@ _0813CEEC:
bl ResetSpriteData bl ResetSpriteData
b _0813CFD2 b _0813CFD2
_0813CEF2: _0813CEF2:
bl sub_80984D8 bl ResetItemMenuIconState
b _0813CFD2 b _0813CFD2
_0813CEF8: _0813CEF8:
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0813CFD2 bne _0813CFD2
@@ -798,7 +798,7 @@ _0813D3D6:
ldrb r1, [r0, 0x9] ldrb r1, [r0, 0x9]
movs r0, 0x1 movs r0, 0x1
eors r0, r1 eors r0, r1
bl sub_8098940 bl DestroyItemMenuIcon
ldr r1, [r4] ldr r1, [r4]
ldrb r0, [r1, 0x7] ldrb r0, [r1, 0x7]
cmp r0, r5 cmp r0, r5
@@ -1028,7 +1028,7 @@ sub_813D594: @ 813D594
movs r1, 0 movs r1, 0
movs r2, 0x10 movs r2, 0x10
movs r3, 0x1E movs r3, 0x1E
bl sub_80F6B08 bl SetBgRectPal
movs r0, 0x1 movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8 add sp, 0x8
@@ -1869,7 +1869,7 @@ _0813DC18: .4byte gUnknown_203F384
_0813DC1C: .4byte gUnknown_84643B0 _0813DC1C: .4byte gUnknown_84643B0
_0813DC20: .4byte gUnknown_203F388 _0813DC20: .4byte gUnknown_203F388
_0813DC24: _0813DC24:
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -1985,7 +1985,7 @@ _0813DC86:
ldr r1, _0813DD68 @ =gStringVar1 ldr r1, _0813DD68 @ =gStringVar1
bl sub_813D39C bl sub_813D39C
ldr r5, _0813DD6C @ =gStringVar4 ldr r5, _0813DD6C @ =gStringVar4
ldr r1, _0813DD70 @ =gUnknown_84162FF ldr r1, _0813DD70 @ =gOtherText_StrVar1
adds r0, r5, 0 adds r0, r5, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
@@ -2014,7 +2014,7 @@ _0813DD60: .4byte gUnknown_203F388
_0813DD64: .4byte gUnknown_846437C _0813DD64: .4byte gUnknown_846437C
_0813DD68: .4byte gStringVar1 _0813DD68: .4byte gStringVar1
_0813DD6C: .4byte gStringVar4 _0813DD6C: .4byte gStringVar4
_0813DD70: .4byte gUnknown_84162FF _0813DD70: .4byte gOtherText_StrVar1
thumb_func_end sub_813DBE4 thumb_func_end sub_813DBE4
thumb_func_start sub_813DD74 thumb_func_start sub_813DD74
@@ -3367,15 +3367,15 @@ sub_813E910: @ 813E910
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE0 movs r2, 0xE0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
movs r0, 0 movs r0, 0
movs r1, 0x13 movs r1, 0x13
movs r2, 0xD0 movs r2, 0xD0
bl sub_814FEAC bl TextWindow_SetBubbleFrame_841F1C8
movs r0, 0 movs r0, 0
movs r1, 0xA movs r1, 0xA
movs r2, 0xC0 movs r2, 0xC0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
ldr r0, _0813E998 @ =gTMCaseMainWindowPalette ldr r0, _0813E998 @ =gTMCaseMainWindowPalette
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x20 movs r2, 0x20
@@ -3562,7 +3562,7 @@ sub_813EA98: @ 813EA98
adds r4, r0 adds r4, r0
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4] ldrb r0, [r4]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4] ldrb r0, [r4]
@@ -3589,7 +3589,7 @@ sub_813EACC: @ 813EACC
cmp r0, 0xFF cmp r0, 0xFF
beq _0813EB04 beq _0813EB04
movs r1, 0 movs r1, 0
bl sub_810F260 bl ClearMenuWindow_BorderThickness2
ldrb r0, [r4] ldrb r0, [r4]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4] ldrb r0, [r4]
asm/buy_menu_helpers.s
+3 -3
View File
@@ -24,15 +24,15 @@ _0813F686:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xD0 movs r2, 0xD0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
movs r0, 0 movs r0, 0
movs r1, 0x13 movs r1, 0x13
movs r2, 0xE0 movs r2, 0xE0
bl sub_814FEAC bl TextWindow_SetBubbleFrame_841F1C8
movs r0, 0 movs r0, 0
movs r1, 0xA movs r1, 0xA
movs r2, 0xF0 movs r2, 0xF0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
movs r0, 0 movs r0, 0
bl PutWindowTilemap bl PutWindowTilemap
movs r0, 0x4 movs r0, 0x4
asm/clear_save_data_screen.s
+2 -2
View File
@@ -109,11 +109,11 @@ _080F564A:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xF0 movs r2, 0xF0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0xF0 movs r2, 0xF0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
b _080F56E2 b _080F56E2
_080F5660: _080F5660:
movs r0, 0x1 movs r0, 0x1
asm/dodrio_berry_picking.s
+2 -2
View File
@@ -6474,7 +6474,7 @@ sub_81538D0: @ 81538D0
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD0 movs r2, 0xD0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD movs r2, 0xD
@@ -8351,7 +8351,7 @@ sub_8154720: @ 8154720
movs r0, 0 movs r0, 0
movs r1, 0xA movs r1, 0xA
movs r2, 0xB0 movs r2, 0xB0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8154720 thumb_func_end sub_8154720
asm/field_specials.s
+3 -3
View File
@@ -2071,7 +2071,7 @@ sub_80CB580: @ 80CB580
ldr r5, _080CB62C @ =0x0000021d ldr r5, _080CB62C @ =0x0000021d
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0xD0 movs r2, 0xD0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
adds r2, r5, 0 adds r2, r5, 0
@@ -2141,7 +2141,7 @@ sub_80CB63C: @ 80CB63C
ldr r4, _080CB654 @ =gUnknown_2039A0C ldr r4, _080CB654 @ =gUnknown_2039A0C
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4] ldrb r0, [r4]
bl RemoveWindow bl RemoveWindow
pop {r4} pop {r4}
@@ -2862,7 +2862,7 @@ sub_80CBBAC: @ 80CBBAC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl sub_810F4D8 bl ClearMenuWindow
ldrh r0, [r4, 0x22] ldrh r0, [r4, 0x22]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
asm/hall_of_fame.s
+1 -1
View File
@@ -1194,7 +1194,7 @@ sub_80F26D4: @ 80F26D4
ldr r1, _080F2758 @ =0x0000021d ldr r1, _080F2758 @ =0x0000021d
movs r0, 0x1 movs r0, 0x1
movs r2, 0xD0 movs r2, 0xD0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x78 movs r0, 0x78
strh r0, [r4, 0xE] strh r0, [r4, 0xE]
ldr r0, _080F275C @ =Task_Hof_WaitAndPrintPlayerInfo ldr r0, _080F275C @ =Task_Hof_WaitAndPrintPlayerInfo
asm/item.s
+10 -10
View File
@@ -169,7 +169,7 @@ CopyItemName: @ 8099E90
.align 2, 0 .align 2, 0
_08099EB4: .4byte gUnknown_84162BD _08099EB4: .4byte gUnknown_84162BD
_08099EB8: _08099EB8:
bl ItemId_GetItem bl ItemId_GetName
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
@@ -957,8 +957,8 @@ _0809A458:
bx r1 bx r1
thumb_func_end AddPCItem thumb_func_end AddPCItem
thumb_func_start sub_809A460 thumb_func_start RemoveItemFromPC
sub_809A460: @ 809A460 RemoveItemFromPC: @ 809A460
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1027,10 +1027,10 @@ _0809A4D8:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0809A4E4: .4byte gSaveBlock1Ptr _0809A4E4: .4byte gSaveBlock1Ptr
thumb_func_end sub_809A460 thumb_func_end RemoveItemFromPC
thumb_func_start sub_809A4E8 thumb_func_start ItemPcCompaction
sub_809A4E8: @ 809A4E8 ItemPcCompaction: @ 809A4E8
push {r4-r7,lr} push {r4-r7,lr}
movs r2, 0 movs r2, 0
_0809A4EC: _0809A4EC:
@@ -1079,7 +1079,7 @@ _0809A52E:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0809A53C: .4byte gSaveBlock1Ptr _0809A53C: .4byte gSaveBlock1Ptr
thumb_func_end sub_809A4E8 thumb_func_end ItemPcCompaction
thumb_func_start sub_809A540 thumb_func_start sub_809A540
sub_809A540: @ 809A540 sub_809A540: @ 809A540
@@ -1567,8 +1567,8 @@ _0809A8B8:
bx r1 bx r1
thumb_func_end SanitizeItemId thumb_func_end SanitizeItemId
thumb_func_start ItemId_GetItem thumb_func_start ItemId_GetName
ItemId_GetItem: @ 809A8BC ItemId_GetName: @ 809A8BC
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1583,7 +1583,7 @@ ItemId_GetItem: @ 809A8BC
bx r1 bx r1
.align 2, 0 .align 2, 0
_0809A8D8: .4byte gItems _0809A8D8: .4byte gItems
thumb_func_end ItemId_GetItem thumb_func_end ItemId_GetName
thumb_func_start itemid_get_number thumb_func_start itemid_get_number
itemid_get_number: @ 809A8DC itemid_get_number: @ 809A8DC
asm/item_menu.s
+25 -25
View File
@@ -200,7 +200,7 @@ _08107F12:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _08107F36 beq _08107F36
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -275,10 +275,10 @@ _08107FD8:
bl ResetSpriteData bl ResetSpriteData
b _08108104 b _08108104
_08107FDE: _08107FDE:
bl sub_80984D8 bl ResetItemMenuIconState
b _08108104 b _08108104
_08107FE4: _08107FE4:
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08107FF0 beq _08107FF0
@@ -687,7 +687,7 @@ _08108340:
.align 2, 0 .align 2, 0
_08108348: .4byte gUnknown_83D41F4 _08108348: .4byte gUnknown_83D41F4
_0810834C: _0810834C:
ldr r0, _08108360 @ =gUnknown_83D4240 ldr r0, _08108360 @ =gBagSwapSpriteSheet
_0810834E: _0810834E:
bl LoadCompressedObjectPic bl LoadCompressedObjectPic
_08108352: _08108352:
@@ -698,10 +698,10 @@ _08108352:
strb r0, [r1, 0x10] strb r0, [r1, 0x10]
b _0810837C b _0810837C
.align 2, 0 .align 2, 0
_08108360: .4byte gUnknown_83D4240 _08108360: .4byte gBagSwapSpriteSheet
_08108364: .4byte gUnknown_203AD10 _08108364: .4byte gUnknown_203AD10
_08108368: _08108368:
ldr r0, _08108378 @ =gUnknown_83D4248 ldr r0, _08108378 @ =gBagSwapSpritePalette
bl LoadCompressedObjectPalette bl LoadCompressedObjectPalette
ldr r1, [r4] ldr r1, [r4]
movs r0, 0 movs r0, 0
@@ -709,7 +709,7 @@ _08108368:
movs r0, 0x1 movs r0, 0x1
b _0810837E b _0810837E
.align 2, 0 .align 2, 0
_08108378: .4byte gUnknown_83D4248 _08108378: .4byte gBagSwapSpritePalette
_0810837C: _0810837C:
movs r0, 0 movs r0, 0
_0810837E: _0810837E:
@@ -981,7 +981,7 @@ _08108584:
bl StringCopy bl StringCopy
_0810858C: _0810858C:
adds r0, r5, 0 adds r0, r5, 0
bl ItemId_GetItem bl ItemId_GetName
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl StringAppend bl StringAppend
@@ -1014,7 +1014,7 @@ _081085BA:
lsrs r1, 30 lsrs r1, 30
movs r0, 0x1 movs r0, 0x1
eors r0, r1 eors r0, r1
bl sub_8098940 bl DestroyItemMenuIcon
ldr r2, [r4] ldr r2, [r4]
ldr r0, _08108608 @ =gUnknown_203ACFC ldr r0, _08108608 @ =gUnknown_203ACFC
ldrh r1, [r0, 0x6] ldrh r1, [r0, 0x6]
@@ -1036,7 +1036,7 @@ _081085BA:
ldrb r1, [r1, 0x5] ldrb r1, [r1, 0x5]
lsls r1, 26 lsls r1, 26
lsrs r1, 30 lsrs r1, 30
bl sub_80988E8 bl CreateItemMenuIcon
b _08108618 b _08108618
.align 2, 0 .align 2, 0
_08108604: .4byte gUnknown_203AD10 _08108604: .4byte gUnknown_203AD10
@@ -1046,7 +1046,7 @@ _0810860C:
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
lsls r1, 26 lsls r1, 26
lsrs r1, 30 lsrs r1, 30
bl sub_80988E8 bl CreateItemMenuIcon
_08108618: _08108618:
ldr r4, _08108650 @ =gUnknown_203AD10 ldr r4, _08108650 @ =gUnknown_203AD10
ldr r3, [r4] ldr r3, [r4]
@@ -1999,8 +1999,8 @@ _08108D5A:
bx r0 bx r0
thumb_func_end sub_8108CFC thumb_func_end sub_8108CFC
thumb_func_start sub_8108D60 thumb_func_start ItemMenu_MoveItemSlotToNewPositionInArray
sub_8108D60: @ 8108D60 ItemMenu_MoveItemSlotToNewPositionInArray: @ 8108D60
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r3, r2, 0 adds r3, r2, 0
@@ -2057,7 +2057,7 @@ _08108DC0:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8108D60 thumb_func_end ItemMenu_MoveItemSlotToNewPositionInArray
thumb_func_start sub_8108DC8 thumb_func_start sub_8108DC8
sub_8108DC8: @ 8108DC8 sub_8108DC8: @ 8108DC8
@@ -2514,7 +2514,7 @@ sub_8109140: @ 8109140
movs r1, 0 movs r1, 0
movs r2, 0xE movs r2, 0xE
movs r3, 0x1E movs r3, 0x1E
bl sub_80F6B08 bl SetBgRectPal
movs r0, 0x1 movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8 add sp, 0x8
@@ -2627,7 +2627,7 @@ sub_81091D0: @ 81091D0
lsrs r1, 30 lsrs r1, 30
movs r0, 0x1 movs r0, 0x1
eors r0, r1 eors r0, r1
bl sub_8098940 bl DestroyItemMenuIcon
bl sub_8108978 bl sub_8108978
_08109242: _08109242:
movs r0, 0x12 movs r0, 0x12
@@ -2677,7 +2677,7 @@ sub_8109298: @ 8109298
lsls r0, 3 lsls r0, 3
ldr r1, _081092DC @ =gTasks+0x8 ldr r1, _081092DC @ =gTasks+0x8
adds r5, r0, r1 adds r5, r0, r1
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08109314 bne _08109314
@@ -2853,12 +2853,12 @@ sub_81093B8: @ 81093B8
bl BagGetItemIdByPocketPosition bl BagGetItemIdByPocketPosition
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl ItemId_GetItem bl ItemId_GetName
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r4, _081094A4 @ =gStringVar4 ldr r4, _081094A4 @ =gStringVar4
ldr r1, _081094A8 @ =gUnknown_841633F ldr r1, _081094A8 @ =gOtherText_WhereShouldTheStrVar1BePlaced
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@@ -2910,7 +2910,7 @@ _08109498: .4byte gUnknown_203AD10
_0810949C: .4byte gStringVar1 _0810949C: .4byte gStringVar1
_081094A0: .4byte gUnknown_203ACFC _081094A0: .4byte gUnknown_203ACFC
_081094A4: .4byte gStringVar4 _081094A4: .4byte gStringVar4
_081094A8: .4byte gUnknown_841633F _081094A8: .4byte gOtherText_WhereShouldTheStrVar1BePlaced
_081094AC: .4byte sub_81094B0 _081094AC: .4byte sub_81094B0
thumb_func_end sub_81093B8 thumb_func_end sub_81093B8
@@ -3071,7 +3071,7 @@ _081095E8:
ldr r0, [r0] ldr r0, [r0]
adds r1, r2, 0 adds r1, r2, 0
adds r2, r5, 0 adds r2, r5, 0
bl sub_8108D60 bl ItemMenu_MoveItemSlotToNewPositionInArray
ldrb r0, [r6] ldrb r0, [r6]
ldrh r2, [r4, 0x6] ldrh r2, [r4, 0x6]
lsls r2, 1 lsls r2, 1
@@ -3464,7 +3464,7 @@ _08109930: .4byte gUnknown_203AD24
_08109934: .4byte gUnknown_8452F30 _08109934: .4byte gUnknown_8452F30
_08109938: .4byte gUnknown_203AD28 _08109938: .4byte gUnknown_203AD28
_0810993C: _0810993C:
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3727,7 +3727,7 @@ _08109AD4:
ldr r1, _08109BAC @ =gStringVar1 ldr r1, _08109BAC @ =gStringVar1
bl CopyItemName bl CopyItemName
ldr r6, _08109BB0 @ =gStringVar4 ldr r6, _08109BB0 @ =gStringVar4
ldr r1, _08109BB4 @ =gUnknown_84162FF ldr r1, _08109BB4 @ =gOtherText_StrVar1
adds r0, r6, 0 adds r0, r6, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x2 movs r0, 0x2
@@ -3754,7 +3754,7 @@ _08109BA4: .4byte gUnknown_8452EB8
_08109BA8: .4byte gSpecialVar_ItemId _08109BA8: .4byte gSpecialVar_ItemId
_08109BAC: .4byte gStringVar1 _08109BAC: .4byte gStringVar1
_08109BB0: .4byte gStringVar4 _08109BB0: .4byte gStringVar4
_08109BB4: .4byte gUnknown_84162FF _08109BB4: .4byte gOtherText_StrVar1
thumb_func_end sub_8109890 thumb_func_end sub_8109890
thumb_func_start sub_8109BB8 thumb_func_start sub_8109BB8
@@ -5753,7 +5753,7 @@ sub_810AC40: @ 810AC40
ldr r3, _0810ACD4 @ =0x0000ffff ldr r3, _0810ACD4 @ =0x0000ffff
movs r0, 0x1C movs r0, 0x1C
movs r1, 0 movs r1, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldrh r0, [r5] ldrh r0, [r5]
ldr r1, _0810ACD8 @ =gStringVar1 ldr r1, _0810ACD8 @ =gStringVar1
bl CopyItemName bl CopyItemName
asm/item_menu_icons.s
+9 -9
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_80984D8 thumb_func_start ResetItemMenuIconState
sub_80984D8: @ 80984D8 ResetItemMenuIconState: @ 80984D8
push {r4,lr} push {r4,lr}
movs r2, 0 movs r2, 0
ldr r4, _080984F8 @ =gUnknown_2039878 ldr r4, _080984F8 @ =gUnknown_2039878
@@ -26,7 +26,7 @@ _080984E0:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080984F8: .4byte gUnknown_2039878 _080984F8: .4byte gUnknown_2039878
thumb_func_end sub_80984D8 thumb_func_end ResetItemMenuIconState
thumb_func_start sub_80984FC thumb_func_start sub_80984FC
sub_80984FC: @ 80984FC sub_80984FC: @ 80984FC
@@ -534,8 +534,8 @@ _080988DA:
bx r1 bx r1
thumb_func_end AddItemIconObjectWithCustomObjectTemplate thumb_func_end AddItemIconObjectWithCustomObjectTemplate
thumb_func_start sub_80988E8 thumb_func_start CreateItemMenuIcon
sub_80988E8: @ 80988E8 CreateItemMenuIcon: @ 80988E8
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
@@ -577,10 +577,10 @@ _08098932:
.align 2, 0 .align 2, 0
_08098938: .4byte gUnknown_2039882 _08098938: .4byte gUnknown_2039882
_0809893C: .4byte gSprites _0809893C: .4byte gSprites
thumb_func_end sub_80988E8 thumb_func_end CreateItemMenuIcon
thumb_func_start sub_8098940 thumb_func_start DestroyItemMenuIcon
sub_8098940: @ 8098940 DestroyItemMenuIcon: @ 8098940
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -605,7 +605,7 @@ _08098964:
.align 2, 0 .align 2, 0
_0809896C: .4byte gUnknown_2039882 _0809896C: .4byte gUnknown_2039882
_08098970: .4byte gSprites _08098970: .4byte gSprites
thumb_func_end sub_8098940 thumb_func_end DestroyItemMenuIcon
thumb_func_start sub_8098974 thumb_func_start sub_8098974
sub_8098974: @ 8098974 sub_8098974: @ 8098974
asm/item_pc.s
-2909
View File
File diff suppressed because it is too large Load Diff
asm/item_use.s
+12 -12
View File
@@ -630,7 +630,7 @@ sub_80A1460: @ 80A1460
ldr r3, _080A14C4 @ =0x0000ffff ldr r3, _080A14C4 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
movs r1, 0 movs r1, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldr r1, _080A14C8 @ =gTasks ldr r1, _080A14C8 @ =gTasks
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
@@ -689,7 +689,7 @@ sub_80A14E8: @ 80A14E8
ldr r3, _080A1548 @ =0x0000ffff ldr r3, _080A1548 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
movs r1, 0 movs r1, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldr r1, _080A154C @ =gTasks ldr r1, _080A154C @ =gTasks
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
@@ -765,7 +765,7 @@ _080A1598:
ldr r3, _080A15D8 @ =0x0000ffff ldr r3, _080A15D8 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
movs r1, 0 movs r1, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldr r1, _080A15DC @ =gTasks ldr r1, _080A15DC @ =gTasks
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
@@ -1201,7 +1201,7 @@ sub_80A18EC: @ 80A18EC
ldr r3, _080A1924 @ =0x0000ffff ldr r3, _080A1924 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
movs r1, 0 movs r1, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldr r1, _080A1928 @ =gTasks ldr r1, _080A1928 @ =gTasks
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r4 adds r0, r4
@@ -1328,7 +1328,7 @@ sub_80A19E8: @ 80A19E8
ldr r3, _080A1A34 @ =0x0000ffff ldr r3, _080A1A34 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
movs r1, 0 movs r1, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldr r5, _080A1A38 @ =0x00004020 ldr r5, _080A1A38 @ =0x00004020
ldrh r0, [r4] ldrh r0, [r4]
bl ItemId_GetHoldEffectParam bl ItemId_GetHoldEffectParam
@@ -1399,7 +1399,7 @@ sub_80A1A94: @ 80A1A94
ldr r3, _080A1AD8 @ =0x0000ffff ldr r3, _080A1AD8 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
movs r1, 0 movs r1, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldrh r0, [r5] ldrh r0, [r5]
cmp r0, 0x2B cmp r0, 0x2B
bne _080A1AF4 bne _080A1AF4
@@ -1533,7 +1533,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80A1BAC
ldrb r3, [r0, 0x14] ldrb r3, [r0, 0x14]
movs r0, 0x4 movs r0, 0x4
movs r1, 0 movs r1, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldr r1, _080A1BE4 @ =gUnknown_2039998 ldr r1, _080A1BE4 @ =gUnknown_2039998
ldr r0, _080A1BE8 @ =sub_80A1C08 ldr r0, _080A1BE8 @ =sub_80A1C08
str r0, [r1] str r0, [r1]
@@ -1692,7 +1692,7 @@ sub_80A1CF8: @ 80A1CF8
ldr r3, _080A1D30 @ =0x0000ffff ldr r3, _080A1D30 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
movs r1, 0 movs r1, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldr r1, _080A1D34 @ =gTasks ldr r1, _080A1D34 @ =gTasks
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r4 adds r0, r4
@@ -2102,7 +2102,7 @@ sub_80A2010: @ 80A2010
ldr r3, _080A204C @ =0x0000ffff ldr r3, _080A204C @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
movs r1, 0 movs r1, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldr r2, _080A2050 @ =gStringVar4 ldr r2, _080A2050 @ =gStringVar4
ldr r3, _080A2054 @ =sub_8108B50 ldr r3, _080A2054 @ =sub_8108B50
adds r0, r4, 0 adds r0, r4, 0
@@ -2363,8 +2363,8 @@ _080A228A:
_080A2290: .4byte gTasks _080A2290: .4byte gTasks
thumb_func_end sub_80A2238 thumb_func_end sub_80A2238
thumb_func_start sub_80A2294 thumb_func_start ItemUse_SetQuestLogEvent
sub_80A2294: @ 80A2294 ItemUse_SetQuestLogEvent: @ 80A2294
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -2405,6 +2405,6 @@ _080A22CA:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A22E4: .4byte 0x0000ffff _080A22E4: .4byte 0x0000ffff
thumb_func_end sub_80A2294 thumb_func_end ItemUse_SetQuestLogEvent
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/learn_move.s
+1 -1
View File
@@ -119,7 +119,7 @@ _080E46C6:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE0 movs r2, 0xE0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
movs r0, 0xD0 movs r0, 0xD0
movs r1, 0x1 movs r1, 0x1
bl sub_8107D38 bl sub_8107D38
asm/link_rfu.s
+1 -1
View File
@@ -7851,7 +7851,7 @@ sub_8100E34: @ 8100E34
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE0 movs r2, 0xE0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE movs r2, 0xE
asm/link_rfu_3.s
+1 -1
View File
@@ -12966,7 +12966,7 @@ _0811C300:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0xD0 movs r2, 0xD0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
bl sub_80F77B8 bl sub_80F77B8
ldr r0, _0811C35C @ =sub_811C1B4 ldr r0, _0811C35C @ =sub_811C1B4
bl SetVBlankCallback bl SetVBlankCallback
asm/list_menu.s
+1 -1
View File
@@ -52,7 +52,7 @@ _08106F06:
lsls r2, r1, 24 lsls r2, r1, 24
lsrs r2, 24 lsrs r2, 24
adds r1, r7, 0 adds r1, r7, 0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
_08106F24: _08106F24:
ldrb r0, [r5, 0x5] ldrb r0, [r5, 0x5]
mov r3, r8 mov r3, r8
asm/mail.s
+1 -1
View File
@@ -623,7 +623,7 @@ _080BF112:
.align 2, 0 .align 2, 0
_080BF128: .4byte sub_80BF368 _080BF128: .4byte sub_80BF368
_080BF12C: _080BF12C:
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
asm/mailbox_pc.s
+1 -1
View File
@@ -81,7 +81,7 @@ sub_810EBE0: @ 810EBE0
adds r4, r0 adds r4, r0
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4] ldrb r0, [r4]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4] ldrb r0, [r4]
asm/main_menu.s
+1 -1
View File
@@ -1656,7 +1656,7 @@ sub_800D094: @ 800D094
ldr r1, _0800D0AC @ =0x000001b1 ldr r1, _0800D0AC @ =0x000001b1
movs r0, 0 movs r0, 0
movs r2, 0x20 movs r2, 0x20
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
ldr r0, _0800D0B0 @ =gUnknown_8234638 ldr r0, _0800D0B0 @ =gUnknown_8234638
bl sub_800D1E8 bl sub_800D1E8
pop {r0} pop {r0}
asm/menu.s
+7 -7
View File
@@ -556,8 +556,8 @@ _0810F258: .4byte 0x00000803
_0810F25C: .4byte 0x00000804 _0810F25C: .4byte 0x00000804
thumb_func_end sub_810EE5C thumb_func_end sub_810EE5C
thumb_func_start sub_810F260 thumb_func_start ClearMenuWindow_BorderThickness2
sub_810F260: @ 810F260 ClearMenuWindow_BorderThickness2: @ 810F260
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
@@ -583,7 +583,7 @@ _0810F28E:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0810F294: .4byte sub_810F298 _0810F294: .4byte sub_810F298
thumb_func_end sub_810F260 thumb_func_end ClearMenuWindow_BorderThickness2
thumb_func_start sub_810F298 thumb_func_start sub_810F298
sub_810F298: @ 810F298 sub_810F298: @ 810F298
@@ -866,8 +866,8 @@ _0810F4D0: .4byte gUnknown_203ADF0
_0810F4D4: .4byte gUnknown_203ADF2 _0810F4D4: .4byte gUnknown_203ADF2
thumb_func_end DrawWindowBorder thumb_func_end DrawWindowBorder
thumb_func_start sub_810F4D8 thumb_func_start ClearMenuWindow
sub_810F4D8: @ 810F4D8 ClearMenuWindow: @ 810F4D8
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
@@ -893,7 +893,7 @@ _0810F506:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0810F50C: .4byte sub_810F510 _0810F50C: .4byte sub_810F510
thumb_func_end sub_810F4D8 thumb_func_end ClearMenuWindow
thumb_func_start sub_810F510 thumb_func_start sub_810F510
sub_810F510: @ 810F510 sub_810F510: @ 810F510
@@ -2469,7 +2469,7 @@ sub_81100E8: @ 81100E8
ldr r4, _08110100 @ =gUnknown_203ADF3 ldr r4, _08110100 @ =gUnknown_203ADF3
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4] ldrb r0, [r4]
bl RemoveWindow bl RemoveWindow
pop {r4} pop {r4}
asm/menu_helpers.s
+4 -4
View File
@@ -357,8 +357,8 @@ _080BF702:
bx r1 bx r1
thumb_func_end itemid_80BF6D8_mail_related thumb_func_end itemid_80BF6D8_mail_related
thumb_func_start sub_80BF708 thumb_func_start MenuHelpers_LinkSomething
sub_80BF708: @ 80BF708 MenuHelpers_LinkSomething: @ 80BF708
push {lr} push {lr}
bl is_c1_link_related_active bl is_c1_link_related_active
cmp r0, 0x1 cmp r0, 0x1
@@ -377,12 +377,12 @@ _080BF724:
_080BF726: _080BF726:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80BF708 thumb_func_end MenuHelpers_LinkSomething
thumb_func_start sub_80BF72C thumb_func_start sub_80BF72C
sub_80BF72C: @ 80BF72C sub_80BF72C: @ 80BF72C
push {lr} push {lr}
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080BF742 beq _080BF742
asm/new_menu_helpers.s
+7 -7
View File
@@ -486,8 +486,8 @@ _080F6AFC:
bx r1 bx r1
thumb_func_end sub_80F6AD0 thumb_func_end sub_80F6AD0
thumb_func_start sub_80F6B08 thumb_func_start SetBgRectPal
sub_80F6B08: @ 80F6B08 SetBgRectPal: @ 80F6B08
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -561,7 +561,7 @@ _080F6B80:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F6B90: .4byte 0x00000fff _080F6B90: .4byte 0x00000fff
thumb_func_end sub_80F6B08 thumb_func_end SetBgRectPal
thumb_func_start sub_80F6B94 thumb_func_start sub_80F6B94
sub_80F6B94: @ 80F6B94 sub_80F6B94: @ 80F6B94
@@ -984,13 +984,13 @@ _080F6EC4:
lsls r1, 2 lsls r1, 2
movs r0, 0 movs r0, 0
movs r2, 0xF0 movs r2, 0xF0
bl sub_814FEAC bl TextWindow_SetBubbleFrame_841F1C8
_080F6ED4: _080F6ED4:
movs r1, 0x85 movs r1, 0x85
lsls r1, 2 lsls r1, 2
movs r0, 0 movs r0, 0
movs r2, 0xE0 movs r2, 0xE0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80F6E9C thumb_func_end sub_80F6E9C
@@ -2033,7 +2033,7 @@ _080F7798:
lsls r1, 2 lsls r1, 2
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0xF0 movs r2, 0xF0
bl sub_814FEAC bl TextWindow_SetBubbleFrame_841F1C8
_080F77A4: _080F77A4:
movs r2, 0x80 movs r2, 0x80
lsls r2, 2 lsls r2, 2
@@ -2347,7 +2347,7 @@ sub_80F79A4: @ 80F79A4
lsls r1, 2 lsls r1, 2
movs r0, 0 movs r0, 0
movs r2, 0xE0 movs r2, 0xE0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80F79A4 thumb_func_end sub_80F79A4
asm/party_menu.s
+64 -64
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_811EA44 thumb_func_start PartyMenuInit
sub_811EA44: @ 811EA44 PartyMenuInit: @ 811EA44
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -181,7 +181,7 @@ _0811EB90: .4byte gUnknown_203B09C
_0811EB94: .4byte gPlayerParty _0811EB94: .4byte gPlayerParty
_0811EB98: .4byte gTextFlags _0811EB98: .4byte gTextFlags
_0811EB9C: .4byte sub_811EBD0 _0811EB9C: .4byte sub_811EBD0
thumb_func_end sub_811EA44 thumb_func_end PartyMenuInit
thumb_func_start sub_811EBA0 thumb_func_start sub_811EBA0
sub_811EBA0: @ 811EBA0 sub_811EBA0: @ 811EBA0
@@ -219,7 +219,7 @@ _0811EBD2:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _0811EBF6 beq _0811EBF6
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -299,7 +299,7 @@ _0811ECAE:
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
b _0811EDFC b _0811EDFC
_0811ECB4: _0811ECB4:
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0811ECC0 beq _0811ECC0
@@ -1799,7 +1799,7 @@ _0811F884:
movs r1, 0x17 movs r1, 0x17
movs r2, 0x10 movs r2, 0x10
movs r3, 0x7 movs r3, 0x7
bl sub_80F6B08 bl SetBgRectPal
b _0811F8B0 b _0811F8B0
_0811F89E: _0811F89E:
movs r0, 0x2 movs r0, 0x2
@@ -1809,7 +1809,7 @@ _0811F89E:
movs r1, 0x17 movs r1, 0x17
movs r2, 0x10 movs r2, 0x10
movs r3, 0x7 movs r3, 0x7
bl sub_80F6B08 bl SetBgRectPal
_0811F8B0: _0811F8B0:
ldr r0, _0811F8BC @ =gUnknown_203B09C ldr r0, _0811F8BC @ =gUnknown_203B09C
ldr r0, [r0] ldr r0, [r0]
@@ -1857,7 +1857,7 @@ _0811F8F2:
movs r2, 0x12 movs r2, 0x12
_0811F904: _0811F904:
movs r3, 0x7 movs r3, 0x7
bl sub_80F6B08 bl SetBgRectPal
b _0811F91E b _0811F91E
_0811F90C: _0811F90C:
movs r0, 0x2 movs r0, 0x2
@@ -1867,7 +1867,7 @@ _0811F90C:
movs r1, 0x17 movs r1, 0x17
movs r2, 0x12 movs r2, 0x12
movs r3, 0x7 movs r3, 0x7
bl sub_80F6B08 bl SetBgRectPal
_0811F91E: _0811F91E:
ldr r0, _0811F940 @ =gUnknown_203B09C ldr r0, _0811F940 @ =gUnknown_203B09C
ldr r0, [r0] ldr r0, [r0]
@@ -2494,7 +2494,7 @@ _0811FDD6:
.align 2, 0 .align 2, 0
_0811FDF0: .4byte gUnknown_203B0A0 _0811FDF0: .4byte gUnknown_203B0A0
_0811FDF4: _0811FDF4:
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0811FE04 bne _0811FE04
@@ -3234,7 +3234,7 @@ sub_8120328: @ 8120328
bne _0812035E bne _0812035E
movs r0, 0x6 movs r0, 0x6
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
movs r0, 0x6 movs r0, 0x6
bl ClearWindowTilemap bl ClearWindowTilemap
_0812035E: _0812035E:
@@ -3302,10 +3302,10 @@ sub_81203B8: @ 81203B8
beq _08120410 beq _08120410
movs r0, 0x6 movs r0, 0x6
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
movs r0, 0x6 movs r0, 0x6
bl ClearWindowTilemap bl ClearWindowTilemap
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3366,7 +3366,7 @@ _0812043C:
_08120448: _08120448:
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
b _08120468 b _08120468
.align 2, 0 .align 2, 0
_08120454: .4byte gUnknown_203B0A0 _08120454: .4byte gUnknown_203B0A0
@@ -3376,7 +3376,7 @@ _0812045C:
movs r0, 0x6 movs r0, 0x6
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
_08120468: _08120468:
ldr r1, _0812049C @ =gStringVar1 ldr r1, _0812049C @ =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
@@ -3418,7 +3418,7 @@ sub_81204AC: @ 81204AC
movs r0, 0x8 movs r0, 0x8
adds r1, r6, 0 adds r1, r6, 0
adds r2, r4, 0 adds r2, r4, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldr r1, _081204FC @ =gStringVar1 ldr r1, _081204FC @ =gStringVar1
adds r0, r6, 0 adds r0, r6, 0
bl GetMonNickname bl GetMonNickname
@@ -3627,7 +3627,7 @@ _08120678:
_0812067E: _0812067E:
ldr r0, _08120698 @ =0x0000016d ldr r0, _08120698 @ =0x0000016d
_08120680: _08120680:
bl ItemId_GetItem bl ItemId_GetName
adds r1, r0, 0 adds r1, r0, 0
_08120686: _08120686:
ldr r0, _0812069C @ =gStringVar1 ldr r0, _0812069C @ =gStringVar1
@@ -4709,11 +4709,11 @@ sub_8120E58: @ 8120E58
movs r0, 0 movs r0, 0
movs r1, 0x4F movs r1, 0x4F
movs r2, 0xD0 movs r2, 0xD0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
movs r0, 0 movs r0, 0
movs r1, 0x58 movs r1, 0x58
movs r2, 0xF0 movs r2, 0xF0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
ldr r0, _08120E94 @ =gUnknown_203B0A0 ldr r0, _08120E94 @ =gUnknown_203B0A0
ldrb r0, [r0, 0xB] ldrb r0, [r0, 0xB]
cmp r0, 0x3 cmp r0, 0x3
@@ -5016,11 +5016,11 @@ _081210AC:
movs r0, 0 movs r0, 0
movs r1, 0x4F movs r1, 0x4F
movs r2, 0xD0 movs r2, 0xD0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
movs r0, 0 movs r0, 0
movs r1, 0x58 movs r1, 0x58
movs r2, 0xF0 movs r2, 0xF0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x2 movs r0, 0x2
bl stdpal_get bl stdpal_get
movs r1, 0xC0 movs r1, 0xC0
@@ -6507,7 +6507,7 @@ sub_8121CE4: @ 8121CE4
cmp r0, 0xFF cmp r0, 0xFF
beq _08121D04 beq _08121D04
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4] ldrb r0, [r4]
bl RemoveWindow bl RemoveWindow
movs r0, 0xFF movs r0, 0xFF
@@ -7026,7 +7026,7 @@ sub_81220D4: @ 81220D4
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x4F movs r1, 0x4F
movs r2, 0xE0 movs r2, 0xE0
bl sub_814FEAC bl TextWindow_SetBubbleFrame_841F1C8
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0x4F movs r2, 0x4F
@@ -7054,7 +7054,7 @@ sub_8122110: @ 8122110
bl ClearWindowTilemap bl ClearWindowTilemap
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_810F260 bl ClearMenuWindow_BorderThickness2
adds r0, r4, 0 adds r0, r4, 0
bl RemoveWindow bl RemoveWindow
movs r0, 0x2 movs r0, 0x2
@@ -8717,7 +8717,7 @@ sub_8122DBC: @ 8122DBC
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0xFF movs r1, 0xFF
movs r3, 0x1 movs r3, 0x1
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
@@ -9928,7 +9928,7 @@ _081237AE:
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0xFF movs r1, 0xFF
movs r3, 0x1 movs r3, 0x1
bl sub_811EA44 bl PartyMenuInit
b _08123814 b _08123814
.align 2, 0 .align 2, 0
_081237BC: .4byte gUnknown_203B0D8 _081237BC: .4byte gUnknown_203B0D8
@@ -9967,7 +9967,7 @@ _081237F8:
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0xFF movs r1, 0xFF
movs r3, 0x1 movs r3, 0x1
bl sub_811EA44 bl PartyMenuInit
_08123814: _08123814:
add sp, 0xC add sp, 0xC
pop {r3} pop {r3}
@@ -10345,7 +10345,7 @@ sub_8123ACC: @ 8123ACC
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0xFF movs r1, 0xFF
movs r3, 0x1 movs r3, 0x1
bl sub_811EA44 bl PartyMenuInit
b _08123B68 b _08123B68
.align 2, 0 .align 2, 0
_08123B38: .4byte gUnknown_203B0A0 _08123B38: .4byte gUnknown_203B0A0
@@ -10366,7 +10366,7 @@ _08123B4C:
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0xFF movs r1, 0xFF
movs r3, 0x1 movs r3, 0x1
bl sub_811EA44 bl PartyMenuInit
_08123B68: _08123B68:
add sp, 0xC add sp, 0xC
pop {r3} pop {r3}
@@ -10675,7 +10675,7 @@ sub_8123DCC: @ 8123DCC
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0xFF movs r1, 0xFF
movs r3, 0x1 movs r3, 0x1
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
@@ -11627,7 +11627,7 @@ _081245D6:
ldr r0, [r5] ldr r0, [r5]
adds r0, 0xD adds r0, 0xD
bl sub_8121CE4 bl sub_8121CE4
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -12237,7 +12237,7 @@ sub_8124AB0: @ 8124AB0
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
@@ -12577,7 +12577,7 @@ _08124D6A:
adds r1, r7, 0 adds r1, r7, 0
movs r2, 0x3 movs r2, 0x3
movs r3, 0x1 movs r3, 0x1
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
@@ -12759,7 +12759,7 @@ _08124EC8:
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0xFF movs r1, 0xFF
movs r2, 0 movs r2, 0
bl sub_811EA44 bl PartyMenuInit
_08124EE6: _08124EE6:
add sp, 0xC add sp, 0xC
pop {r3} pop {r3}
@@ -12820,7 +12820,7 @@ sub_8124EFC: @ 8124EFC
movs r0, 0x4 movs r0, 0x4
adds r1, r5, 0 adds r1, r5, 0
adds r3, r6, 0 adds r3, r6, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldrh r1, [r7] ldrh r1, [r7]
movs r0, 0xA9 movs r0, 0xA9
lsls r0, 1 lsls r0, 1
@@ -12852,7 +12852,7 @@ _08124F94:
ldr r1, [r4] ldr r1, [r4]
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0xFF movs r1, 0xFF
bl sub_811EA44 bl PartyMenuInit
_08124FB2: _08124FB2:
add sp, 0xC add sp, 0xC
pop {r3} pop {r3}
@@ -13312,7 +13312,7 @@ _08125380:
movs r0, 0x4 movs r0, 0x4
adds r1, r5, 0 adds r1, r5, 0
adds r2, r6, 0 adds r2, r6, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
adds r0, r7, 0 adds r0, r7, 0
bl sub_8124DC0 bl sub_8124DC0
ldr r1, _081253A8 @ =gUnknown_3005E98 ldr r1, _081253A8 @ =gUnknown_3005E98
@@ -13958,7 +13958,7 @@ sub_8125898: @ 8125898
ldr r3, _08125940 @ =0x0000ffff ldr r3, _08125940 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
adds r1, r4, 0 adds r1, r4, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
movs r0, 0x1 movs r0, 0x1
bl PlaySE bl PlaySE
ldrh r0, [r6] ldrh r0, [r6]
@@ -14060,7 +14060,7 @@ _081259A0:
movs r0, 0x4 movs r0, 0x4
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
movs r0, 0x1 movs r0, 0x1
bl PlaySE bl PlaySE
adds r0, r5, 0 adds r0, r5, 0
@@ -14315,7 +14315,7 @@ sub_8125B40: @ 8125B40
movs r0, 0x4 movs r0, 0x4
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
adds r0, r6, 0 adds r0, r6, 0
bl sub_8124DC0 bl sub_8124DC0
ldr r1, _08125BEC @ =gUnknown_3005E98 ldr r1, _08125BEC @ =gUnknown_3005E98
@@ -14712,7 +14712,7 @@ _08125EE8:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl sub_811EA44 bl PartyMenuInit
_08125F02: _08125F02:
add sp, 0xC add sp, 0xC
pop {r4,r5} pop {r4,r5}
@@ -14799,7 +14799,7 @@ sub_8125F5C: @ 8125F5C
movs r0, 0x4 movs r0, 0x4
adds r1, r6, 0 adds r1, r6, 0
adds r3, r4, 0 adds r3, r4, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldr r1, _08125FF0 @ =gStringVar1 ldr r1, _08125FF0 @ =gStringVar1
adds r0, r6, 0 adds r0, r6, 0
bl GetMonNickname bl GetMonNickname
@@ -15268,7 +15268,7 @@ sub_8126350: @ 8126350
ldr r3, _08126424 @ =0x0000ffff ldr r3, _08126424 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
adds r1, r4, 0 adds r1, r4, 0
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
movs r0, 0 movs r0, 0
bl PlayFanfareByFanfareNum bl PlayFanfareByFanfareNum
ldrb r0, [r6, 0x9] ldrb r0, [r6, 0x9]
@@ -16112,7 +16112,7 @@ _08126A94:
ldrh r2, [r0] ldrh r2, [r0]
ldr r3, _08126AE0 @ =0x0000ffff ldr r3, _08126AE0 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
_08126AB4: _08126AB4:
ldr r0, _08126ADC @ =gSpecialVar_ItemId ldr r0, _08126ADC @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
@@ -16266,7 +16266,7 @@ sub_8126BD4: @ 8126BD4
ldrh r2, [r5] ldrh r2, [r5]
ldr r3, _08126C20 @ =0x0000ffff ldr r3, _08126C20 @ =0x0000ffff
movs r0, 0x4 movs r0, 0x4
bl sub_80A2294 bl ItemUse_SetQuestLogEvent
ldrh r0, [r5] ldrh r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl RemoveBagItem bl RemoveBagItem
@@ -16640,7 +16640,7 @@ CB2_PartyMenuFromStartMenu: @ 8126EB0
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
@@ -16684,7 +16684,7 @@ _08126F0A:
movs r1, 0 movs r1, 0
movs r2, 0x5 movs r2, 0x5
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
ldr r1, _08126F38 @ =gUnknown_203B0A0 ldr r1, _08126F38 @ =gUnknown_203B0A0
ldr r0, _08126F3C @ =gSpecialVar_ItemId ldr r0, _08126F3C @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
@@ -16995,7 +16995,7 @@ _0812719C:
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0xFF movs r1, 0xFF
movs r3, 0x1 movs r3, 0x1
bl sub_811EA44 bl PartyMenuInit
_081271B8: _081271B8:
add sp, 0xC add sp, 0xC
pop {r4-r7} pop {r4-r7}
@@ -17233,7 +17233,7 @@ sub_8127384: @ 8127384
bne _081273A0 bne _081273A0
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A460 bl RemoveItemFromPC
b _081273A8 b _081273A8
.align 2, 0 .align 2, 0
_0812739C: .4byte gUnknown_203B0A0 _0812739C: .4byte gUnknown_203B0A0
@@ -17286,7 +17286,7 @@ sub_81273D8: @ 81273D8
movs r1, 0 movs r1, 0
movs r2, 0x7 movs r2, 0x7
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
@@ -17387,7 +17387,7 @@ sub_81274A8: @ 81274A8
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
ldr r1, _081274F4 @ =gUnknown_203B0A0 ldr r1, _081274F4 @ =gUnknown_203B0A0
lsls r4, 6 lsls r4, 6
ldrb r2, [r1, 0x8] ldrb r2, [r1, 0x8]
@@ -17824,7 +17824,7 @@ sub_81277F4: @ 81277F4
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
@@ -17850,7 +17850,7 @@ sub_812781C: @ 812781C
movs r1, 0 movs r1, 0
movs r2, 0xC movs r2, 0xC
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
b _08127870 b _08127870
.align 2, 0 .align 2, 0
_08127844: .4byte gSpecialVar_0x8005 _08127844: .4byte gSpecialVar_0x8005
@@ -17867,7 +17867,7 @@ _08127850:
movs r1, 0 movs r1, 0
movs r2, 0xC movs r2, 0xC
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
ldr r1, _08127880 @ =gUnknown_203B0A0 ldr r1, _08127880 @ =gUnknown_203B0A0
ldr r0, _08127884 @ =gSpecialVar_0x8007 ldr r0, _08127884 @ =gSpecialVar_0x8007
ldrh r0, [r0] ldrh r0, [r0]
@@ -17897,7 +17897,7 @@ sub_8127888: @ 8127888
movs r1, 0 movs r1, 0
movs r2, 0xD movs r2, 0xD
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
@@ -17960,7 +17960,7 @@ sub_81278DC: @ 81278DC
movs r0, 0x1 movs r0, 0x1
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
movs r0, 0x8 movs r0, 0x8
bl sub_80EB2F4 bl sub_80EB2F4
b _08127950 b _08127950
@@ -17982,7 +17982,7 @@ _08127930:
movs r0, 0x1 movs r0, 0x1
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
_08127950: _08127950:
bl nullsub_44 bl nullsub_44
bl pokemon_change_order bl pokemon_change_order
@@ -18012,7 +18012,7 @@ sub_8127968: @ 8127968
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
bl nullsub_44 bl nullsub_44
bl pokemon_change_order bl pokemon_change_order
add sp, 0xC add sp, 0xC
@@ -18040,7 +18040,7 @@ sub_81279A4: @ 81279A4
movs r0, 0x1 movs r0, 0x1
movs r2, 0xE movs r2, 0xE
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
bl nullsub_44 bl nullsub_44
bl pokemon_change_order bl pokemon_change_order
add sp, 0xC add sp, 0xC
@@ -18079,7 +18079,7 @@ sub_81279E0: @ 81279E0
movs r0, 0x1 movs r0, 0x1
movs r2, 0x3 movs r2, 0x3
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
movs r0, 0x8 movs r0, 0x8
bl sub_80EB2F4 bl sub_80EB2F4
b _08127A62 b _08127A62
@@ -18110,7 +18110,7 @@ _08127A44:
movs r0, 0x1 movs r0, 0x1
movs r2, 0x3 movs r2, 0x3
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
_08127A62: _08127A62:
bl nullsub_44 bl nullsub_44
bl pokemon_change_order bl pokemon_change_order
@@ -19069,7 +19069,7 @@ sub_8128198: @ 8128198
movs r1, 0x3 movs r1, 0x3
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
@@ -19314,7 +19314,7 @@ sub_8128370: @ 8128370
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
@@ -19343,7 +19343,7 @@ sub_81283A8: @ 81283A8
movs r1, 0 movs r1, 0
movs r2, 0xB movs r2, 0xB
movs r3, 0 movs r3, 0
bl sub_811EA44 bl PartyMenuInit
add sp, 0xC add sp, 0xC
pop {r0} pop {r0}
bx r0 bx r0
asm/player_pc.s
+6 -6
View File
@@ -237,7 +237,7 @@ sub_80EB81C: @ 80EB81C
bl PlaySE bl PlaySE
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
@@ -256,7 +256,7 @@ _080EB874: .4byte sub_80EB9B8
_080EB878: _080EB878:
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
@@ -752,7 +752,7 @@ _080EBC78: .4byte sub_80EBCAC
_080EBC7C: _080EBC7C:
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
@@ -811,7 +811,7 @@ sub_80EBCD8: @ 80EBCD8
bl CleanupOverworldWindowsAndTilemaps bl CleanupOverworldWindowsAndTilemaps
ldrb r0, [r5, 0xC] ldrb r0, [r5, 0xC]
ldr r1, _080EBD14 @ =CB2_ReturnToField ldr r1, _080EBD14 @ =CB2_ReturnToField
bl sub_810D3F4 bl ItemPc_Init
adds r0, r4, 0 adds r0, r4, 0
bl DestroyTask bl DestroyTask
_080EBD06: _080EBD06:
@@ -837,7 +837,7 @@ sub_80EBD18: @ 80EBD18
ldr r0, _080EBD44 @ =sub_80EBCD8 ldr r0, _080EBD44 @ =sub_80EBCD8
str r0, [r1] str r0, [r1]
movs r0, 0 movs r0, 0
bl sub_810DE94 bl ItemPc_SetInitializedFlag
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl fade_screen
@@ -861,7 +861,7 @@ sub_80EBD48: @ 80EBD48
adds r4, r0 adds r4, r0
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
asm/pokemon_jump_2.s
+1 -1
View File
@@ -7930,7 +7930,7 @@ sub_814B5C4: @ 814B5C4
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0xD0 movs r2, 0xD0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0xD movs r2, 0xD
asm/pokemon_special_anim.s
+3 -3
View File
@@ -1617,7 +1617,7 @@ sub_811D184: @ 811D184
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
movs r2, 0xE0 movs r2, 0xE0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@@ -1703,7 +1703,7 @@ sub_811D2D0: @ 811D2D0
bl ClearWindowTilemap bl ClearWindowTilemap
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl CopyWindowToVram bl CopyWindowToVram
@@ -1759,7 +1759,7 @@ _0811D330:
_0811D358: _0811D358:
adds r4, 0x14 adds r4, 0x14
adds r0, r7, 0 adds r0, r7, 0
bl ItemId_GetItem bl ItemId_GetName
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
asm/pokemon_storage_system.s
+6 -6
View File
@@ -3035,7 +3035,7 @@ _0808D0D6:
movs r0, 0x1 movs r0, 0x1
movs r1, 0xB movs r1, 0xB
movs r2, 0xE0 movs r2, 0xE0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
b _0808D20C b _0808D20C
.align 2, 0 .align 2, 0
_0808D100: .4byte 0x05000080 _0808D100: .4byte 0x05000080
@@ -8165,7 +8165,7 @@ sub_808FB68: @ 808FB68
movs r0, 0x1 movs r0, 0x1
movs r1, 0x2 movs r1, 0x2
movs r2, 0xD0 movs r2, 0xD0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x20 movs r0, 0x20
str r0, [sp] str r0, [sp]
movs r0, 0x14 movs r0, 0x14
@@ -8363,7 +8363,7 @@ sub_808FD20: @ 808FD20
push {lr} push {lr}
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
pop {r0} pop {r0}
@@ -16876,7 +16876,7 @@ _08093EF2:
beq _08093F78 beq _08093F78
ldr r3, _08093F74 @ =0x00000d61 ldr r3, _08093F74 @ =0x00000d61
adds r4, r3 adds r4, r3
bl ItemId_GetItem bl ItemId_GetName
adds r1, r0, 0 adds r1, r0, 0
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
@@ -19077,7 +19077,7 @@ sub_8095024: @ 8095024
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x1 movs r1, 0x1
bl sub_810F4D8 bl ClearMenuWindow
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
@@ -21364,7 +21364,7 @@ sub_80961A8: @ 80961A8
ldr r1, _080961C0 @ =0x00002224 ldr r1, _080961C0 @ =0x00002224
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
bl ItemId_GetItem bl ItemId_GetName
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
asm/script_menu.s
+1 -1
View File
@@ -1721,7 +1721,7 @@ sub_809D6B0: @ 809D6B0
bl ClearWindowTilemap bl ClearWindowTilemap
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_810F4D8 bl ClearMenuWindow
adds r0, r4, 0 adds r0, r4, 0
bl RemoveWindow bl RemoveWindow
pop {r4} pop {r4}
asm/shop.s
+12 -12
View File
@@ -332,7 +332,7 @@ sub_809AD24: @ 809AD24
ldr r4, _0809AD3C @ =gUnknown_2039950 ldr r4, _0809AD3C @ =gUnknown_2039950
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4] ldrb r0, [r4]
bl RemoveWindow bl RemoveWindow
pop {r4} pop {r4}
@@ -529,7 +529,7 @@ _0809AEAC:
bl ResetSpriteData bl ResetSpriteData
bl ResetTasks bl ResetTasks
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
bl sub_80984D8 bl ResetItemMenuIconState
bl sub_809AF6C bl sub_809AF6C
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
@@ -793,7 +793,7 @@ _0809B118:
movs r1, 0 movs r1, 0
movs r2, 0xE movs r2, 0xE
movs r3, 0x1E movs r3, 0x1E
bl sub_80F6B08 bl SetBgRectPal
b _0809B14E b _0809B14E
.align 2, 0 .align 2, 0
_0809B138: .4byte gUnknown_2039934 _0809B138: .4byte gUnknown_2039934
@@ -805,7 +805,7 @@ _0809B13C:
movs r1, 0 movs r1, 0
movs r2, 0xC movs r2, 0xC
movs r3, 0x1E movs r3, 0x1E
bl sub_80F6B08 bl SetBgRectPal
_0809B14E: _0809B14E:
movs r0, 0x1 movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
@@ -1069,7 +1069,7 @@ _0809B34A:
lsrs r1, 30 lsrs r1, 30
movs r0, 0x1 movs r0, 0x1
eors r0, r1 eors r0, r1
bl sub_8098940 bl DestroyItemMenuIcon
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r5, r0 cmp r5, r0
@@ -1079,7 +1079,7 @@ _0809B34A:
ldrb r1, [r6, 0x17] ldrb r1, [r6, 0x17]
lsls r1, 29 lsls r1, 29
lsrs r1, 30 lsrs r1, 30
bl sub_80988E8 bl CreateItemMenuIcon
b _0809B398 b _0809B398
.align 2, 0 .align 2, 0
_0809B384: .4byte gUnknown_8416757 _0809B384: .4byte gUnknown_8416757
@@ -1089,7 +1089,7 @@ _0809B38C:
ldrb r1, [r6, 0x17] ldrb r1, [r6, 0x17]
lsls r1, 29 lsls r1, 29
lsrs r1, 30 lsrs r1, 30
bl sub_80988E8 bl CreateItemMenuIcon
_0809B398: _0809B398:
ldr r3, _0809B3D4 @ =gUnknown_2039934 ldr r3, _0809B3D4 @ =gUnknown_2039934
ldrb r2, [r3, 0x17] ldrb r2, [r3, 0x17]
@@ -2396,10 +2396,10 @@ _0809BDD4:
bl sub_809B73C bl sub_809B73C
movs r0, 0x3 movs r0, 0x3
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
movs r0, 0x3 movs r0, 0x3
bl ClearWindowTilemap bl ClearWindowTilemap
movs r0, 0x1 movs r0, 0x1
@@ -2442,10 +2442,10 @@ _0809BE54:
bl sub_809B73C bl sub_809B73C
movs r0, 0x3 movs r0, 0x3
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
movs r0, 0x3 movs r0, 0x3
bl ClearWindowTilemap bl ClearWindowTilemap
movs r0, 0x1 movs r0, 0x1
@@ -2601,7 +2601,7 @@ sub_809BF98: @ 809BF98
adds r4, r5, r6 adds r4, r5, r6
movs r0, 0x2 movs r0, 0x2
movs r1, 0 movs r1, 0
bl sub_810F260 bl ClearMenuWindow_BorderThickness2
ldrb r0, [r4, 0xE] ldrb r0, [r4, 0xE]
movs r1, 0x1 movs r1, 0x1
bl sub_809B57C bl sub_809B57C
asm/start_menu.s
+8 -8
View File
@@ -220,7 +220,7 @@ sub_806EF18: @ 806EF18
ldr r4, _0806EF40 @ =gUnknown_2037101 ldr r4, _0806EF40 @ =gUnknown_2037101
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl CopyWindowToVram bl CopyWindowToVram
@@ -440,7 +440,7 @@ _0806F0C4:
movs r3, 0 movs r3, 0
bl ProgramAndPlaceMenuCursorOnWindow bl ProgramAndPlaceMenuCursorOnWindow
strb r0, [r4] strb r0, [r4]
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0806F118 bne _0806F118
@@ -666,7 +666,7 @@ sub_806F280: @ 806F280
bl MoveMenuCursor bl MoveMenuCursor
ldr r4, _0806F360 @ =gUnknown_20370F4 ldr r4, _0806F360 @ =gUnknown_20370F4
strb r0, [r4] strb r0, [r4]
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0806F2D2 bne _0806F2D2
@@ -701,7 +701,7 @@ _0806F2D2:
bl MoveMenuCursor bl MoveMenuCursor
ldr r4, _0806F360 @ =gUnknown_20370F4 ldr r4, _0806F360 @ =gUnknown_20370F4
strb r0, [r4] strb r0, [r4]
bl sub_80BF708 bl MenuHelpers_LinkSomething
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0806F320 bne _0806F320
@@ -1080,7 +1080,7 @@ sub_806F5C8: @ 806F5C8
_0806F5E4: _0806F5E4:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_810F260 bl ClearMenuWindow_BorderThickness2
bl sub_806F14C bl sub_806F14C
bl sub_812B248 bl sub_812B248
ldr r1, _0806F5FC @ =gUnknown_20370F0 ldr r1, _0806F5FC @ =gUnknown_20370F0
@@ -1093,7 +1093,7 @@ _0806F600: .4byte sub_806F280
_0806F604: _0806F604:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_810F260 bl ClearMenuWindow_BorderThickness2
bl sub_80696C0 bl sub_80696C0
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl sub_812B248 bl sub_812B248
@@ -1781,7 +1781,7 @@ _0806FB12:
movs r0, 0 movs r0, 0
movs r1, 0x8 movs r1, 0x8
movs r2, 0xF0 movs r2, 0xF0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
b _0806FB64 b _0806FB64
.align 2, 0 .align 2, 0
_0806FB34: .4byte gUnknown_83A73B8 _0806FB34: .4byte gUnknown_83A73B8
@@ -2014,7 +2014,7 @@ sub_806FCF4: @ 806FCF4
ldr r4, _0806FE5C @ =0x0000021d ldr r4, _0806FE5C @ =0x0000021d
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD0 movs r2, 0xD0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
adds r2, r4, 0 adds r2, r4, 0
asm/trade.s
+2 -2
View File
@@ -78,11 +78,11 @@ _0804C674:
movs r0, 0 movs r0, 0
movs r1, 0x14 movs r1, 0x14
movs r2, 0xC0 movs r2, 0xC0
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x2 movs r0, 0x2
movs r1, 0x1 movs r1, 0x1
movs r2, 0xE0 movs r2, 0xE0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
bl sub_809707C bl sub_809707C
ldr r2, _0804C708 @ =gUnknown_2031DA8 ldr r2, _0804C708 @ =gUnknown_2031DA8
ldr r0, [r2] ldr r0, [r2]
asm/union_room_chat.s
+5 -5
View File
@@ -4329,7 +4329,7 @@ sub_812A51C: @ 812A51C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
ldr r0, [r4] ldr r0, [r4]
ldrb r0, [r0, 0x18] ldrb r0, [r0, 0x18]
bl ClearWindowTilemap bl ClearWindowTilemap
@@ -4568,7 +4568,7 @@ sub_812A6F4: @ 812A6F4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
ldr r0, [r4] ldr r0, [r4]
ldrb r0, [r0, 0x1E] ldrb r0, [r0, 0x1E]
bl ClearWindowTilemap bl ClearWindowTilemap
@@ -5015,7 +5015,7 @@ sub_812AA64: @ 812AA64
push {lr} push {lr}
movs r0, 0x3 movs r0, 0x3
movs r1, 0 movs r1, 0
bl sub_810F4D8 bl ClearMenuWindow
movs r0, 0x3 movs r0, 0x3
bl ClearWindowTilemap bl ClearWindowTilemap
pop {r0} pop {r0}
@@ -5350,11 +5350,11 @@ sub_812AD20: @ 812AD20
movs r0, 0x3 movs r0, 0x3
movs r1, 0x1 movs r1, 0x1
movs r2, 0xD0 movs r2, 0xD0
bl sub_815001C bl TextWindow_SetUserSelectedFrame
movs r0, 0x3 movs r0, 0x3
movs r1, 0xA movs r1, 0xA
movs r2, 0x20 movs r2, 0x20
bl sub_814FF2C bl TextWindow_SetStdFrame0_WithPal
ldr r0, _0812AD4C @ =gTMCaseMainWindowPalette ldr r0, _0812AD4C @ =gTMCaseMainWindowPalette
movs r1, 0xE0 movs r1, 0xE0
movs r2, 0x20 movs r2, 0x20
data/data_835B488.s
+4 -4
View File
@@ -556,11 +556,11 @@ gUnknown_83D41F4:: @ 83D41F4
gUnknown_83D41FC:: @ 83D41FC gUnknown_83D41FC:: @ 83D41FC
.incbin "baserom.gba", 0x3D41FC, 0x44 .incbin "baserom.gba", 0x3D41FC, 0x44
gUnknown_83D4240:: @ 83D4240 gBagSwapSpriteSheet:: @ 83D4240
.incbin "baserom.gba", 0x3D4240, 0x8 obj_tiles gFile_graphics_interface_bag_swap_sheet, 0x0100, 0x0065
gUnknown_83D4248:: @ 83D4248 gBagSwapSpritePalette:: @ 83D4248
.incbin "baserom.gba", 0x3D4248, 0x8 obj_pal gFile_graphics_interface_bag_swap_palette, 0x0065
gUnknown_83D4250:: @ 83D4250 gUnknown_83D4250:: @ 83D4250
.incbin "baserom.gba", 0x3D4250, 0x2C .incbin "baserom.gba", 0x3D4250, 0x2C
data/data_83FECCC.s
+34 -32
View File
@@ -892,8 +892,8 @@ gText_DepositItem:: @ 84162E8
gUnknown_84162F5:: @ 84162F5 gUnknown_84162F5:: @ 84162F5
.incbin "baserom.gba", 0x4162F5, 0xA .incbin "baserom.gba", 0x4162F5, 0xA
gUnknown_84162FF:: @ 84162FF gOtherText_StrVar1:: @ 84162FF
.incbin "baserom.gba", 0x4162FF, 0x2 .string "{STR_VAR_1}"
gText_IsSelected:: @ 8416301 gText_IsSelected:: @ 8416301
.string " is\n" .string " is\n"
@@ -906,8 +906,9 @@ gText_ThereIsNoPokemon:: @ 841632A
.string "There is no\n" .string "There is no\n"
.string "POKéMON.$" .string "POKéMON.$"
gUnknown_841633F:: @ 841633F gOtherText_WhereShouldTheStrVar1BePlaced:: @ 841633F
.incbin "baserom.gba", 0x41633F, 0x1F .string "Where should the {STR_VAR_1}\n"
.string "be placed?$"
gText_ItemCantBeHeld:: @ 841635E gText_ItemCantBeHeld:: @ 841635E
.string "The {STR_VAR_1} can't be held.$" .string "The {STR_VAR_1} can't be held.$"
@@ -969,7 +970,7 @@ gUnknown_8416631:: @ 8416631
gUnknown_8416644:: @ 8416644 gUnknown_8416644:: @ 8416644
.incbin "baserom.gba", 0x416644, 0x11 .incbin "baserom.gba", 0x416644, 0x11
gUnknown_8416655:: @ 8416655 gOtherText_Powder:: @ 8416655
.string "POWDER$" .string "POWDER$"
gUnknown_841665C:: @ 841665C gUnknown_841665C:: @ 841665C
@@ -1247,14 +1248,26 @@ gUnknown_84176FE:: @ 84176FE
gUnknown_8417774:: @ 8417774 gUnknown_8417774:: @ 8417774
.incbin "baserom.gba", 0x417774, 0x16 .incbin "baserom.gba", 0x417774, 0x16
gUnknown_841778A:: @ 841778A gText_NoMoreRoomInBag:: @ 841778A
.incbin "baserom.gba", 0x41778A, 0x22 .string "There is no more\n"
.string "room in the BAG.$"
gUnknown_84177AC:: @ 84177AC gText_WithdrawHowMany:: @ 84177AC
.incbin "baserom.gba", 0x4177AC, 0x19 .string "Withdraw how many\n"
.string "{STR_VAR_1}(s)?$"
gUnknown_84177C5:: @ 84177C5 gText_WithdrewQuantItem:: @ 84177C5
.incbin "baserom.gba", 0x4177C5, 0x29 .string "Withdrew {STR_VAR_2}\n"
.string "{STR_VAR_1}(s).$"
gOtherText_Read::
.string "READ$"
gOtherText_MoveToBag::
.string "MOVE TO BAG$"
gOtherText_Give2::
.string "GIVE$"
gUnknown_84177EE:: @ 84177EE gUnknown_84177EE:: @ 84177EE
.incbin "baserom.gba", 0x4177EE, 0x18 .incbin "baserom.gba", 0x4177EE, 0x18
@@ -1271,11 +1284,15 @@ gUnknown_8417858:: @ 8417858
gUnknown_841786B:: @ 841786B gUnknown_841786B:: @ 841786B
.incbin "baserom.gba", 0x41786B, 0x3C .incbin "baserom.gba", 0x41786B, 0x3C
gUnknown_84178A7:: @ 84178A7 gText_WithdrawItem:: @ 84178A7
.incbin "baserom.gba", 0x4178A7, 0x17 .string "WITHDRAW\n"
.string "ITEM$"
gUnknown_84178BE:: @ 84178BE gText_Withdraw::
.incbin "baserom.gba", 0x4178BE, 0x12 .string "WITHDRAW$"
gText_ReturnToPC:: @ 84178BE
.string "Return to the PC.$"
gUnknown_84178D0:: @ 84178D0 gUnknown_84178D0:: @ 84178D0
.incbin "baserom.gba", 0x4178D0, 0xA .incbin "baserom.gba", 0x4178D0, 0xA
@@ -2626,7 +2643,7 @@ gUnknown_841EF10:: @ 841EF10
.incbin "baserom.gba", 0x41EF10, 0x2B8 .incbin "baserom.gba", 0x41EF10, 0x2B8
gUnknown_841F1C8:: @ 841F1C8 gUnknown_841F1C8:: @ 841F1C8
.incbin "baserom.gba", 0x41F1C8, 0x240 .incbin "graphics/text_window/unk_841F1C8.4bpp"
gTMCaseMainWindowPalette:: @ 841F408 gTMCaseMainWindowPalette:: @ 841F408
.incbin "graphics/tm_case/unk_841F408.gbapal" .incbin "graphics/tm_case/unk_841F408.gbapal"
@@ -3070,22 +3087,7 @@ gUnknown_8453094:: @ 8453094
.section .rodata.8453F6C .section .rodata.8453F6C
// item_pc.o // mailbox_pc.o
gUnknown_8453F6C:: @ 8453F6C
.incbin "baserom.gba", 0x453F6C, 0x8
gUnknown_8453F74:: @ 8453F74
.incbin "baserom.gba", 0x453F74, 0x18
gUnknown_8453F8C:: @ 8453F8C
.incbin "baserom.gba", 0x453F8C, 0xC
gUnknown_8453F98:: @ 8453F98
.incbin "baserom.gba", 0x453F98, 0x38
gUnknown_8453FD0:: @ 8453FD0
.incbin "baserom.gba", 0x453FD0, 0x18
gUnknown_8453FE8:: @ 8453FE8 gUnknown_8453FE8:: @ 8453FE8
.incbin "baserom.gba", 0x453FE8, 0x18 .incbin "baserom.gba", 0x453FE8, 0x18
data/graphics.s
+6 -6
View File
@@ -13976,14 +13976,14 @@ gUnknown_8E84F20:: @ 8E84F20
gUnknown_8E85068:: @ 8E85068 gUnknown_8E85068:: @ 8E85068
.incbin "graphics/tm_case/unk_8E85068.gbapal.lz" .incbin "graphics/tm_case/unk_8E85068.gbapal.lz"
gUnknown_8E85090:: @ 8E85090 gItemPcTiles:: @ 8E85090
.incbin "baserom.gba", 0xE85090, 0x378 .incbin "graphics/item_pc/unk_8E85090.4bpp.lz"
gUnknown_8E85408:: @ 8E85408 gItemPcBgPals:: @ 8E85408
.incbin "baserom.gba", 0xE85408, 0x50 .incbin "graphics/item_pc/unk_8E85408.gbapal.lz"
gUnknown_8E85458:: @ 8E85458 gItemPcTilemap:: @ 8E85458
.incbin "baserom.gba", 0xE85458, 0x1B4 .incbin "graphics/item_pc/unk_8E85458.bin.lz"
gUnknown_8E8560C:: @ 8E8560C gUnknown_8E8560C:: @ 8E8560C
.incbin "baserom.gba", 0xE8560C, 0x3C4 .incbin "baserom.gba", 0xE8560C, 0x3C4
graphics/item_pc/unk_8E85090.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 746 B

graphics/item_pc/unk_8E85458.bin
BIN
View File
Binary file not shown.
graphics/text_window/unk_841F1C8.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 B

graphics_file_rules.mk
+4
View File
@@ -21,6 +21,7 @@ MISCGFXDIR := graphics/misc
TEXTWINDOWGFXDIR := graphics/text_window TEXTWINDOWGFXDIR := graphics/text_window
TEACHYTVGFXDIR := graphics/teachy_tv TEACHYTVGFXDIR := graphics/teachy_tv
SSANNEGFXDIR := graphics/ss_anne SSANNEGFXDIR := graphics/ss_anne
ITEMPCGFXDIR := graphics/item_pc
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
contest_types := cool beauty cute smart tough contest_types := cool beauty cute smart tough
@@ -482,3 +483,6 @@ $(TEACHYTVGFXDIR)/tiles.4bpp: %.4bpp: %.png
$(SSANNEGFXDIR)/unk_8479A38.4bpp: %.4bpp: %.png $(SSANNEGFXDIR)/unk_8479A38.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 17 $(GFX) $< $@ -num_tiles 17
$(ITEMPCGFXDIR)/unk_8E85090.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 82
include/constants/items.h
+2
View File
@@ -379,6 +379,8 @@
#define ITEM_RUBY 373 #define ITEM_RUBY 373
#define ITEM_SAPPHIRE 374 #define ITEM_SAPPHIRE 374
#define ITEM_N_A 375
// Emerald // Emerald
#define ITEM_MAGMA_EMBLEM 375 #define ITEM_MAGMA_EMBLEM 375
#define ITEM_OLD_SEA_MAP 376 #define ITEM_OLD_SEA_MAP 376
include/graphics.h
+6 -1
View File
@@ -176,7 +176,6 @@ extern const u8 gUnknown_8E86D6C[];
extern const u8 gUnknown_8E86F98[]; extern const u8 gUnknown_8E86F98[];
// berry_fix_program // berry_fix_program
extern const u8 gBerryFixGameboy_Gfx[]; extern const u8 gBerryFixGameboy_Gfx[];
extern const u8 gBerryFixGameboy_Tilemap[]; extern const u8 gBerryFixGameboy_Tilemap[];
extern const u8 gBerryFixGameboy_Pal[]; extern const u8 gBerryFixGameboy_Pal[];
@@ -196,4 +195,10 @@ extern const u8 gBerryFixWindow_Gfx[];
extern const u8 gBerryFixWindow_Tilemap[]; extern const u8 gBerryFixWindow_Tilemap[];
extern const u8 gBerryFixWindow_Pal[]; extern const u8 gBerryFixWindow_Pal[];
// item_pc
extern const u8 gItemPcTiles[];
extern const u8 gItemPcBgPals[];
extern const u8 gItemPcTilemap[];
#endif //GUARD_GRAPHICS_H #endif //GUARD_GRAPHICS_H
include/item.h
+5 -1
View File
@@ -44,7 +44,7 @@ bool8 CheckPCHasItem(u16 itemId, u16 count);
bool8 AddPCItem(u16 itemId, u16 count); bool8 AddPCItem(u16 itemId, u16 count);
void RemovePCItem(u8 index, u16 count); void RemovePCItem(u8 index, u16 count);
void SwapRegisteredBike(void); void SwapRegisteredBike(void);
const struct Item *ItemId_GetItem(u16 itemId); const u8 *ItemId_GetName(u16 itemId);
u16 ItemId_GetId(u16 itemId); u16 ItemId_GetId(u16 itemId);
u16 ItemId_GetPrice(u16 itemId); u16 ItemId_GetPrice(u16 itemId);
u8 ItemId_GetHoldEffect(u16 itemId); u8 ItemId_GetHoldEffect(u16 itemId);
@@ -71,5 +71,9 @@ u16 BagGetItemIdByPocketPosition(u8 a0, u16 a1);
u16 BagGetQuantityByPocketPosition(u8 a0, u16 a1); u16 BagGetQuantityByPocketPosition(u8 a0, u16 a1);
bool8 itemid_is_unique(u16 itemId); bool8 itemid_is_unique(u16 itemId);
void sub_809A584(struct ItemSlot * slots, u8 capacity); void sub_809A584(struct ItemSlot * slots, u8 capacity);
u16 GetBagItemId(u16 *);
void ItemPcCompaction(void);
void RemoveItemFromPC(u16 itemId, u16 quantity);
#endif // ITEM_H #endif // ITEM_H
include/item_menu.h
+1
View File
@@ -27,5 +27,6 @@ void sub_81AAC70(void);
void sub_8108CF0(void); void sub_8108CF0(void);
void sub_810B108(u8); void sub_810B108(u8);
void UseFameCheckerFromMenu(void); void UseFameCheckerFromMenu(void);
void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2);
#endif //GUARD_ITEM_MENU_H #endif //GUARD_ITEM_MENU_H
include/item_menu_icons.h
+6
View File
@@ -3,6 +3,12 @@
#include "global.h" #include "global.h"
void ResetItemMenuIconState(void);
void sub_80985E4(void);
u8 sub_80D511C(u8 a0, u8 a1, u8 a2, u8 a3); u8 sub_80D511C(u8 a0, u8 a1, u8 a2, u8 a3);
void DestroyItemMenuIcon(bool8 a0);
void CreateItemMenuIcon(u16 itemId, bool8 a0);
void sub_80986A8(s16 x, u16 y);
void sub_8098660(u8);
#endif // GUARD_ITEM_MENU_ICONS #endif // GUARD_ITEM_MENU_ICONS
include/item_pc.h
+7
View File
@@ -0,0 +1,7 @@
#ifndef GUARD_ITEM_PC_H
#define GUARD_ITEM_PC_H
void ItemPc_Init(u8 a0, MainCallback callback);
void ItemPc_SetInitializedFlag(u8);
#endif //GUARD_ITEM_PC_H
include/item_use.h
+1 -1
View File
@@ -4,6 +4,6 @@
#include "global.h" #include "global.h"
void sub_80A1E0C(u8); void sub_80A1E0C(u8);
void sub_80A2294(u8, u8, u16, u16); void ItemUse_SetQuestLogEvent(u8, struct Pokemon *, u16, u16);
#endif //GUARD_ITEM_USE_H #endif //GUARD_ITEM_USE_H
include/list_menu.h
+1
View File
@@ -62,5 +62,6 @@ u16 ListMenuGetYCoordForPrintingArrowCursor(u8);
void sub_8107D38(u8, u8); void sub_8107D38(u8, u8);
s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum);
void ListMenuDefaultCursorMoveFunc(s32, u8, struct ListMenu *); void ListMenuDefaultCursorMoveFunc(s32, u8, struct ListMenu *);
void sub_8107BD0(u8 taskId, u8 attr, s32 value);
#endif //GUARD_LIST_MENU_H #endif //GUARD_LIST_MENU_H
include/menu.h
+3 -2
View File
@@ -36,7 +36,7 @@ void do_scheduled_bg_tilemap_copies_to_vram(void);
void clear_scheduled_bg_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void);
void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str); void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
void sub_810F4D8(u8 windowId, bool32 someBool); void ClearMenuWindow(u8 windowId, bool8 copyToVram);
void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
void CreateWindow_SnapRight_StdPal(u8, u8, u8, u8, u16); void CreateWindow_SnapRight_StdPal(u8, u8, u8, u8, u16);
void Menu_PrintHelpSystemUIHeader(const u8 *, const u8 *, u8, u32, u8); void Menu_PrintHelpSystemUIHeader(const u8 *, const u8 *, u8, u32, u8);
@@ -49,6 +49,7 @@ void CreateYesNoMenu(const struct WindowTemplate *, u8, u8, u8, u16, u8, u8);
void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority); void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority);
bool8 IsBlendTaskActive(void); bool8 IsBlendTaskActive(void);
void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a8); void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a8);
void sub_810F260(u8 windowId, u8 a1); void ClearMenuWindow_BorderThickness2(u8 windowId, u8 a1);
void PrintTextArray(u8, u8, u8, u8, u8, u8, const struct MenuAction *);
#endif // GUARD_MENU_H #endif // GUARD_MENU_H
include/menu_helpers.h
+2 -1
View File
@@ -2,6 +2,7 @@
#define GUARD_MENU_HELPERS_H #define GUARD_MENU_HELPERS_H
#include "global.h" #include "global.h"
#include "task.h"
// Exported type declarations // Exported type declarations
@@ -20,7 +21,7 @@ void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
bool8 sub_81221AC(void); bool8 sub_81221AC(void);
bool16 sub_80BF518(u8 textPrinterId); bool16 sub_80BF518(u8 textPrinterId);
bool8 sub_80BF72C(void); bool8 sub_80BF72C(void);
bool8 sub_80BF708(void); bool8 MenuHelpers_LinkSomething(void);
void VblankHblankHandlerSetZero(void); void VblankHblankHandlerSetZero(void);
void InitBgReg(void); void InitBgReg(void);
u8 sub_80BF8E4(void); u8 sub_80BF8E4(void);
include/new_menu_helpers.h
+1 -1
View File
@@ -29,7 +29,7 @@ void ResetBg0(void);
void Menu_LoadStdPalAt(u16); void Menu_LoadStdPalAt(u16);
void * malloc_and_decompress(const void * src, u32 * size); void * malloc_and_decompress(const void * src, u32 * size);
u16 sub_80F796C(void); u16 sub_80F796C(void);
void sub_80F6B08(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4); void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4);
void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow); void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow);
include/party_menu.h
+1
View File
@@ -51,5 +51,6 @@ void sub_8120760(u8 taskId, u8 a1, s8 a2, s16 amount, TaskFunc followupFunc);
void GetMonNickname(const struct Pokemon * mon, u8 * dest); void GetMonNickname(const struct Pokemon * mon, u8 * dest);
void sub_81202F8(const u8 * src, u8 a1); void sub_81202F8(const u8 * src, u8 a1);
bool8 sub_8120370(void); bool8 sub_8120370(void);
void PartyMenuInit(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback);
#endif // GUARD_PARTY_MENU_H #endif // GUARD_PARTY_MENU_H
include/pc_screen_effect.h
+9
View File
@@ -0,0 +1,9 @@
#ifndef GUARD_PC_SCREEN_EFFECT_H
#define GUARD_PC_SCREEN_EFFECT_H
void sub_80A0A48(u16, u16, u8);
void sub_80A0A70(u16, u16, u8);
bool8 sub_80A0AAC(void);
bool8 sub_80A0A98(void);
#endif //GUARD_PC_SCREEN_EFFECT_H
include/strings.h
+12 -1
View File
@@ -113,6 +113,7 @@ extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[];
extern const u8 gText_TurnedOverItemsWorthYen[]; extern const u8 gText_TurnedOverItemsWorthYen[];
extern const u8 gPokeDudeText_TMTypes[]; extern const u8 gPokeDudeText_TMTypes[];
extern const u8 gPokeDudeText_ReadTMDescription[]; extern const u8 gPokeDudeText_ReadTMDescription[];
extern const u8 gFameCheckerText_Cancel[];
// teachy_tv // teachy_tv
extern const u8 gTeachyTvString_TeachBattle[]; extern const u8 gTeachyTvString_TeachBattle[];
@@ -148,6 +149,16 @@ extern const u8 gString_Someone[];
extern const u8 gString_Help[]; extern const u8 gString_Help[];
extern const u8 gString_HelpSystem_ClearTo8[]; extern const u8 gString_HelpSystem_ClearTo8[];
extern const u8 gUnknown_8416655[]; extern const u8 gOtherText_Give[];
extern const u8 gFameCheckerText_Cancel[];
extern const u8 gOtherText_StrVar1[];
extern const u8 gOtherText_WhereShouldTheStrVar1BePlaced[];
extern const u8 gOtherText_Powder[];
extern const u8 gText_NoMoreRoomInBag[];
extern const u8 gText_WithdrawHowMany[];
extern const u8 gText_WithdrewQuantItem[];
extern const u8 gText_WithdrawItem[];
extern const u8 gText_Withdraw[];
extern const u8 gText_ReturnToPC[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H
include/text.h
+12
View File
@@ -91,6 +91,18 @@
#define TEXT_SPEED_FF 0xFF #define TEXT_SPEED_FF 0xFF
enum
{
FONTATTR_MAX_LETTER_WIDTH,
FONTATTR_MAX_LETTER_HEIGHT,
FONTATTR_LETTER_SPACING,
FONTATTR_LINE_SPACING,
FONTATTR_UNKNOWN, // dunno what this is yet
FONTATTR_COLOR_FOREGROUND,
FONTATTR_COLOR_BACKGROUND,
FONTATTR_COLOR_SHADOW
};
struct TextPrinterSubStruct struct TextPrinterSubStruct
{ {
u8 font_type:4; // 0x14 u8 font_type:4; // 0x14
include/text_window.h
+3 -3
View File
@@ -20,9 +20,9 @@ void rbox_fill_rectangle(u8 windowId);
const u16* stdpal_get(u8 id); const u16* stdpal_get(u8 id);
const u16* GetOverworldTextboxPalettePtr(void); const u16* GetOverworldTextboxPalettePtr(void);
void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset); void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
void sub_814FEAC(u8 windowId, u16 tileStart, u8 palette); void TextWindow_SetBubbleFrame_841F1C8(u8 windowId, u16 tileStart, u8 palette);
void sub_814FF2C(u8 windowId, u16 tileStart, u8 palette); void TextWindow_SetStdFrame0_WithPal(u8 windowId, u16 tileStart, u8 palette);
void sub_815001C(u8 windowId, u16 tileStart, u8 palette); void TextWindow_SetUserSelectedFrame(u8 windowId, u16 tileStart, u8 palette);
void LoadUserWindowBorderGfx(u8 windowId, u16 tileStart, u8 palette); void LoadUserWindowBorderGfx(u8 windowId, u16 tileStart, u8 palette);
void sub_814FDA0(u8 windowId, u16 tileStart, u8 palette); void sub_814FDA0(u8 windowId, u16 tileStart, u8 palette);
void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette); void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette);
include/text_window_graphics.h
+3 -3
View File
@@ -8,11 +8,11 @@ struct TextWindowGraphics
}; };
extern const u16 gUnknown_8470B0C[]; extern const u16 gUnknown_8470B0C[];
extern const u16 gUnknown_8471A4C[]; extern const u16 gStdFrame0[];
extern const u16 gUnknown_8471B6C[]; extern const u16 gStdFrame1[];
extern const u16 gUnknown_8471DEC[][16]; extern const u16 gUnknown_8471DEC[][16];
extern const struct TextWindowGraphics gUnknown_8471E8C[]; extern const struct TextWindowGraphics gUserFrames[];
const struct TextWindowGraphics * sub_8069788(u8 idx); const struct TextWindowGraphics * sub_8069788(u8 idx);
include/window.h
+3 -1
View File
@@ -47,6 +47,8 @@ struct Window
u8 *tileData; u8 *tileData;
}; };
typedef void (*WindowFunc)(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
bool16 InitWindows(const struct WindowTemplate *templates); bool16 InitWindows(const struct WindowTemplate *templates);
u16 AddWindow(const struct WindowTemplate *template); u16 AddWindow(const struct WindowTemplate *template);
int AddWindowWithoutTileMap(const struct WindowTemplate *template); int AddWindowWithoutTileMap(const struct WindowTemplate *template);
@@ -64,7 +66,7 @@ void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16
void CopyToWindowPixelBuffer(u8 windowId, const u8 *src, u16 size, u16 tileOffset); void CopyToWindowPixelBuffer(u8 windowId, const u8 *src, u16 size, u16 tileOffset);
void FillWindowPixelBuffer(u8 windowId, u8 fillValue); void FillWindowPixelBuffer(u8 windowId, u8 fillValue);
void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue); void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue);
void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8)); void CallWindowFunction(u8 windowId, WindowFunc func);
bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value); bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value);
u32 GetWindowAttribute(u8 windowId, u8 attributeId); u32 GetWindowAttribute(u8 windowId, u8 attributeId);
u16 AddWindow8Bit(struct WindowTemplate *template); u16 AddWindow8Bit(struct WindowTemplate *template);
ld_script.txt
+2
View File
@@ -231,6 +231,7 @@ SECTIONS {
src/bag.o(.text); src/bag.o(.text);
src/trainer_pokemon_sprites.o(.text); src/trainer_pokemon_sprites.o(.text);
src/vs_seeker.o(.text); src/vs_seeker.o(.text);
src/item_pc.o(.text);
asm/item_pc.o(.text); asm/item_pc.o(.text);
asm/mailbox_pc.o(.text); asm/mailbox_pc.o(.text);
asm/menu.o(.text); asm/menu.o(.text);
@@ -416,6 +417,7 @@ SECTIONS {
src/bag.o(.rodata); src/bag.o(.rodata);
src/trainer_pokemon_sprites.o(.rodata); src/trainer_pokemon_sprites.o(.rodata);
src/vs_seeker.o(.rodata); src/vs_seeker.o(.rodata);
src/item_pc.o(.rodata);
data/data_83FECCC.o(.rodata.8453F6C); data/data_83FECCC.o(.rodata.8453F6C);
src/quest_log.o(.rodata); src/quest_log.o(.rodata);
data/data_83FECCC.o(.rodata.8456C74); data/data_83FECCC.o(.rodata.8456C74);
src/bag.c
+5 -5
View File
@@ -210,9 +210,9 @@ void sub_810B858(void)
else else
InitWindows(gUnknown_84530E4); InitWindows(gUnknown_84530E4);
DeactivateAllTextPrinters(); DeactivateAllTextPrinters();
sub_815001C(0, 0x64, 0xE0); TextWindow_SetUserSelectedFrame(0, 0x64, 0xE0);
sub_814FEAC(0, 0x6D, 0xD0); TextWindow_SetBubbleFrame_841F1C8(0, 0x6D, 0xD0);
sub_814FF2C(0, 0x81, 0xC0); TextWindow_SetStdFrame0_WithPal(0, 0x81, 0xC0);
LoadPalette(gUnknown_8453098, 0xF0, 0x20); LoadPalette(gUnknown_8453098, 0xF0, 0x20);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -265,7 +265,7 @@ u8 sub_810B9DC(u8 a0, u8 a1)
void sub_810BA3C(u8 a0) void sub_810BA3C(u8 a0)
{ {
sub_810F4D8(gUnknown_203AD34[a0], FALSE); ClearMenuWindow(gUnknown_203AD34[a0], FALSE);
ClearWindowTilemap(gUnknown_203AD34[a0]); ClearWindowTilemap(gUnknown_203AD34[a0]);
RemoveWindow(gUnknown_203AD34[a0]); RemoveWindow(gUnknown_203AD34[a0]);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
@@ -285,7 +285,7 @@ void sub_810BA9C(u8 a0)
{ {
if (gUnknown_203AD34[a0] != 0xFF) if (gUnknown_203AD34[a0] != 0xFF)
{ {
sub_810F260(gUnknown_203AD34[a0], FALSE); ClearMenuWindow_BorderThickness2(gUnknown_203AD34[a0], FALSE);
ClearWindowTilemap(gUnknown_203AD34[a0]); ClearWindowTilemap(gUnknown_203AD34[a0]);
RemoveWindow(gUnknown_203AD34[a0]); RemoveWindow(gUnknown_203AD34[a0]);
PutWindowTilemap(1); PutWindowTilemap(1);
src/coins.c
+2 -2
View File
@@ -87,7 +87,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y)
sCoinsWindowId = AddWindow(&template2); sCoinsWindowId = AddWindow(&template2);
FillWindowPixelBuffer(sCoinsWindowId, 0); FillWindowPixelBuffer(sCoinsWindowId, 0);
PutWindowTilemap(sCoinsWindowId); PutWindowTilemap(sCoinsWindowId);
sub_814FF2C(sCoinsWindowId, 0x21D, 0xD0); TextWindow_SetStdFrame0_WithPal(sCoinsWindowId, 0x21D, 0xD0);
SetWindowBorderStyle(sCoinsWindowId, FALSE, 0x21D, 0xD); SetWindowBorderStyle(sCoinsWindowId, FALSE, 0x21D, 0xD);
AddTextPrinterParameterized(sCoinsWindowId, 2, gUnknown_8417C2D, 0, 0, 0xFF, 0); AddTextPrinterParameterized(sCoinsWindowId, 2, gUnknown_8417C2D, 0, 0, 0xFF, 0);
PrintCoinsString(coinAmount); PrintCoinsString(coinAmount);
@@ -96,6 +96,6 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y)
void HideCoinsWindow(void) void HideCoinsWindow(void)
{ {
ClearWindowTilemap(sCoinsWindowId); ClearWindowTilemap(sCoinsWindowId);
sub_810F4D8(sCoinsWindowId, TRUE); ClearMenuWindow(sCoinsWindowId, TRUE);
RemoveWindow(sCoinsWindowId); RemoveWindow(sCoinsWindowId);
} }
src/fldeff_softboiled.c
+1 -1
View File
@@ -84,7 +84,7 @@ void sub_80E58A0(u8 taskId)
sub_811F818(gUnknown_203B0A0.unk9, 0); sub_811F818(gUnknown_203B0A0.unk9, 0);
gUnknown_203B0A0.unk9 = gUnknown_203B0A0.unkA; gUnknown_203B0A0.unk9 = gUnknown_203B0A0.unkA;
sub_811F818(gUnknown_203B0A0.unkA, 1); sub_811F818(gUnknown_203B0A0.unkA, 1);
sub_810F4D8(6, 0); ClearMenuWindow(6, 0);
ClearWindowTilemap(6); ClearWindowTilemap(6);
sub_8121D0C(0); sub_8121D0C(0);
gTasks[taskId].func = sub_811FB28; gTasks[taskId].func = sub_811FB28;
src/item_pc.c
+1150
View File
File diff suppressed because it is too large Load Diff
src/money.c
+2 -2
View File
@@ -128,13 +128,13 @@ void DrawMoneyBox(int amount, u8 x, u8 y)
sMoneyBoxWindowId = AddWindow(&template2); sMoneyBoxWindowId = AddWindow(&template2);
FillWindowPixelBuffer(sMoneyBoxWindowId, 0); FillWindowPixelBuffer(sMoneyBoxWindowId, 0);
PutWindowTilemap(sMoneyBoxWindowId); PutWindowTilemap(sMoneyBoxWindowId);
sub_814FF2C(sMoneyBoxWindowId, 0x21D, 0xD0); TextWindow_SetStdFrame0_WithPal(sMoneyBoxWindowId, 0x21D, 0xD0);
PrintMoneyAmountInMoneyBoxWithBorder(sMoneyBoxWindowId, 0x21D, 13, amount); PrintMoneyAmountInMoneyBoxWithBorder(sMoneyBoxWindowId, 0x21D, 13, amount);
} }
void HideMoneyBox(void) void HideMoneyBox(void)
{ {
sub_810F4D8(sMoneyBoxWindowId, FALSE); ClearMenuWindow(sMoneyBoxWindowId, FALSE);
CopyWindowToVram(sMoneyBoxWindowId, 2); CopyWindowToVram(sMoneyBoxWindowId, 2);
RemoveWindow(sMoneyBoxWindowId); RemoveWindow(sMoneyBoxWindowId);
} }
src/oak_speech.c
+3 -3
View File
@@ -1092,7 +1092,7 @@ static void Task_OakSpeech20(u8 taskId)
static void Task_OakSpeech21(u8 taskId) static void Task_OakSpeech21(u8 taskId)
{ {
s16 * data = gTasks[taskId].data; s16 * data = gTasks[taskId].data;
sub_810F4D8(data[13], 1); ClearMenuWindow(data[13], 1);
RemoveWindow(data[13]); RemoveWindow(data[13]);
data[13] = 0; data[13] = 0;
ClearDialogWindowAndFrame(0, 1); ClearDialogWindowAndFrame(0, 1);
@@ -1184,7 +1184,7 @@ static void Task_OakSpeech29(u8 taskId)
case 3: case 3:
case 4: case 4:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_810F4D8(data[13], TRUE); ClearMenuWindow(data[13], TRUE);
RemoveWindow(data[13]); RemoveWindow(data[13]);
GetDefaultName(sOakSpeechResources->unk_0010, input - 1); GetDefaultName(sOakSpeechResources->unk_0010, input - 1);
data[15] = 1; data[15] = 1;
@@ -1211,7 +1211,7 @@ static void Task_OakSpeech25(u8 taskId)
} }
else else
{ {
sub_810F4D8(gTasks[taskId].data[13], 1); ClearMenuWindow(gTasks[taskId].data[13], 1);
RemoveWindow(gTasks[taskId].data[13]); RemoveWindow(gTasks[taskId].data[13]);
DoNamingScreen(4, gSaveBlock1Ptr->rivalName, 0, 0, 0, CB2_ReturnFromNamingScreen); DoNamingScreen(4, gSaveBlock1Ptr->rivalName, 0, 0, 0, CB2_ReturnFromNamingScreen);
} }
src/quest_log.c
+17 -17
View File
@@ -1691,7 +1691,7 @@ void sub_81123BC(void)
void sub_8112450(void) void sub_8112450(void)
{ {
if (sub_80BF708() != 1) if (MenuHelpers_LinkSomething() != 1)
{ {
sub_8112364(); sub_8112364();
sub_81123BC(); sub_81123BC();
@@ -2842,7 +2842,7 @@ void sub_8113550(u16 a0, const u16 * a1)
if (sub_81138A0(a0, a1) == TRUE) if (sub_81138A0(a0, a1) == TRUE)
return; return;
if (sub_80BF708() == TRUE) if (MenuHelpers_LinkSomething() == TRUE)
return; return;
// NONMATCHING: branch logic here // NONMATCHING: branch logic here
@@ -2954,7 +2954,7 @@ void sub_8113550(u16 a0, const u16 * a1)
"\tbne _081135AA\n" "\tbne _081135AA\n"
"\tb ._return\n" "\tb ._return\n"
"_081135AA:\n" "_081135AA:\n"
"\tbl sub_80BF708\n" "\tbl MenuHelpers_LinkSomething\n"
"\tlsls r0, 24\n" "\tlsls r0, 24\n"
"\tlsrs r0, 24\n" "\tlsrs r0, 24\n"
"\tcmp r0, 0x1\n" "\tcmp r0, 0x1\n"
@@ -3708,7 +3708,7 @@ const u16 * sub_8113FBC(const u16 * a0)
case POCKET_ITEMS: case POCKET_ITEMS:
case POCKET_POKE_BALLS: case POCKET_POKE_BALLS:
case POCKET_BERRY_POUCH: case POCKET_BERRY_POUCH:
StringCopy(gStringVar1, ItemId_GetItem(r5[0])->name); StringCopy(gStringVar1, ItemId_GetName(r5[0]));
if (r5[0] == ITEM_ESCAPE_ROPE) if (r5[0] == ITEM_ESCAPE_ROPE)
{ {
sub_80C4DF8(gStringVar2, r5[2]); sub_80C4DF8(gStringVar2, r5[2]);
@@ -3725,7 +3725,7 @@ const u16 * sub_8113FBC(const u16 * a0)
} }
break; break;
case POCKET_KEY_ITEMS: case POCKET_KEY_ITEMS:
StringCopy(gStringVar1, ItemId_GetItem(r5[0])->name); StringCopy(gStringVar1, ItemId_GetName(r5[0]));
StringExpandPlaceholders(gStringVar4, gUnknown_841A220); StringExpandPlaceholders(gStringVar4, gUnknown_841A220);
break; break;
case POCKET_TM_CASE: case POCKET_TM_CASE:
@@ -3771,7 +3771,7 @@ const u16 * sub_8114188(const u16 * a0)
{ {
const u16 * r4 = sub_8113E88(5, a0); const u16 * r4 = sub_8113E88(5, a0);
QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0); QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); StringCopy(gStringVar2, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, gUnknown_841AB74); StringExpandPlaceholders(gStringVar4, gUnknown_841AB74);
r4 += 2; r4 += 2;
return r4; return r4;
@@ -3787,7 +3787,7 @@ const u16 * sub_81141E4(const u16 * a0)
const u16 * r4 = sub_8113E88(6, a0); const u16 * r4 = sub_8113E88(6, a0);
QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0); QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); StringCopy(gStringVar2, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, gUnknown_841AB8E); StringExpandPlaceholders(gStringVar4, gUnknown_841AB8E);
r4 += 2; r4 += 2;
return r4; return r4;
@@ -3803,7 +3803,7 @@ const u16 * sub_8114240(const u16 * a0)
const u16 * r4 = sub_8113E88(7, a0); const u16 * r4 = sub_8113E88(7, a0);
QuestLog_AutoGetSpeciesName(r4[1], gStringVar2, 0); QuestLog_AutoGetSpeciesName(r4[1], gStringVar2, 0);
StringCopy(gStringVar1, ItemId_GetItem(r4[0])->name); StringCopy(gStringVar1, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, gUnknown_841A6A5); StringExpandPlaceholders(gStringVar4, gUnknown_841A6A5);
r4 += 2; r4 += 2;
return r4; return r4;
@@ -3819,7 +3819,7 @@ const u16 * sub_811429C(const u16 * a0)
const u16 * r4 = sub_8113E88(8, a0); const u16 * r4 = sub_8113E88(8, a0);
QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0); QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); StringCopy(gStringVar2, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, gUnknown_841A1CD); StringExpandPlaceholders(gStringVar4, gUnknown_841A1CD);
r4 += 2; r4 += 2;
return r4; return r4;
@@ -3846,8 +3846,8 @@ const u16 * sub_8114324(const u16 * a0)
{ {
const u16 * r4 = sub_8113E88(9, a0); const u16 * r4 = sub_8113E88(9, a0);
QuestLog_AutoGetSpeciesName(r4[2], gStringVar1, 0); QuestLog_AutoGetSpeciesName(r4[2], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); StringCopy(gStringVar2, ItemId_GetName(r4[0]));
StringCopy(gStringVar3, ItemId_GetItem(r4[1])->name); StringCopy(gStringVar3, ItemId_GetName(r4[1]));
StringExpandPlaceholders(gStringVar4, gUnknown_841A193); StringExpandPlaceholders(gStringVar4, gUnknown_841A193);
r4 += 3; r4 += 3;
return r4; return r4;
@@ -3862,8 +3862,8 @@ const u16 * sub_8114394(const u16 * a0)
{ {
const u16 * r4 = sub_8113E88(10, a0); const u16 * r4 = sub_8113E88(10, a0);
QuestLog_AutoGetSpeciesName(r4[2], gStringVar2, 0); QuestLog_AutoGetSpeciesName(r4[2], gStringVar2, 0);
StringCopy(gStringVar3, ItemId_GetItem(r4[0])->name); StringCopy(gStringVar3, ItemId_GetName(r4[0]));
StringCopy(gStringVar1, ItemId_GetItem(r4[1])->name); StringCopy(gStringVar1, ItemId_GetName(r4[1]));
StringExpandPlaceholders(gStringVar4, gUnknown_841A6E1); StringExpandPlaceholders(gStringVar4, gUnknown_841A6E1);
r4 += 3; r4 += 3;
return r4; return r4;
@@ -4817,7 +4817,7 @@ const u16 * sub_8115518(const u16 * a0)
UnkTextUtil_Reset(); UnkTextUtil_Reset();
sub_80C4DF8(gStringVar1, r7[0]); sub_80C4DF8(gStringVar1, r7[0]);
UnkTextUtil_SetPtrI(0, gStringVar1); UnkTextUtil_SetPtrI(0, gStringVar1);
UnkTextUtil_SetPtrI(1, ItemId_GetItem(r4[0])->name); UnkTextUtil_SetPtrI(1, ItemId_GetName(r4[0]));
if (r4[1] < 2) if (r4[1] < 2)
UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A7DD); UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A7DD);
else else
@@ -4852,7 +4852,7 @@ const u16 * sub_81155E0(const u16 * a0) {
if (r7[1] == 0) { if (r7[1] == 0) {
UnkTextUtil_SetPtrI(0, gSaveBlock2Ptr->playerName); UnkTextUtil_SetPtrI(0, gSaveBlock2Ptr->playerName);
UnkTextUtil_SetPtrI(1, gStringVar1); UnkTextUtil_SetPtrI(1, gStringVar1);
UnkTextUtil_SetPtrI(2, ItemId_GetItem(r5[0])->name); UnkTextUtil_SetPtrI(2, ItemId_GetName(r5[0]));
if (r5[1] == 1) if (r5[1] == 1)
UnkTextUtil_SetPtrI(3, gUnknown_841A8D4); UnkTextUtil_SetPtrI(3, gUnknown_841A8D4);
else else
@@ -4867,7 +4867,7 @@ const u16 * sub_81155E0(const u16 * a0) {
else else
{ {
UnkTextUtil_SetPtrI(0, gStringVar1); UnkTextUtil_SetPtrI(0, gStringVar1);
UnkTextUtil_SetPtrI(1, ItemId_GetItem(r5[0])->name); UnkTextUtil_SetPtrI(1, ItemId_GetName(r5[0]));
ConvertIntToDecimalStringN(gStringVar2, r6, STR_CONV_MODE_LEFT_ALIGN, 6); ConvertIntToDecimalStringN(gStringVar2, r6, STR_CONV_MODE_LEFT_ALIGN, 6);
UnkTextUtil_SetPtrI(2, gStringVar2); UnkTextUtil_SetPtrI(2, gStringVar2);
UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A896); UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A896);
@@ -4890,7 +4890,7 @@ const u16 * sub_8115700(const u16 * a0)
const u16 * r4 = sub_8113E88(40, a0); const u16 * r4 = sub_8113E88(40, a0);
const u8 * r5 = (const u8 *)r4 + 2; const u8 * r5 = (const u8 *)r4 + 2;
sub_80C4DF8(gStringVar1, r5[0]); sub_80C4DF8(gStringVar1, r5[0]);
StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); StringCopy(gStringVar2, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, gUnknown_841B03F); StringExpandPlaceholders(gStringVar4, gUnknown_841B03F);
return (const u16 *)(r5 + 2); return (const u16 *)(r5 + 2);
} }
src/text_window.c
+12 -12
View File
@@ -31,19 +31,19 @@ void sub_814FD6C(u8 bgId, u16 destOffset, u8 palIdx)
void sub_814FDA0(u8 bgId, u16 destOffset, u8 palIdx) void sub_814FDA0(u8 bgId, u16 destOffset, u8 palIdx)
{ {
LoadBgTiles(bgId, gUnknown_8471A4C, 0x120, destOffset); LoadBgTiles(bgId, gStdFrame0, 0x120, destOffset);
LoadPalette(stdpal_get(3), palIdx, 32); LoadPalette(stdpal_get(3), palIdx, 32);
} }
void sub_814FDD4(u8 bgId, u16 destOffset) void sub_814FDD4(u8 bgId, u16 destOffset)
{ {
LoadBgTiles(bgId, gUnknown_8471B6C, 0x280, destOffset); LoadBgTiles(bgId, gStdFrame1, 0x280, destOffset);
} }
void sub_814FDF4(u8 bgId, u8 frameType, u16 destOffset, u8 palIdx) void sub_814FDF4(u8 bgId, u8 frameType, u16 destOffset, u8 palIdx)
{ {
LoadBgTiles(bgId, gUnknown_8471E8C[frameType].tiles, 0x120, destOffset); LoadBgTiles(bgId, gUserFrames[frameType].tiles, 0x120, destOffset);
LoadPalette(gUnknown_8471E8C[frameType].palette, palIdx, 32); LoadPalette(gUserFrames[frameType].palette, palIdx, 32);
} }
void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palIdx) void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palIdx)
@@ -57,7 +57,7 @@ void sub_814FE6C(u8 windowId, u16 destOffset, u8 palIdx)
LoadPalette(stdpal_get(2), palIdx, 32); LoadPalette(stdpal_get(2), palIdx, 32);
} }
void sub_814FEAC(u8 windowId, u16 destOffset, u8 palIdx) void TextWindow_SetBubbleFrame_841F1C8(u8 windowId, u16 destOffset, u8 palIdx)
{ {
LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gUnknown_841F1C8, 0x280, destOffset); LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gUnknown_841F1C8, 0x280, destOffset);
LoadPalette(stdpal_get(0), palIdx, 32); LoadPalette(stdpal_get(0), palIdx, 32);
@@ -69,29 +69,29 @@ void sub_814FEEC(u8 windowId, u16 destOffset, u8 palIdx)
LoadPalette(stdpal_get(1), palIdx, 32); LoadPalette(stdpal_get(1), palIdx, 32);
} }
void sub_814FF2C(u8 windowId, u16 destOffset, u8 palIdx) void TextWindow_SetStdFrame0_WithPal(u8 windowId, u16 destOffset, u8 palIdx)
{ {
LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gUnknown_8471A4C, 0x120, destOffset); LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gStdFrame0, 0x120, destOffset);
LoadPalette(stdpal_get(3), palIdx, 32); LoadPalette(stdpal_get(3), palIdx, 32);
} }
void sub_814FF6C(u8 windowId, u16 destOffset) void sub_814FF6C(u8 windowId, u16 destOffset)
{ {
LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gUnknown_8471A4C, 0x120, destOffset); LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gStdFrame0, 0x120, destOffset);
} }
void sub_814FF98(u8 windowId, u16 destOffset) void sub_814FF98(u8 windowId, u16 destOffset)
{ {
LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gUnknown_8471B6C, 0x280, destOffset); LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gStdFrame1, 0x280, destOffset);
} }
void sub_814FFC4(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx) void sub_814FFC4(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx)
{ {
LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gUnknown_8471E8C[frameType].tiles, 0x120, destOffset); LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gUserFrames[frameType].tiles, 0x120, destOffset);
LoadPalette(gUnknown_8471E8C[frameType].palette, palIdx, 32); LoadPalette(gUserFrames[frameType].palette, palIdx, 32);
} }
void sub_815001C(u8 windowId, u16 destOffset, u8 palIdx) void TextWindow_SetUserSelectedFrame(u8 windowId, u16 destOffset, u8 palIdx)
{ {
sub_814FFC4(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palIdx); sub_814FFC4(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palIdx);
} }
src/text_window_graphics.c
+6 -6
View File
@@ -27,8 +27,8 @@ static const u16 gUnknown_84719EC[] = INCBIN_U16("graphics/text_window/unk_84715
static const u16 gUnknown_8471A0C[] = INCBIN_U16("graphics/text_window/unk_84716AC.gbapal"); static const u16 gUnknown_8471A0C[] = INCBIN_U16("graphics/text_window/unk_84716AC.gbapal");
static const u16 gUnknown_8471A2C[] = INCBIN_U16("graphics/text_window/unk_84717CC.gbapal"); static const u16 gUnknown_8471A2C[] = INCBIN_U16("graphics/text_window/unk_84717CC.gbapal");
const u16 gUnknown_8471A4C[] = INCBIN_U16("graphics/text_window/unk_8471A4C.4bpp"); const u16 gStdFrame0[] = INCBIN_U16("graphics/text_window/unk_8471A4C.4bpp");
const u16 gUnknown_8471B6C[] = INCBIN_U16("graphics/text_window/unk_8471B6C.4bpp"); const u16 gStdFrame1[] = INCBIN_U16("graphics/text_window/unk_8471B6C.4bpp");
const u16 gUnknown_8471DEC[][16] = { const u16 gUnknown_8471DEC[][16] = {
INCBIN_U16("graphics/text_window/stdpal_0.gbapal"), INCBIN_U16("graphics/text_window/stdpal_0.gbapal"),
@@ -38,7 +38,7 @@ const u16 gUnknown_8471DEC[][16] = {
INCBIN_U16("graphics/text_window/stdpal_4.gbapal") INCBIN_U16("graphics/text_window/stdpal_4.gbapal")
}; };
const struct TextWindowGraphics gUnknown_8471E8C[] = { const struct TextWindowGraphics gUserFrames[] = {
{gUnknown_8470D6C, gUnknown_847190C}, {gUnknown_8470D6C, gUnknown_847190C},
{gUnknown_8470E8C, gUnknown_847192C}, {gUnknown_8470E8C, gUnknown_847192C},
{gUnknown_8470FCC, gUnknown_847194C}, {gUnknown_8470FCC, gUnknown_847194C},
@@ -53,8 +53,8 @@ const struct TextWindowGraphics gUnknown_8471E8C[] = {
const struct TextWindowGraphics * sub_8069788(u8 idx) const struct TextWindowGraphics * sub_8069788(u8 idx)
{ {
if (idx >= 20) // if (idx >= NELEMS(gUnknown_8471E8C)) if (idx >= 20) // if (idx >= NELEMS(gUserFrames))
return &gUnknown_8471E8C[0]; return &gUserFrames[0];
else else
return &gUnknown_8471E8C[idx]; return &gUserFrames[idx];
} }
src/tm_case.c
+20 -20
View File
@@ -309,7 +309,7 @@ static void CB2_SetUpTMCaseUI_Blocking(void)
break; break;
if (DoSetUpTMCaseUI() == TRUE) if (DoSetUpTMCaseUI() == TRUE)
break; break;
if (sub_80BF708() == TRUE) if (MenuHelpers_LinkSomething() == TRUE)
break; break;
} }
} }
@@ -595,7 +595,7 @@ static void TMCase_MoveCursor_UpdatePrintedDescription(s32 itemIndex)
static void FillBG2RowWithPalette_2timesNplus1(s32 a0) static void FillBG2RowWithPalette_2timesNplus1(s32 a0)
{ {
sub_80F6B08(2, 0, 12, 30, 8, 2 * a0 + 1); SetBgRectPal(2, 0, 12, 30, 8, 2 * a0 + 1);
schedule_bg_copy_tilemap_to_vram(2); schedule_bg_copy_tilemap_to_vram(2);
} }
@@ -782,7 +782,7 @@ static void Task_SelectTMAction_FromFieldBag(u8 taskId)
{ {
u8 * strbuf; u8 * strbuf;
TMCase_SetWindowBorder2(2); TMCase_SetWindowBorder2(2);
if (!sub_80BF708() && InUnionRoom() != TRUE) if (!MenuHelpers_LinkSomething() && InUnionRoom() != TRUE)
{ {
AddTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId, 0); AddTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId, 0);
sTMCaseDynamicResources->menuActionIndices = sMenuActionIndices_Field; sTMCaseDynamicResources->menuActionIndices = sMenuActionIndices_Field;
@@ -837,7 +837,7 @@ static void Task_TMContextMenu_HandleInput(u8 taskId)
static void TMHMContextMenuAction_Use(u8 taskId) static void TMHMContextMenuAction_Use(u8 taskId)
{ {
RemoveTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId); RemoveTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId);
sub_810F4D8(2, 0); ClearMenuWindow(2, 0);
ClearWindowTilemap(2); ClearWindowTilemap(2);
PutWindowTilemap(0); PutWindowTilemap(0);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
@@ -859,7 +859,7 @@ static void TMHMContextMenuAction_Give(u8 taskId)
s16 * data = gTasks[taskId].data; s16 * data = gTasks[taskId].data;
u16 itemId = BagGetItemIdByPocketPosition(POCKET_TM_CASE, data[1]); u16 itemId = BagGetItemIdByPocketPosition(POCKET_TM_CASE, data[1]);
RemoveTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId); RemoveTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId);
sub_810F4D8(2, 0); ClearMenuWindow(2, 0);
ClearWindowTilemap(2); ClearWindowTilemap(2);
PutWindowTilemap(1); PutWindowTilemap(1);
PutWindowTilemap(4); PutWindowTilemap(4);
@@ -912,7 +912,7 @@ static void Subtask_CloseContextMenuAndReturnToMain(u8 taskId)
DestroyListMenu(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow); DestroyListMenu(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow);
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sTMCaseStaticResources.scrollOffset, sTMCaseStaticResources.selectedRow); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sTMCaseStaticResources.scrollOffset, sTMCaseStaticResources.selectedRow);
PrintListMenuCursorByID_WithColorIdx(data[0], 1); PrintListMenuCursorByID_WithColorIdx(data[0], 1);
sub_810F260(6, 0); ClearMenuWindow_BorderThickness2(6, 0);
ClearWindowTilemap(6); ClearWindowTilemap(6);
PutWindowTilemap(1); PutWindowTilemap(1);
PutWindowTilemap(4); PutWindowTilemap(4);
@@ -927,7 +927,7 @@ static void TMHMContextMenuAction_Exit(u8 taskId)
s16 * data = gTasks[taskId].data; s16 * data = gTasks[taskId].data;
RemoveTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId); RemoveTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId);
sub_810F4D8(2, 0); ClearMenuWindow(2, 0);
ClearWindowTilemap(2); ClearWindowTilemap(2);
PutWindowTilemap(0); PutWindowTilemap(0);
PrintListMenuCursorByID_WithColorIdx(data[0], 1); PrintListMenuCursorByID_WithColorIdx(data[0], 1);
@@ -1016,8 +1016,8 @@ static void Task_SaleOfTMsCancelled(u8 taskId)
{ {
s16 * data = gTasks[taskId].data; s16 * data = gTasks[taskId].data;
sub_810F4D8(8, 0); ClearMenuWindow(8, 0);
sub_810F260(6, 0); ClearMenuWindow_BorderThickness2(6, 0);
PutWindowTilemap(0); PutWindowTilemap(0);
PutWindowTilemap(1); PutWindowTilemap(1);
PutWindowTilemap(3); PutWindowTilemap(3);
@@ -1065,7 +1065,7 @@ static void Task_QuantitySelect_HandleInput(u8 taskId)
else if (JOY_NEW(A_BUTTON)) else if (JOY_NEW(A_BUTTON))
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_810F4D8(7, 0); ClearMenuWindow(7, 0);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(1);
RemoveTMCaseScrollIndicatorArrowPair(); RemoveTMCaseScrollIndicatorArrowPair();
@@ -1074,9 +1074,9 @@ static void Task_QuantitySelect_HandleInput(u8 taskId)
else if (JOY_NEW(B_BUTTON)) else if (JOY_NEW(B_BUTTON))
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_810F4D8(7, 0); ClearMenuWindow(7, 0);
sub_810F4D8(8, 0); ClearMenuWindow(8, 0);
sub_810F260(6, 0); ClearMenuWindow_BorderThickness2(6, 0);
PutWindowTilemap(3); PutWindowTilemap(3);
PutWindowTilemap(0); PutWindowTilemap(0);
PutWindowTilemap(1); PutWindowTilemap(1);
@@ -1123,8 +1123,8 @@ static void Task_AfterSale_ReturnToList(u8 taskId)
if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_810F4D8(8, 0); ClearMenuWindow(8, 0);
sub_810F260(6, 0); ClearMenuWindow_BorderThickness2(6, 0);
PutWindowTilemap(1); PutWindowTilemap(1);
PutWindowTilemap(3); PutWindowTilemap(3);
PutWindowTilemap(4); PutWindowTilemap(4);
@@ -1249,7 +1249,7 @@ static void Task_TMCaseDude_Playback(u8 taskId)
{ {
FillBG2RowWithPalette_2timesNplus1(0); FillBG2RowWithPalette_2timesNplus1(0);
BeginNormalPaletteFade(0x00000400, 0, 6, 0, 0); BeginNormalPaletteFade(0x00000400, 0, 6, 0, 0);
sub_810F260(6, 0); ClearMenuWindow_BorderThickness2(6, 0);
schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(1);
data[8]++; data[8]++;
} }
@@ -1297,9 +1297,9 @@ static void InitWindowTemplatesAndPals(void)
InitWindows(sWindowTemplates); InitWindows(sWindowTemplates);
DeactivateAllTextPrinters(); DeactivateAllTextPrinters();
sub_815001C(0, 0x5B, 0xE0); TextWindow_SetUserSelectedFrame(0, 0x5B, 0xE0);
sub_814FEAC(0, 0x64, 0xB0); TextWindow_SetBubbleFrame_841F1C8(0, 0x64, 0xB0);
sub_814FF2C(0, 0x78, 0xD0); TextWindow_SetStdFrame0_WithPal(0, 0x78, 0xD0);
LoadPalette(gTMCaseMainWindowPalette, 0xF0, 0x20); LoadPalette(gTMCaseMainWindowPalette, 0xF0, 0x20);
LoadPalette(gTMCaseMainWindowPalette, 0xA0, 0x20); LoadPalette(gTMCaseMainWindowPalette, 0xA0, 0x20);
LoadPalette(sPal3Override, 0xF6, 0x04); LoadPalette(sPal3Override, 0xF6, 0x04);
@@ -1420,7 +1420,7 @@ static u8 AddTMContextMenu(u8 * a0, u8 a1)
static void RemoveTMContextMenu(u8 * a0) static void RemoveTMContextMenu(u8 * a0)
{ {
sub_810F4D8(*a0, FALSE); ClearMenuWindow(*a0, FALSE);
ClearWindowTilemap(*a0); ClearWindowTilemap(*a0);
RemoveWindow(*a0); RemoveWindow(*a0);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
src/trainer_tower.c
+1 -1
View File
@@ -1299,7 +1299,7 @@ void sub_815E720(void)
void sub_815E88C(void) void sub_815E88C(void)
{ {
u8 windowId = VarGet(VAR_0x4001); u8 windowId = VarGet(VAR_0x4001);
sub_810F4D8(windowId, TRUE); ClearMenuWindow(windowId, TRUE);
RemoveWindow(windowId); RemoveWindow(windowId);
} }
src/unk_815EDDC.c
+3 -3
View File
@@ -98,7 +98,7 @@ void sub_815EFBC(u8 windowId, u32 powder, u8 x, u8 y, u8 speed)
void sub_815F014(u8 windowId, u16 baseBlock, u8 palette, u32 powder) void sub_815F014(u8 windowId, u16 baseBlock, u8 palette, u32 powder)
{ {
SetWindowBorderStyle(windowId, FALSE, baseBlock, palette); SetWindowBorderStyle(windowId, FALSE, baseBlock, palette);
AddTextPrinterParameterized(windowId, 0, gUnknown_8416655, 0, 0, -1, NULL); AddTextPrinterParameterized(windowId, 0, gOtherText_Powder, 0, 0, -1, NULL);
sub_815EFBC(windowId, powder, 39, 12, 0); sub_815EFBC(windowId, powder, 39, 12, 0);
} }
@@ -119,7 +119,7 @@ void sub_815F094(void)
gUnknown_203F464 = AddWindow(&template2); gUnknown_203F464 = AddWindow(&template2);
FillWindowPixelBuffer(gUnknown_203F464, 0); FillWindowPixelBuffer(gUnknown_203F464, 0);
PutWindowTilemap(gUnknown_203F464); PutWindowTilemap(gUnknown_203F464);
sub_814FF2C(gUnknown_203F464, 0x21D, 0xD0); TextWindow_SetStdFrame0_WithPal(gUnknown_203F464, 0x21D, 0xD0);
sub_815F014(gUnknown_203F464, 0x21D, 0xD, sub_815EFA0()); sub_815F014(gUnknown_203F464, 0x21D, 0xD, sub_815EFA0());
} }
} }
@@ -127,6 +127,6 @@ void sub_815F094(void)
void sub_815F114(void) void sub_815F114(void)
{ {
ClearWindowTilemap(gUnknown_203F464); ClearWindowTilemap(gUnknown_203F464);
sub_810F4D8(gUnknown_203F464, 1); ClearMenuWindow(gUnknown_203F464, 1);
RemoveWindow(gUnknown_203F464); RemoveWindow(gUnknown_203F464);
} }
src/vs_seeker.c
+1 -1
View File
@@ -814,7 +814,7 @@ void Task_VsSeeker_0(u8 taskId)
} }
else if (respval == 2) else if (respval == 2)
{ {
sub_80A2294(4, 0, gSpecialVar_ItemId, 0xffff); ItemUse_SetQuestLogEvent(4, 0, gSpecialVar_ItemId, 0xffff);
FieldEffectStart(FLDEFF_UNK_41); // TODO: name this enum FieldEffectStart(FLDEFF_UNK_41); // TODO: name this enum
gTasks[taskId].func = Task_VsSeeker_1; gTasks[taskId].func = Task_VsSeeker_1;
gTasks[taskId].data[0] = 15; gTasks[taskId].data[0] = 15;
src/window.c
+1 -1
View File
@@ -1069,7 +1069,7 @@ _08004046:\n\
} }
#endif // NONMATCHING #endif // NONMATCHING
void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8)) void CallWindowFunction(u8 windowId, WindowFunc func)
{ {
struct WindowTemplate window = gWindows[windowId].window; struct WindowTemplate window = gWindows[windowId].window;
func(window.bg, window.tilemapLeft, window.tilemapTop, window.width, window.height, window.paletteNum); func(window.bg, window.tilemapLeft, window.tilemapTop, window.width, window.height, window.paletteNum);
sym_ewram.txt
+3 -20
View File
@@ -1318,27 +1318,10 @@ gSpecialVar_ItemId: @ 203AD30
.align 2 .align 2
.include "src/vs_seeker.o" .include "src/vs_seeker.o"
gUnknown_203ADBC: @ 203ADBC .align 2
.space 0x4 .include "src/item_pc.o"
gUnknown_203ADC0: @ 203ADC0
.space 0x4
gUnknown_203ADC4: @ 203ADC4
.space 0x4
gUnknown_203ADC8: @ 203ADC8
.space 0x4
gUnknown_203ADCC: @ 203ADCC
.space 0x4
gUnknown_203ADD0: @ 203ADD0
.space 0x8
gUnknown_203ADD8: @ 203ADD8
.space 0x4
.align 2
gUnknown_203ADDC: @ 203ADDC gUnknown_203ADDC: @ 203ADDC
.space 0x4 .space 0x4