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

decompile option menu

Browse Source
This commit is contained in:
DizzyEggg
2018-01-16 18:59:06 +01:00
parent 11cb3275cc
commit a6072ae293
45 changed files with 728 additions and 1757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim_80FE840.s
+1 -1
View File
@@ -18852,7 +18852,7 @@ _0810800C:
negs r0, r0
cmp r1, r0
bne _08108022
bl remove_some_task
bl ScanlineEffect_Stop
adds r0, r7, 0
bl DestroyTask
_08108022:
asm/battle_frontier_1.s
+3 -3
View File
@@ -9449,7 +9449,7 @@ _08193AA8:
b _08193BC2
_08193ABA:
bl FreeAllWindowBuffers
bl remove_some_task
bl ScanlineEffect_Stop
ldr r4, =gUnknown_0203CD7C
ldr r0, [r4]
bl Free
@@ -9494,7 +9494,7 @@ _08193B20:
cmp r6, 0
bne _08193BC2
bl FreeAllWindowBuffers
bl remove_some_task
bl ScanlineEffect_Stop
ldr r4, =gUnknown_0203CD7C
ldr r0, [r4]
bl Free
@@ -9534,7 +9534,7 @@ _08193B84:
cmp r6, 0
bne _08193BC2
bl FreeAllWindowBuffers
bl remove_some_task
bl ScanlineEffect_Stop
ldr r4, =gUnknown_0203CD7C
ldr r0, [r4]
bl Free
asm/battle_records.s
+1 -1
View File
@@ -1034,7 +1034,7 @@ _0813C6FA:
thumb_func_start sub_813C80C
sub_813C80C: @ 813C80C
push {lr}
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl ResetPaletteFade
asm/berry_tag_screen.s
+1 -1
View File
@@ -119,7 +119,7 @@ _08177D18:
bl clear_scheduled_bg_copies_to_vram
b _08177DDC
_08177D26:
bl remove_some_task
bl ScanlineEffect_Stop
b _08177DDC
_08177D2C:
bl ResetPaletteFade
asm/cable_car.s
+1 -1
View File
@@ -88,7 +88,7 @@ _0814FD20:
bl SetVBlankCallback
movs r0, 0
bl sub_8150B6C
bl remove_some_task
bl ScanlineEffect_Stop
movs r3, 0xC0
lsls r3, 19
movs r4, 0xC0
asm/contest_painting.s
+1 -1
View File
@@ -107,7 +107,7 @@ _0812FE80:
.4byte _0812FF2A
.4byte _0812FF54
_0812FE94:
bl remove_some_task
bl ScanlineEffect_Stop
movs r0, 0
bl SetVBlankCallback
bl AllocateMonSpritesGfx
asm/field_screen.s
+2 -2
View File
@@ -9621,7 +9621,7 @@ _080AFE64:
ldrsh r0, [r4, r3]
cmp r0, 0x1
bne _080AFEB4
bl remove_some_task
bl ScanlineEffect_Stop
movs r0, 0x2
strh r0, [r4]
b _080AFEC6
@@ -9714,7 +9714,7 @@ _080AFF28:
ldrsh r0, [r4, r3]
cmp r0, 0x1
bne _080AFF78
bl remove_some_task
bl ScanlineEffect_Stop
movs r0, 0x2
strh r0, [r4]
b _080AFF8A
asm/intro.s
+1 -1
View File
@@ -184,7 +184,7 @@ _0816CCF4:
movs r0, 0
movs r2, 0
bl load_copyright_graphics
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl FreeAllSpritePalettes
asm/item_menu.s
+1 -1
View File
@@ -343,7 +343,7 @@ _081AAE34:
bl clear_scheduled_bg_copies_to_vram
b _081AB012
_081AAE3E:
bl remove_some_task
bl ScanlineEffect_Stop
ldr r1, =gMain
movs r2, 0x87
lsls r2, 3
asm/link.s
+6 -6
View File
@@ -3360,7 +3360,7 @@ c2_800ACD4: @ 800AF30
movs r2, 0x2
bl FillPalette
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
ldr r1, =gLinkVSyncDisabled
ldrb r0, [r1]
cmp r0, 0
@@ -28637,7 +28637,7 @@ _08018482:
bl ResetSpriteData
bl FreeAllSpritePalettes
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_082F0598
@@ -32620,7 +32620,7 @@ sub_801A43C: @ 801A43C
bl ResetPaletteFade
bl ResetSpriteData
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
bl m4aSoundVSyncOn
ldr r0, =sub_801A418
bl SetVBlankCallback
@@ -45999,7 +45999,7 @@ _080210A0:
movs r0, 0
movs r1, 0
bl SetGpuReg
bl remove_some_task
bl ScanlineEffect_Stop
bl reset_temp_tile_data_buffers
b _080212FC
_080210BE:
@@ -61951,7 +61951,7 @@ sub_8028FF8: @ 8028FF8
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
bl sub_8098758
bl GetWindowFrameTilesPal
ldr r1, [r0]
movs r2, 0x90
lsls r2, 1
@@ -61959,7 +61959,7 @@ sub_8028FF8: @ 8028FF8
movs r3, 0x1
bl LoadBgTiles
adds r0, r4, 0
bl sub_8098758
bl GetWindowFrameTilesPal
ldr r0, [r0, 0x4]
movs r1, 0xA0
movs r2, 0x20
asm/main_menu.s
+6 -6
View File
@@ -127,7 +127,7 @@ InitMainMenu: @ 802F6F4
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl FreeAllSpritePalettes
@@ -1487,7 +1487,7 @@ _08030460:
ldr r0, =gMain
ldr r1, =CB2_ReinitMainMenu
str r1, [r0, 0x8]
ldr r0, =CB2_OptionsMenu
ldr r0, =CB2_InitOptionMenu
b _0803048A
.pool
_08030478:
@@ -1929,7 +1929,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0
movs r1, 0x1
movs r2, 0x10
bl LoadPalette
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetSpriteData
bl FreeAllSpritePalettes
bl dp13_810BB8C
@@ -3708,7 +3708,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
strh r0, [r4, 0x16]
ldr r0, =0x0000ffc4
strh r0, [r4, 0x10]
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetSpriteData
bl FreeAllSpritePalettes
bl dp13_810BB8C
@@ -4783,7 +4783,7 @@ LoadMainMenuWindowFrameTiles: @ 80320A4
ldr r0, [r6]
ldrb r0, [r0, 0x14]
lsrs r0, 3
bl sub_8098758
bl GetWindowFrameTilesPal
ldr r1, [r0]
movs r2, 0x90
lsls r2, 1
@@ -4793,7 +4793,7 @@ LoadMainMenuWindowFrameTiles: @ 80320A4
ldr r0, [r6]
ldrb r0, [r0, 0x14]
lsrs r0, 3
bl sub_8098758
bl GetWindowFrameTilesPal
ldr r0, [r0, 0x4]
movs r1, 0x20
movs r2, 0x20
asm/mon_markings.s
+1 -1
View File
@@ -21,7 +21,7 @@ sub_811F918: @ 811F918
ldr r0, [r0]
ldrb r0, [r0, 0x14]
lsrs r0, 3
bl sub_8098758
bl GetWindowFrameTilesPal
ldr r3, =gUnknown_0203A124
ldr r2, [r3]
ldr r1, [r0]
asm/option_menu.s
-1684
View File
File diff suppressed because it is too large Load Diff
asm/overworld.s
+1 -1
View File
@@ -4122,7 +4122,7 @@ sub_80867D8: @ 80867D8
movs r0, 0
movs r1, 0
bl SetGpuReg
bl remove_some_task
bl ScanlineEffect_Stop
ldr r2, =0x05000002
mov r1, sp
movs r0, 0
asm/party_menu.s
+1 -1
View File
@@ -107,7 +107,7 @@ _081B0290:
b _081B048C
.pool
_081B02AC:
bl remove_some_task
bl ScanlineEffect_Stop
b _081B0484
_081B02B2:
bl ResetPaletteFade
asm/pokedex.s
+1 -1
View File
@@ -379,7 +379,7 @@ _080BB582:
b _080BB74C
.pool
_080BB5FC:
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl ResetPaletteFade
asm/pokemon_summary_screen.s
+1 -1
View File
@@ -2239,7 +2239,7 @@ _081C50E4:
bl clear_scheduled_bg_copies_to_vram
b _081C51A2
_081C50EE:
bl remove_some_task
bl ScanlineEffect_Stop
b _081C51A2
_081C50F4:
bl FreeAllSpritePalettes
asm/pokenav.s
+2 -2
View File
@@ -7095,7 +7095,7 @@ titlescreen_0: @ 81CA92C
movs r0, 0x44
movs r1, 0xA0
bl SetGpuRegBits
bl remove_some_task
bl ScanlineEffect_Stop
bl sub_81CAA3C
ldr r2, =gUnknown_08620384
ldr r0, [r2]
@@ -7122,7 +7122,7 @@ sub_81CA994: @ 81CA994
lsls r1, 6
movs r0, 0
bl ClearGpuRegBits
bl remove_some_task
bl ScanlineEffect_Stop
ldr r0, =sub_81CA9EC
bl FindTaskIdByFunc
lsls r0, 24
asm/rayquaza_scene.s
+3 -3
View File
@@ -45,7 +45,7 @@ sub_81D6774: @ 81D6774
push {lr}
bl SetVBlankHBlankCallbacksToNull
bl clear_scheduled_bg_copies_to_vram
bl remove_some_task
bl ScanlineEffect_Stop
bl FreeAllSpritePalettes
bl ResetPaletteFade
bl ResetSpriteData
@@ -1522,7 +1522,7 @@ _081D73D8:
adds r0, r2
ldrh r1, [r4, 0x6]
strh r1, [r0, 0xE]
bl remove_some_task
bl ScanlineEffect_Stop
_081D7428:
ldrh r0, [r4]
adds r0, 0x1
@@ -1774,7 +1774,7 @@ sub_81D7600: @ 81D7600
bl ChangeBgY
movs r0, 0
bl SetVBlankCallback
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetSpriteData
bl FreeAllSpritePalettes
strh r4, [r5]
asm/reset_rtc_screen.s
+1 -1
View File
@@ -887,7 +887,7 @@ _0809EFCA:
movs r1, 0x80
bl ResetOamRange
bl LoadOam
bl remove_some_task
bl ScanlineEffect_Stop
bl dp12_8087EA4
bl ResetSpriteData
bl ResetTasks
asm/roulette.s
+1 -1
View File
@@ -423,7 +423,7 @@ _081405F4:
_08140618:
movs r0, 0
bl SetVBlankCallback
bl remove_some_task
bl ScanlineEffect_Stop
bl SetVBlankHBlankCallbacksToNull
bl ResetVramOamAndBgCntRegs
bl ResetAllBgsCoordinates
asm/shop.s
+1 -1
View File
@@ -448,7 +448,7 @@ _080DFE20:
ldr r2, =0x01000100
add r0, sp, 0x8
bl CpuFastSet
bl remove_some_task
bl ScanlineEffect_Stop
bl reset_temp_tile_data_buffers
bl FreeAllSpritePalettes
bl ResetPaletteFade
asm/start_menu.s
+2 -2
View File
@@ -653,7 +653,7 @@ _0809FD38:
bl play_some_sound
bl RemoveExtraStartMenuWindows
bl overworld_free_bg_tilemaps
ldr r0, =CB2_OptionsMenu
ldr r0, =CB2_InitOptionMenu
bl SetMainCallback2
ldr r1, =gMain
ldr r0, =sub_8086194
@@ -1510,7 +1510,7 @@ _080A0418:
bl SetGpuReg
movs r0, 0
bl SetVBlankCallback
bl remove_some_task
bl ScanlineEffect_Stop
movs r2, 0xA0
lsls r2, 19
mov r1, sp
asm/title_screen.s
+1 -1
View File
@@ -614,7 +614,7 @@ _080AA8C4:
ldr r0, =gUnknown_08DDE458
ldr r1, =0x0600d800
bl LZ77UnCompVram
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl FreeAllSpritePalettes
asm/trainer_card.s
+6 -6
View File
@@ -1556,7 +1556,7 @@ sub_80C3404: @ 80C3404
sub_80C3414: @ 80C3414
push {lr}
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
ldr r0, =sub_80C2760
movs r1, 0
bl CreateTask
@@ -3976,7 +3976,7 @@ sub_80C4998: @ 80C4998
bl HideBg
movs r0, 0x3
bl HideBg
bl remove_some_task
bl ScanlineEffect_Stop
bl dp12_8087EA4
movs r1, 0
ldr r0, =gUnknown_02038C28
@@ -5310,7 +5310,7 @@ _080C54AC:
_080C54D8:
movs r0, 0
bl SetVBlankCallback
bl remove_some_task
bl ScanlineEffect_Stop
bl SetVBlankHBlankCallbacksToNull
movs r0, 0x2
bl DisableInterrupts
@@ -5594,7 +5594,7 @@ _080C577C:
bl HideBg
movs r0, 0
bl SetVBlankCallback
bl remove_some_task
bl ScanlineEffect_Stop
bl SetVBlankHBlankCallbacksToNull
b _080C57E4
_080C57A6:
@@ -7189,7 +7189,7 @@ _080C64F0:
_080C6510:
movs r0, 0
bl SetVBlankCallback
bl remove_some_task
bl ScanlineEffect_Stop
bl SetVBlankHBlankCallbacksToNull
b _080C6694
_080C6520:
@@ -7400,7 +7400,7 @@ _080C66FC:
_080C6722:
movs r0, 0
bl SetVBlankCallback
bl remove_some_task
bl ScanlineEffect_Stop
bl SetVBlankHBlankCallbacksToNull
b _080C67A4
_080C6732:
asm/unknown_task.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start remove_some_task
remove_some_task: @ 80B9FB8
thumb_func_start ScanlineEffect_Stop
ScanlineEffect_Stop: @ 80B9FB8
push {r4,lr}
ldr r4, =gUnknown_02039B28
movs r0, 0
@@ -32,7 +32,7 @@ _080B9FE2:
pop {r0}
bx r0
.pool
thumb_func_end remove_some_task
thumb_func_end ScanlineEffect_Stop
thumb_func_start dp12_8087EA4
dp12_8087EA4: @ 80B9FF8