dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #275 from Diegoisawesome/master

Browse Source 
Document list_menu.c and main_menu.c
This commit is contained in:
Diegoisawesome
2018-07-15 04:43:03 -07:00
committed by GitHub
parent 24f6484643 731d6d59bc
commit 07ef762770
73 changed files with 836 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/easy_chat.s
+1 -1
View File
@@ -5988,7 +5988,7 @@ sub_811D0BC: @ 811D0BC
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE
asm/field_specials.s
+2 -2
View File
@@ -912,7 +912,7 @@ _0813839C:
adds r0, r5, 0
adds r2, r4, 0
mov r3, r12
bl SpawnSpecialEventObjectParametrized
bl SpawnSpecialEventObjectParameterized
adds r0, r5, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -2557,7 +2557,7 @@ SpawnScriptEventObject: @ 8139158
movs r0, 0x7
movs r1, 0x8
movs r2, 0x7F
bl SpawnSpecialEventObjectParametrized
bl SpawnSpecialEventObjectParameterized
lsls r0, 24
lsrs r0, 24
ldr r2, =gEventObjects
asm/learn_move.s
+1 -1
View File
@@ -1270,7 +1270,7 @@ _081611D4:
ldrb r0, [r0]
cmp r0, 0xFF
bne _08161210
ldr r0, =gUnknown_0203CE8C
ldr r0, =gTempScrollArrowTemplate
adds r2, r0, 0
ldr r1, =gUnknown_085CEBD0
ldm r1!, {r3,r5,r6}
asm/link_rfu.s
+1 -1
View File
@@ -856,7 +856,7 @@ sub_8011AFC: @ 8011AFC
bl ResetPaletteFade
ldr r0, =sub_8011AE8
bl SetVBlankCallback
bl sub_80093CC
bl IsWirelessAdapterConnected
lsls r0, 24
cmp r0, 0
beq _08011B70
asm/party_menu.s
+1 -1
View File
@@ -4396,7 +4396,7 @@ _081B23E8:
movs r0, 0
movs r1, 0x4F
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
bl GetOverworldTextboxPalettePtr
movs r1, 0xE0
movs r2, 0x20
asm/pokemon_storage_system.s
+2 -2
View File
@@ -1837,7 +1837,7 @@ _080C805E:
movs r0, 0x1
movs r1, 0xB
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
b _080C8198
.pool
_080C808C:
@@ -6712,7 +6712,7 @@ sub_80CAC1C: @ 80CAC1C
movs r0, 0x1
movs r1, 0x2
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0x20
str r0, [sp]
movs r0, 0x14
asm/pokemon_summary_screen.s
+3 -3
View File
@@ -2869,7 +2869,7 @@ sub_81C5674: @ 81C5674
movs r1, 0xAC
movs r2, 0xC
movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
ldr r2, =0x00000816
adds r1, r2
@@ -4868,7 +4868,7 @@ sub_81C67CC: @ 81C67CC
ldrb r0, [r5]
movs r1, 0x10
movs r2, 0x1
bl sub_81AF15C
bl ListMenuSetUnkIndicatorsStructField
ldr r0, =gSaveBlock2Ptr
ldr r3, [r0]
movs r0, 0x2
@@ -5293,7 +5293,7 @@ sub_81C6BD8: @ 81C6BD8
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0xA
movs r2, 0xD0
asm/pokenav.s
+3 -3
View File
@@ -10101,7 +10101,7 @@ sub_81CC09C: @ 81CC09C
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x40
bl sub_809882C
bl LoadUserWindowBorderGfx
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x4
@@ -21001,7 +21001,7 @@ sub_81D1E90: @ 81D1E90
movs r1, 0xC8
movs r2, 0xC
movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
strb r0, [r4, 0x9]
add sp, 0x10
pop {r4}
@@ -22282,7 +22282,7 @@ sub_81D2824: @ 81D2824
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
ldr r0, =gUnknown_0860F074
movs r1, 0xF0
movs r2, 0x20
asm/rom_8011DC0.s
+17 -17
View File
@@ -679,7 +679,7 @@ _08012B3C:
bl sub_8013398
strb r0, [r6, 0x13]
ldrb r0, [r6, 0x12]
bl sub_81AE70C
bl RedrawListMenu
b _08012E5C
.pool
_08012B54:
@@ -837,7 +837,7 @@ _08012C5C:
movs r0, 0
strb r0, [r1, 0x1B]
ldrb r0, [r6, 0x12]
bl sub_81AE70C
bl RedrawListMenu
ldrb r0, [r6, 0x13]
adds r0, 0x1
strb r0, [r6, 0x13]
@@ -908,7 +908,7 @@ _08012D04:
ldr r0, [r6]
bl sub_8013398
ldrb r0, [r6, 0x12]
bl sub_81AE70C
bl RedrawListMenu
_08012D40:
movs r0, 0x4
strb r0, [r6, 0xC]
@@ -1459,7 +1459,7 @@ _08013228:
movs r0, 0x2
bl PlaySE
ldrb r0, [r4, 0x12]
bl sub_81AE70C
bl RedrawListMenu
ldr r0, =gStringVar2
ldrb r2, [r4, 0x13]
lsls r2, 5
@@ -1478,7 +1478,7 @@ _0801325C:
movs r1, 0
bl sub_8011A64
ldrb r0, [r4, 0x12]
bl sub_81AE70C
bl RedrawListMenu
strb r5, [r4, 0xC]
movs r0, 0x1
b _08013272
@@ -2373,7 +2373,7 @@ _08013A70:
strb r0, [r6, 0x8]
_08013A72:
ldrb r0, [r6, 0xE]
bl sub_81AE70C
bl RedrawListMenu
b _08013B82
_08013A7A:
bl sub_8011A74
@@ -2542,7 +2542,7 @@ sub_8013BD8: @ 8013BD8
movs r1, 0
bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r4, 0xE]
bl sub_81AE70C
bl RedrawListMenu
ldr r0, =gStringVar1
ldrb r2, [r4, 0xF]
lsls r2, 5
@@ -4281,7 +4281,7 @@ _08014C34:
bl sub_8013398
strb r0, [r5, 0x13]
ldrb r0, [r5, 0x12]
bl sub_81AE70C
bl RedrawListMenu
_08014C42:
movs r0, 0x2
strb r0, [r5, 0xC]
@@ -4326,7 +4326,7 @@ _08014C82:
adds r1, r0
strb r4, [r1, 0x1B]
ldrb r0, [r5, 0x12]
bl sub_81AE70C
bl RedrawListMenu
movs r0, 0x5
strb r0, [r5, 0x19]
ldrb r1, [r5, 0x13]
@@ -4396,7 +4396,7 @@ _08014CF2:
movs r0, 0
strb r0, [r1, 0x1B]
ldrb r0, [r5, 0x12]
bl sub_81AE70C
bl RedrawListMenu
ldrb r0, [r5, 0x13]
adds r0, 0x1
strb r0, [r5, 0x13]
@@ -4441,7 +4441,7 @@ _08014D64:
ldr r0, [r5]
bl sub_8013398
ldrb r0, [r5, 0x12]
bl sub_81AE70C
bl RedrawListMenu
movs r0, 0x2
strb r0, [r5, 0xC]
_08014DA4:
@@ -4784,7 +4784,7 @@ _080150B8:
bl PlaySE
_080150CE:
ldrb r0, [r7, 0xE]
bl sub_81AE70C
bl RedrawListMenu
b _080152A0
_080150D6:
ldrb r0, [r7, 0xE]
@@ -4818,7 +4818,7 @@ _080150D6:
movs r1, 0
bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r7, 0xE]
bl sub_81AE70C
bl RedrawListMenu
ldr r0, =gStringVar1
ldrb r2, [r7, 0xF]
lsls r2, 5
@@ -5152,7 +5152,7 @@ _08015436:
b _08015604
_0801543E:
ldrb r0, [r5, 0xE]
bl sub_81AE70C
bl RedrawListMenu
b _08015604
_08015446:
ldrb r0, [r5, 0x13]
@@ -10972,7 +10972,7 @@ _08018574:
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xF0
@@ -15907,7 +15907,7 @@ _0801AD8C:
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
@@ -27081,7 +27081,7 @@ sub_8020740: @ 8020740
movs r0, 0x3
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0x3
movs r1, 0xA
movs r2, 0x20
asm/shop.s
+2 -2
View File
@@ -877,7 +877,7 @@ BuyMenuAddScrollIndicatorArrows: @ 80E01C8
movs r1, 0xAC
movs r2, 0xC
movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r5]
adds r1, r4
strb r0, [r1]
@@ -1157,7 +1157,7 @@ BuyMenuInitWindows: @ 80E0468
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
asm/slot_machine.s
+1 -1
View File
@@ -639,7 +639,7 @@ sub_812AA48: @ 812AA48
lsls r1, 2
movs r0, 0
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
bl PutWindowTilemap
pop {r0}
asm/trade.s
+1 -1
View File
@@ -245,7 +245,7 @@ _08077310:
movs r0, 0x2
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
bl LoadMonIconPalettes
ldr r2, =gUnknown_0203229C
ldr r0, [r2]