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

egg_hatch as part of daycare

Browse Source
This commit is contained in:
PikalaxALT
2019-05-06 10:49:10 -04:00
parent 5f49353de4
commit e9e87a0fe4
76 changed files with 3042 additions and 2254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+8 -8
View File
@@ -294,7 +294,7 @@ sub_800F40C: @ 800F40C
thumb_func_start LoadBattleTextboxAndBackground
LoadBattleTextboxAndBackground: @ 800F420
push {lr}
ldr r0, _0800F454 @ =gUnknown_8D00000
ldr r0, _0800F454 @ =gBattleTextboxTiles
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
@@ -305,7 +305,7 @@ LoadBattleTextboxAndBackground: @ 800F420
bl CopyToBgTilemapBuffer
movs r0, 0
bl CopyBgTilemapBufferToVram
ldr r0, _0800F45C @ =gUnknown_8D004D8
ldr r0, _0800F45C @ =gBattleTextboxPalette
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
@@ -314,9 +314,9 @@ LoadBattleTextboxAndBackground: @ 800F420
pop {r0}
bx r0
.align 2, 0
_0800F454: .4byte gUnknown_8D00000
_0800F454: .4byte gBattleTextboxTiles
_0800F458: .4byte gFile_graphics_interface_menu_map_tilemap
_0800F45C: .4byte gUnknown_8D004D8
_0800F45C: .4byte gBattleTextboxPalette
thumb_func_end LoadBattleTextboxAndBackground
thumb_func_start sub_800F460
@@ -1385,13 +1385,13 @@ _0800FCD0:
.4byte _0800FD68
.4byte _0800FD8C
_0800FCEC:
ldr r0, _0800FCF8 @ =gUnknown_8D00000
ldr r0, _0800FCF8 @ =gBattleTextboxTiles
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
b _0800FD94
.align 2, 0
_0800FCF8: .4byte gUnknown_8D00000
_0800FCF8: .4byte gBattleTextboxTiles
_0800FCFC:
ldr r1, _0800FD10 @ =gFile_graphics_interface_menu_map_tilemap
movs r0, 0
@@ -1404,13 +1404,13 @@ _0800FCFC:
.align 2, 0
_0800FD10: .4byte gFile_graphics_interface_menu_map_tilemap
_0800FD14:
ldr r0, _0800FD20 @ =gUnknown_8D004D8
ldr r0, _0800FD20 @ =gBattleTextboxPalette
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
b _0800FD94
.align 2, 0
_0800FD20: .4byte gUnknown_8D004D8
_0800FD20: .4byte gBattleTextboxPalette
_0800FD24:
bl sub_800FC2C
lsls r0, 24
asm/battle_2.s
+2 -2
View File
@@ -3597,7 +3597,7 @@ _08011A9C:
ldr r0, _08011B74 @ =gBattle_BG3_Y
strh r4, [r0]
bl sub_800F34C
ldr r0, _08011B78 @ =gUnknown_8D004D8
ldr r0, _08011B78 @ =gBattleTextboxPalette
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
@@ -3655,7 +3655,7 @@ _08011B68: .4byte gBattle_BG2_X
_08011B6C: .4byte gBattle_BG2_Y
_08011B70: .4byte gBattle_BG3_X
_08011B74: .4byte gBattle_BG3_Y
_08011B78: .4byte gUnknown_8D004D8
_08011B78: .4byte gBattleTextboxPalette
_08011B7C: .4byte gReservedSpritePaletteCount
_08011B80: .4byte sub_80116F4
_08011B84: .4byte sub_800F6FC
asm/battle_controller_link_opponent.s
+2 -2
View File
@@ -3576,7 +3576,7 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _0803C4E8 @ =gMultiuseSpriteTemplate
mov r8, r0
ldrb r0, [r6]
@@ -3780,7 +3780,7 @@ sub_803C550: @ 803C550
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _0803C6C0 @ =gMultiuseSpriteTemplate
mov r9, r0
adds r0, r6, 0
asm/battle_controller_link_partner.s
+2 -2
View File
@@ -3370,7 +3370,7 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080D5EB4 @ =gMultiuseSpriteTemplate
mov r8, r0
ldrb r0, [r6]
@@ -3562,7 +3562,7 @@ sub_80D5F40: @ 80D5F40
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080D6098 @ =gMultiuseSpriteTemplate
mov r10, r0
adds r0, r6, 0
asm/battle_controller_oak.s
+1 -1
View File
@@ -7071,7 +7071,7 @@ sub_80EAF34: @ 80EAF34
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080EB094 @ =gMultiuseSpriteTemplate
mov r10, r0
adds r0, r6, 0
asm/battle_controller_opponent.s
+2 -2
View File
@@ -3649,7 +3649,7 @@ _080378AA:
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r6, _080379A0 @ =gMultiuseSpriteTemplate
ldrb r0, [r7]
movs r1, 0x2
@@ -3872,7 +3872,7 @@ sub_8037A28: @ 8037A28
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _08037B98 @ =gMultiuseSpriteTemplate
mov r9, r0
adds r0, r6, 0
asm/battle_controller_player.s
+1 -1
View File
@@ -7442,7 +7442,7 @@ sub_8031FF4: @ 8031FF4
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _0803214C @ =gMultiuseSpriteTemplate
mov r10, r0
adds r0, r6, 0
asm/battle_controller_pokedude.s
+2 -2
View File
@@ -3932,7 +3932,7 @@ sub_81580E0: @ 81580E0
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _08158220 @ =gMultiuseSpriteTemplate
mov r9, r0
ldrb r0, [r6]
@@ -6336,7 +6336,7 @@ sub_8159478: @ 8159478
lsls r1, 24
lsrs r1, 24
mov r0, r8
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _081595D8 @ =gMultiuseSpriteTemplate
mov r10, r0
adds r0, r6, 0
asm/battle_setup.s
+5 -5
View File
@@ -42,7 +42,7 @@ _0807F65E:
cmp r0, 0x1
bne _0807F686
bl sub_812B484
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0807F68C @ =sub_800FD9C
bl SetMainCallback2
bl sub_806D7E8
@@ -636,9 +636,9 @@ _0807FB74: .4byte 0x01000100
_0807FB78: .4byte gUnknown_2023E8A
_0807FB7C: .4byte c2_whiteout
_0807FB80:
ldr r0, _0807FB94 @ =c2_exit_to_overworld_2_switch
ldr r0, _0807FB94 @ =CB2_ReturnToField
bl SetMainCallback2
ldr r1, _0807FB98 @ =gUnknown_3005020
ldr r1, _0807FB98 @ =gFieldCallback
ldr r0, _0807FB9C @ =sub_807E3EC
str r0, [r1]
_0807FB8C:
@@ -646,8 +646,8 @@ _0807FB8C:
pop {r0}
bx r0
.align 2, 0
_0807FB94: .4byte c2_exit_to_overworld_2_switch
_0807FB98: .4byte gUnknown_3005020
_0807FB94: .4byte CB2_ReturnToField
_0807FB98: .4byte gFieldCallback
_0807FB9C: .4byte sub_807E3EC
thumb_func_end sub_807FB40
asm/battle_tower.s
+1 -1
View File
@@ -2033,7 +2033,7 @@ sub_80E68C4: @ 80E68C4
ldr r0, _080E68F4 @ =gMain
ldr r1, _080E68F8 @ =sub_80E6854
str r1, [r0, 0x8]
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _080E68FC @ =sub_800FD9C
bl SetMainCallback2
adds r0, r4, 0
asm/cable_club.s
+4 -4
View File
@@ -1631,7 +1631,7 @@ _08081410:
_08081418:
str r0, [r1]
_0808141A:
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r1, _08081444 @ =gTrainerBattleOpponent_A
movs r2, 0x80
lsls r2, 4
@@ -1854,7 +1854,7 @@ _080815E0:
_080815E8:
str r0, [r1]
_080815EA:
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r1, _08081614 @ =gTrainerBattleOpponent_A
movs r3, 0x80
lsls r3, 4
@@ -1905,14 +1905,14 @@ _0808164C:
lsls r0, 24
cmp r0, 0
beq _0808165C
ldr r0, _08081664 @ =c2_exit_to_overworld_2_switch
ldr r0, _08081664 @ =CB2_ReturnToField
bl SetMainCallback2
_0808165C:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08081664: .4byte c2_exit_to_overworld_2_switch
_08081664: .4byte CB2_ReturnToField
thumb_func_end sub_8081624
thumb_func_start sub_8081668
asm/clear_save_data_screen.s
+2 -2
View File
@@ -152,7 +152,7 @@ _080F569C:
movs r1, 0x2
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
movs r0, 0
bl CopyBgTilemapBufferToVram
b _080F56E2
@@ -204,7 +204,7 @@ sub_80F5708: @ 80F5708
ldrb r0, [r0]
cmp r0, 0
bne _080F578C
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x1
asm/credits.s
+7 -7
View File
@@ -177,7 +177,7 @@ sub_80F3B04: @ 80F3B04
beq _080F3B20
ldrb r0, [r1, 0xA]
bl RemoveWindow
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r1, [r4]
movs r0, 0
strb r0, [r1, 0xB]
@@ -1279,13 +1279,13 @@ _080F4374:
movs r0, 0x1
adds r2, r5, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _080F44B4 @ =gUnknown_840C650
str r4, [sp]
movs r0, 0x2
adds r2, r5, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _080F44B8 @ =gUnknown_8EAB30C
movs r2, 0xA0
lsls r2, 3
@@ -1293,14 +1293,14 @@ _080F4374:
str r4, [sp]
movs r0, 0x1
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _080F44BC @ =gUnknown_840CA54
movs r2, 0x80
lsls r2, 3
str r4, [sp]
movs r0, 0x2
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r0, [r6]
ldrb r0, [r0, 0x9]
lsls r0, 5
@@ -1620,7 +1620,7 @@ _080F46A0:
str r5, [sp]
movs r0, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r0, [r6]
ldrb r1, [r0, 0x9]
lsls r0, r1, 1
@@ -1635,7 +1635,7 @@ _080F46A0:
str r0, [sp]
movs r0, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r0, [r6]
ldrb r1, [r0, 0x9]
lsls r0, r1, 1
asm/egg_hatch.s
-1812
View File
File diff suppressed because it is too large Load Diff
asm/evolution_scene.s
+9 -9
View File
@@ -257,7 +257,7 @@ EvolutionScene: @ 80CDDF4
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x1
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080CE0C0 @ =gMultiuseSpriteTemplate
mov r8, r0
ldr r1, _080CE0C4 @ =gDummySpriteAffineAnimTable
@@ -313,7 +313,7 @@ EvolutionScene: @ 80CDDF4
bl LoadCompressedPalette
mov r0, r10
movs r1, 0x3
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080CE0C4 @ =gDummySpriteAffineAnimTable
mov r1, r8
str r0, [r1, 0x10]
@@ -542,7 +542,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x3
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080CE2C0 @ =gMultiuseSpriteTemplate
ldr r1, _080CE2C4 @ =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
@@ -793,7 +793,7 @@ _080CE458: .4byte gMonSpritesGfxPtr
_080CE45C:
adds r0, r6, 0
movs r1, 0x1
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080CE4B4 @ =gMultiuseSpriteTemplate
ldr r1, _080CE4B8 @ =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
@@ -969,7 +969,7 @@ TradeEvolutionScene: @ 80CE540
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x1
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _080CE6CC @ =gMultiuseSpriteTemplate
ldr r1, _080CE6D0 @ =gDummySpriteAffineAnimTable
str r1, [r0, 0x10]
@@ -3567,7 +3567,7 @@ _080CFCAE:
movs r0, 0
movs r1, 0xA8
movs r2, 0xE0
bl sub_814FE40
bl LoadUserWindowBorderGfx
ldr r0, _080CFCF4 @ =gUnknown_826D1CC
movs r1, 0xA8
str r1, [sp]
@@ -3577,7 +3577,7 @@ _080CFCAE:
movs r1, 0x3
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
ldr r3, _080CFCF8 @ =gUnknown_2023E82
strb r4, [r3, 0x1]
ldr r0, _080CFCF0 @ =gTasks
@@ -3597,7 +3597,7 @@ _080CFCF0: .4byte gTasks
_080CFCF4: .4byte gUnknown_826D1CC
_080CFCF8: .4byte gUnknown_2023E82
_080CFCFC:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r4, r0, 24
cmp r4, 0
@@ -4388,7 +4388,7 @@ _080D03A0:
movs r0, 0x1
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _080D0428 @ =gUnknown_83F73A8
movs r0, 0x1
movs r2, 0
asm/field_effect.s
+30 -30
View File
@@ -1968,16 +1968,16 @@ _080842C2:
thumb_func_start sub_80842C8
sub_80842C8: @ 80842C8
push {lr}
ldr r0, _080842DC @ =c2_exit_to_overworld_2_switch
ldr r0, _080842DC @ =CB2_ReturnToField
bl SetMainCallback2
ldr r1, _080842E0 @ =gUnknown_3005020
ldr r1, _080842E0 @ =gFieldCallback
ldr r0, _080842E4 @ =mapldr_080842E8
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080842DC: .4byte c2_exit_to_overworld_2_switch
_080842E0: .4byte gUnknown_3005020
_080842DC: .4byte CB2_ReturnToField
_080842E0: .4byte gFieldCallback
_080842E4: .4byte mapldr_080842E8
thumb_func_end sub_80842C8
@@ -1990,14 +1990,14 @@ mapldr_080842E8: @ 80842E8
bl CreateTask
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _0808430C @ =gUnknown_3005020
ldr r1, _0808430C @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08084308: .4byte task00_8084310
_0808430C: .4byte gUnknown_3005020
_0808430C: .4byte gFieldCallback
thumb_func_end mapldr_080842E8
thumb_func_start task00_8084310
@@ -2042,7 +2042,7 @@ _08084350:
bl warp_in
ldr r0, _08084384 @ =sub_805671C
bl SetMainCallback2
ldr r1, _08084388 @ =gUnknown_3005020
ldr r1, _08084388 @ =gFieldCallback
ldr r0, _0808438C @ =mapldr_08084390
str r0, [r1]
adds r0, r5, 0
@@ -2055,7 +2055,7 @@ _08084376:
_0808437C: .4byte gTasks
_08084380: .4byte gFieldEffectArguments
_08084384: .4byte sub_805671C
_08084388: .4byte gUnknown_3005020
_08084388: .4byte gFieldCallback
_0808438C: .4byte mapldr_08084390
thumb_func_end task00_8084310
@@ -2093,7 +2093,7 @@ mapldr_08084390: @ 8084390
_080843D2:
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _080843F4 @ =gUnknown_3005020
ldr r1, _080843F4 @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r4}
@@ -2103,7 +2103,7 @@ _080843D2:
_080843E8: .4byte c3_080843F8
_080843EC: .4byte gMapObjects
_080843F0: .4byte gPlayerAvatar
_080843F4: .4byte gUnknown_3005020
_080843F4: .4byte gFieldCallback
thumb_func_end mapldr_08084390
thumb_func_start c3_080843F8
@@ -2162,14 +2162,14 @@ sub_8084454: @ 8084454
ldr r0, _0808447C @ =sub_8084484
movs r1, 0
bl CreateTask
ldr r1, _08084480 @ =gUnknown_3005020
ldr r1, _08084480 @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0808447C: .4byte sub_8084484
_08084480: .4byte gUnknown_3005020
_08084480: .4byte gFieldCallback
thumb_func_end sub_8084454
thumb_func_start sub_8084484
@@ -2861,7 +2861,7 @@ sub_80849A0: @ 80849A0
bne _080849DC
bl sub_809C460
bl warp_in
ldr r1, _080849E4 @ =gUnknown_3005020
ldr r1, _080849E4 @ =gFieldCallback
ldr r0, _080849E8 @ =sub_80849F4
str r0, [r1]
ldr r0, _080849EC @ =sub_805671C
@@ -2876,7 +2876,7 @@ _080849DC:
bx r0
.align 2, 0
_080849E0: .4byte gPaletteFade
_080849E4: .4byte gUnknown_3005020
_080849E4: .4byte gFieldCallback
_080849E8: .4byte sub_80849F4
_080849EC: .4byte sub_805671C
_080849F0: .4byte sub_80847C0
@@ -2893,14 +2893,14 @@ sub_80849F4: @ 80849F4
ldr r0, _08084A1C @ =sub_8084A24
movs r1, 0
bl CreateTask
ldr r1, _08084A20 @ =gUnknown_3005020
ldr r1, _08084A20 @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08084A1C: .4byte sub_8084A24
_08084A20: .4byte gUnknown_3005020
_08084A20: .4byte gFieldCallback
thumb_func_end sub_80849F4
thumb_func_start sub_8084A24
@@ -3884,7 +3884,7 @@ sub_8085168: @ 8085168
cmp r0, 0x1
bne _080851A0
bl warp_in
ldr r1, _080851AC @ =gUnknown_3005020
ldr r1, _080851AC @ =gFieldCallback
ldr r0, _080851B0 @ =mapldr_080851BC
str r0, [r1]
ldr r0, _080851B4 @ =sub_805671C
@@ -3900,7 +3900,7 @@ _080851A0:
bx r1
.align 2, 0
_080851A8: .4byte gPaletteFade
_080851AC: .4byte gUnknown_3005020
_080851AC: .4byte gFieldCallback
_080851B0: .4byte mapldr_080851BC
_080851B4: .4byte sub_805671C
_080851B8: .4byte sub_8084F44
@@ -3913,7 +3913,7 @@ mapldr_080851BC: @ 80851BC
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
ldr r0, _080851E0 @ =gUnknown_3005020
ldr r0, _080851E0 @ =gFieldCallback
movs r1, 0
str r1, [r0]
ldr r0, _080851E4 @ =sub_80851E8
@@ -3921,7 +3921,7 @@ mapldr_080851BC: @ 80851BC
pop {r0}
bx r0
.align 2, 0
_080851E0: .4byte gUnknown_3005020
_080851E0: .4byte gFieldCallback
_080851E4: .4byte sub_80851E8
thumb_func_end mapldr_080851BC
@@ -4389,7 +4389,7 @@ sub_808554C: @ 808554C
cmp r0, 0x1
bne _08085584
bl warp_in
ldr r1, _08085590 @ =gUnknown_3005020
ldr r1, _08085590 @ =gFieldCallback
ldr r0, _08085594 @ =sub_8084454
str r0, [r1]
ldr r0, _08085598 @ =sub_805671C
@@ -4405,7 +4405,7 @@ _08085584:
bx r1
.align 2, 0
_0808558C: .4byte gPaletteFade
_08085590: .4byte gUnknown_3005020
_08085590: .4byte gFieldCallback
_08085594: .4byte sub_8084454
_08085598: .4byte sub_805671C
_0808559C: .4byte sub_80853E4
@@ -4613,7 +4613,7 @@ _08085702:
bl FieldObjectSetDirection
bl sub_80555E0
bl warp_in
ldr r1, _0808575C @ =gUnknown_3005020
ldr r1, _0808575C @ =gFieldCallback
ldr r0, _08085760 @ =sub_80859D4
str r0, [r1]
ldr r0, _08085764 @ =sub_805671C
@@ -4629,7 +4629,7 @@ _08085750:
bx r0
.align 2, 0
_08085758: .4byte gPaletteFade
_0808575C: .4byte gUnknown_3005020
_0808575C: .4byte gFieldCallback
_08085760: .4byte sub_80859D4
_08085764: .4byte sub_805671C
_08085768: .4byte sub_808563C
@@ -4970,7 +4970,7 @@ sub_80859D4: @ 80859D4
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _08085A14 @ =gUnknown_3005020
ldr r1, _08085A14 @ =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r2, _08085A18 @ =gMapObjects
@@ -4990,7 +4990,7 @@ sub_80859D4: @ 80859D4
pop {r0}
bx r0
.align 2, 0
_08085A14: .4byte gUnknown_3005020
_08085A14: .4byte gFieldCallback
_08085A18: .4byte gMapObjects
_08085A1C: .4byte gPlayerAvatar
_08085A20: .4byte sub_8085A24
@@ -5409,7 +5409,7 @@ sub_8085D34: @ 8085D34
bl warp_in
ldr r0, _08085D78 @ =sub_805671C
bl SetMainCallback2
ldr r1, _08085D7C @ =gUnknown_3005020
ldr r1, _08085D7C @ =gFieldCallback
ldr r0, _08085D80 @ =mapldr_08085D88
str r0, [r1]
ldr r0, _08085D84 @ =sub_8085B78
@@ -5423,7 +5423,7 @@ _08085D70:
.align 2, 0
_08085D74: .4byte gPaletteFade
_08085D78: .4byte sub_805671C
_08085D7C: .4byte gUnknown_3005020
_08085D7C: .4byte gFieldCallback
_08085D80: .4byte mapldr_08085D88
_08085D84: .4byte sub_8085B78
thumb_func_end sub_8085D34
@@ -5436,7 +5436,7 @@ mapldr_08085D88: @ 8085D88
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _08085DCC @ =gUnknown_3005020
ldr r1, _08085DCC @ =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r2, _08085DD0 @ =gMapObjects
@@ -5457,7 +5457,7 @@ mapldr_08085D88: @ 8085D88
pop {r0}
bx r0
.align 2, 0
_08085DCC: .4byte gUnknown_3005020
_08085DCC: .4byte gFieldCallback
_08085DD0: .4byte gMapObjects
_08085DD4: .4byte gPlayerAvatar
_08085DD8: .4byte sub_8085DDC
asm/field_fadetransition.s
+21 -21
View File
@@ -273,8 +273,8 @@ _0807DD1C:
bx r0
thumb_func_end task0A_asap_script_env_2_enable_and_set_ctx_running
thumb_func_start sub_807DD24
sub_807DD24: @ 807DD24
thumb_func_start FieldCallback_ReturnToEventScript2
FieldCallback_ReturnToEventScript2: @ 807DD24
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
@@ -286,7 +286,7 @@ sub_807DD24: @ 807DD24
bx r0
.align 2, 0
_0807DD40: .4byte task0A_asap_script_env_2_enable_and_set_ctx_running
thumb_func_end sub_807DD24
thumb_func_end FieldCallback_ReturnToEventScript2
thumb_func_start sub_807DD44
sub_807DD44: @ 807DD44
@@ -1162,7 +1162,7 @@ DoWarp: @ 807E438
bl PlayRainStoppingSoundEffect
movs r0, 0x9
bl PlaySE
ldr r0, _0807E464 @ =gUnknown_3005020
ldr r0, _0807E464 @ =gFieldCallback
ldr r1, _0807E468 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E46C @ =sub_807E718
@@ -1171,7 +1171,7 @@ DoWarp: @ 807E438
pop {r0}
bx r0
.align 2, 0
_0807E464: .4byte gUnknown_3005020
_0807E464: .4byte gFieldCallback
_0807E468: .4byte sub_807DF64
_0807E46C: .4byte sub_807E718
thumb_func_end DoWarp
@@ -1183,7 +1183,7 @@ DoDiveWarp: @ 807E470
bl sub_8055F88
bl sub_807DC18
bl PlayRainStoppingSoundEffect
ldr r0, _0807E494 @ =gUnknown_3005020
ldr r0, _0807E494 @ =gFieldCallback
ldr r1, _0807E498 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E49C @ =sub_807E718
@@ -1192,7 +1192,7 @@ DoDiveWarp: @ 807E470
pop {r0}
bx r0
.align 2, 0
_0807E494: .4byte gUnknown_3005020
_0807E494: .4byte gFieldCallback
_0807E498: .4byte sub_807DF64
_0807E49C: .4byte sub_807E718
thumb_func_end DoDiveWarp
@@ -1232,7 +1232,7 @@ _0807E4D8: .4byte gTasks
DoDoorWarp: @ 807E4DC
push {lr}
bl ScriptContext2_Enable
ldr r0, _0807E4F4 @ =gUnknown_3005020
ldr r0, _0807E4F4 @ =gFieldCallback
ldr r1, _0807E4F8 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E4FC @ =sub_807E80C
@@ -1241,7 +1241,7 @@ DoDoorWarp: @ 807E4DC
pop {r0}
bx r0
.align 2, 0
_0807E4F4: .4byte gUnknown_3005020
_0807E4F4: .4byte gFieldCallback
_0807E4F8: .4byte sub_807DF64
_0807E4FC: .4byte sub_807E80C
thumb_func_end DoDoorWarp
@@ -1253,14 +1253,14 @@ sub_807E500: @ 807E500
ldr r0, _0807E518 @ =sub_807E718
movs r1, 0xA
bl CreateTask
ldr r1, _0807E51C @ =gUnknown_3005020
ldr r1, _0807E51C @ =gFieldCallback
ldr r0, _0807E520 @ =sub_807DF94
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0807E518: .4byte sub_807E718
_0807E51C: .4byte gUnknown_3005020
_0807E51C: .4byte gFieldCallback
_0807E520: .4byte sub_807DF94
thumb_func_end sub_807E500
@@ -1268,7 +1268,7 @@ _0807E520: .4byte sub_807DF94
sub_807E524: @ 807E524
push {lr}
bl ScriptContext2_Enable
ldr r0, _0807E53C @ =gUnknown_3005020
ldr r0, _0807E53C @ =gFieldCallback
ldr r1, _0807E540 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E544 @ =sub_807E784
@@ -1277,7 +1277,7 @@ sub_807E524: @ 807E524
pop {r0}
bx r0
.align 2, 0
_0807E53C: .4byte gUnknown_3005020
_0807E53C: .4byte gFieldCallback
_0807E540: .4byte sub_807DF64
_0807E544: .4byte sub_807E784
thumb_func_end sub_807E524
@@ -1286,13 +1286,13 @@ _0807E544: .4byte sub_807E784
DoFallWarp: @ 807E548
push {lr}
bl DoDiveWarp
ldr r1, _0807E558 @ =gUnknown_3005020
ldr r1, _0807E558 @ =gFieldCallback
ldr r0, _0807E55C @ =sub_8084454
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0807E558: .4byte gUnknown_3005020
_0807E558: .4byte gFieldCallback
_0807E55C: .4byte sub_8084454
thumb_func_end DoFallWarp
@@ -1339,14 +1339,14 @@ sub_807E59C: @ 807E59C
ldr r0, _0807E5B8 @ =sub_807E784
movs r1, 0xA
bl CreateTask
ldr r1, _0807E5BC @ =gUnknown_3005020
ldr r1, _0807E5BC @ =gFieldCallback
ldr r0, _0807E5C0 @ =sub_807DF94
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0807E5B8: .4byte sub_807E784
_0807E5BC: .4byte gUnknown_3005020
_0807E5BC: .4byte gFieldCallback
_0807E5C0: .4byte sub_807DF94
thumb_func_end sub_807E59C
@@ -1358,14 +1358,14 @@ sub_807E5C4: @ 807E5C4
ldr r0, _0807E5E0 @ =sub_807E718
movs r1, 0xA
bl CreateTask
ldr r1, _0807E5E4 @ =gUnknown_3005020
ldr r1, _0807E5E4 @ =gFieldCallback
ldr r0, _0807E5E8 @ =nullsub_60
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0807E5E0: .4byte sub_807E718
_0807E5E4: .4byte gUnknown_3005020
_0807E5E4: .4byte gFieldCallback
_0807E5E8: .4byte nullsub_60
thumb_func_end sub_807E5C4
@@ -1954,7 +1954,7 @@ _0807EA92:
strh r0, [r5]
b _0807EAB0
_0807EA9A:
ldr r0, _0807EAB8 @ =gUnknown_3005020
ldr r0, _0807EAB8 @ =gFieldCallback
ldr r1, _0807EABC @ =sub_807DF64
str r1, [r0]
bl warp_in
@@ -1968,7 +1968,7 @@ _0807EAB0:
pop {r0}
bx r0
.align 2, 0
_0807EAB8: .4byte gUnknown_3005020
_0807EAB8: .4byte gFieldCallback
_0807EABC: .4byte sub_807DF64
_0807EAC0: .4byte sub_805671C
thumb_func_end sub_807E980
asm/hof_pc.s
+4 -4
View File
@@ -57,16 +57,16 @@ _080CA59C: .4byte sub_80CA53C
thumb_func_start sub_80CA5A0
sub_80CA5A0: @ 80CA5A0
push {lr}
ldr r0, _080CA5B4 @ =c2_exit_to_overworld_2_switch
ldr r0, _080CA5B4 @ =CB2_ReturnToField
bl SetMainCallback2
ldr r1, _080CA5B8 @ =gUnknown_3005020
ldr r1, _080CA5B8 @ =gFieldCallback
ldr r0, _080CA5BC @ =sub_80CA5C0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080CA5B4: .4byte c2_exit_to_overworld_2_switch
_080CA5B8: .4byte gUnknown_3005020
_080CA5B4: .4byte CB2_ReturnToField
_080CA5B8: .4byte gFieldCallback
_080CA5BC: .4byte sub_80CA5C0
thumb_func_end sub_80CA5A0
asm/item_menu.s
+2 -2
View File
@@ -5060,14 +5060,14 @@ _0810A678: .4byte sub_810A67C
thumb_func_start sub_810A67C
sub_810A67C: @ 810A67C
push {lr}
ldr r2, _0810A68C @ =c2_exit_to_overworld_2_switch
ldr r2, _0810A68C @ =CB2_ReturnToField
movs r0, 0x2
movs r1, 0x3
bl sub_8107DB4
pop {r0}
bx r0
.align 2, 0
_0810A68C: .4byte c2_exit_to_overworld_2_switch
_0810A68C: .4byte CB2_ReturnToField
thumb_func_end sub_810A67C
thumb_func_start sub_810A690
asm/item_use.s
+17 -17
View File
@@ -83,7 +83,7 @@ sub_80A103C: @ 80A103C
ldrsh r0, [r0, r1]
cmp r0, 0x1
beq _080A1070
ldr r1, _080A1068 @ =gUnknown_3005020
ldr r1, _080A1068 @ =gFieldCallback
ldr r0, _080A106C @ =sub_80A1084
str r0, [r1]
adds r0, r2, 0
@@ -91,7 +91,7 @@ sub_80A103C: @ 80A103C
b _080A107A
.align 2, 0
_080A1064: .4byte gTasks
_080A1068: .4byte gUnknown_3005020
_080A1068: .4byte gFieldCallback
_080A106C: .4byte sub_80A1084
_080A1070:
ldr r0, _080A1080 @ =gUnknown_2039998
@@ -1066,9 +1066,9 @@ sub_80A17E8: @ 80A17E8
ands r0, r1
cmp r0, 0
bne _080A1812
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
bl sub_80A1184
ldr r1, _080A181C @ =c2_exit_to_overworld_2_switch
ldr r1, _080A181C @ =CB2_ReturnToField
movs r0, 0
movs r2, 0x1
bl InitTMCase
@@ -1080,7 +1080,7 @@ _080A1812:
bx r0
.align 2, 0
_080A1818: .4byte gPaletteFade
_080A181C: .4byte c2_exit_to_overworld_2_switch
_080A181C: .4byte CB2_ReturnToField
thumb_func_end sub_80A17E8
thumb_func_start sub_80A1820
@@ -1144,9 +1144,9 @@ sub_80A1880: @ 80A1880
ands r0, r1
cmp r0, 0
bne _080A18AA
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
bl sub_80A1184
ldr r1, _080A18B4 @ =c2_exit_to_overworld_2_switch
ldr r1, _080A18B4 @ =CB2_ReturnToField
movs r0, 0
movs r2, 0x1
bl sub_813CD50
@@ -1158,7 +1158,7 @@ _080A18AA:
bx r0
.align 2, 0
_080A18B0: .4byte gPaletteFade
_080A18B4: .4byte c2_exit_to_overworld_2_switch
_080A18B4: .4byte CB2_ReturnToField
thumb_func_end sub_80A1880
thumb_func_start sub_80A18B8
@@ -1259,9 +1259,9 @@ sub_80A1960: @ 80A1960
ands r0, r1
cmp r0, 0
bne _080A1988
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
bl sub_80A1184
ldr r1, _080A1994 @ =c2_exit_to_overworld_2_switch
ldr r1, _080A1994 @ =CB2_ReturnToField
movs r0, 0
bl sub_815ABC4
adds r0, r4, 0
@@ -1272,7 +1272,7 @@ _080A1988:
bx r0
.align 2, 0
_080A1990: .4byte gPaletteFade
_080A1994: .4byte c2_exit_to_overworld_2_switch
_080A1994: .4byte CB2_ReturnToField
thumb_func_end sub_80A1960
thumb_func_start sub_80A1998
@@ -1666,9 +1666,9 @@ sub_80A1CC0: @ 80A1CC0
ands r0, r1
cmp r0, 0
bne _080A1CE8
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
bl sub_80A1184
ldr r1, _080A1CF4 @ =c2_exit_to_overworld_2_switch
ldr r1, _080A1CF4 @ =CB2_ReturnToField
movs r0, 0
bl sub_80BFF50
adds r0, r4, 0
@@ -1679,7 +1679,7 @@ _080A1CE8:
bx r0
.align 2, 0
_080A1CF0: .4byte gPaletteFade
_080A1CF4: .4byte c2_exit_to_overworld_2_switch
_080A1CF4: .4byte CB2_ReturnToField
thumb_func_end sub_80A1CC0
thumb_func_start sub_80A1CF8
@@ -1749,9 +1749,9 @@ sub_80A1D68: @ 80A1D68
ands r0, r1
cmp r0, 0
bne _080A1D8E
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
bl sub_80A1184
ldr r0, _080A1D98 @ =c2_exit_to_overworld_2_switch
ldr r0, _080A1D98 @ =CB2_ReturnToField
bl UseFameChecker
adds r0, r4, 0
bl DestroyTask
@@ -1761,7 +1761,7 @@ _080A1D8E:
bx r0
.align 2, 0
_080A1D94: .4byte gPaletteFade
_080A1D98: .4byte c2_exit_to_overworld_2_switch
_080A1D98: .4byte CB2_ReturnToField
thumb_func_end sub_80A1D68
thumb_func_start sub_80A1D9C
asm/learn_move.s
+12 -12
View File
@@ -50,8 +50,8 @@ sub_80E4660: @ 80E4660
bne _080E4684
ldr r0, _080E4690 @ =sub_80E478C
bl SetMainCallback2
ldr r1, _080E4694 @ =gUnknown_3005020
ldr r0, _080E4698 @ =sub_807DD24
ldr r1, _080E4694 @ =gFieldCallback
ldr r0, _080E4698 @ =FieldCallback_ReturnToEventScript2
str r0, [r1]
adds r0, r4, 0
bl DestroyTask
@@ -62,8 +62,8 @@ _080E4684:
.align 2, 0
_080E468C: .4byte gPaletteFade
_080E4690: .4byte sub_80E478C
_080E4694: .4byte gUnknown_3005020
_080E4698: .4byte sub_807DD24
_080E4694: .4byte gFieldCallback
_080E4698: .4byte FieldCallback_ReturnToEventScript2
thumb_func_end sub_80E4660
thumb_func_start sub_80E469C
@@ -133,7 +133,7 @@ _080E46C6:
movs r0, 0x1
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _080E4788 @ =gUnknown_8E97EC4
movs r0, 0x1
movs r2, 0
@@ -454,7 +454,7 @@ _080E4A3E:
movs r1, 0x3
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
ldr r0, _080E4A64 @ =gUnknown_203AAB4
ldr r1, [r0]
ldrb r0, [r1]
@@ -540,7 +540,7 @@ _080E4AF4:
movs r1, 0x3
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
ldr r0, _080E4B1C @ =gUnknown_203AAB4
ldr r1, [r0]
ldrb r0, [r1]
@@ -601,7 +601,7 @@ _080E4B70:
movs r1, 0x3
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
ldr r0, _080E4B94 @ =gUnknown_203AAB4
ldr r1, [r0]
movs r0, 0x12
@@ -665,7 +665,7 @@ _080E4BF4:
movs r1, 0x3
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
ldr r0, _080E4C18 @ =gUnknown_203AAB4
ldr r1, [r0]
movs r0, 0x1A
@@ -810,13 +810,13 @@ _080E4D26:
ldr r0, _080E4D40 @ =gUnknown_203AAB4
ldr r0, [r0]
bl Free
ldr r0, _080E4D44 @ =c2_exit_to_overworld_2_switch
ldr r0, _080E4D44 @ =CB2_ReturnToField
bl SetMainCallback2
b _080E4EDA
.align 2, 0
_080E4D3C: .4byte gPaletteFade
_080E4D40: .4byte gUnknown_203AAB4
_080E4D44: .4byte c2_exit_to_overworld_2_switch
_080E4D44: .4byte CB2_ReturnToField
_080E4D48:
movs r0, 0x1
negs r0, r0
@@ -1814,7 +1814,7 @@ _080E5570: .4byte 0x00000a67
thumb_func_start sub_80E5574
sub_80E5574: @ 80E5574
push {r4,lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
asm/link.s
+1 -1
View File
@@ -3360,7 +3360,7 @@ sub_800AE1C: @ 800AE1C
movs r0, 0x1
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _0800AEBC @ =gWirelessLinkDisplayBin
movs r0, 0x1
movs r2, 0
asm/link_rfu.s
+6 -6
View File
@@ -4359,7 +4359,7 @@ _080FF4A2:
thumb_func_start sub_80FF4A8
sub_80FF4A8: @ 80FF4A8
push {lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -4400,7 +4400,7 @@ _080FF4EA:
thumb_func_start sub_80FF4F0
sub_80FF4F0: @ 80FF4F0
push {r4,lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -4446,7 +4446,7 @@ _080FF53E:
thumb_func_start sub_80FF544
sub_80FF544: @ 80FF544
push {lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -6079,7 +6079,7 @@ _08100038:
movs r0, 0x3
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _08100068 @ =gUnknown_8E99E74
movs r0, 0x3
movs r2, 0
@@ -6106,7 +6106,7 @@ _0810006C:
movs r0, 0x1
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
movs r0, 0x1
bl CopyBgTilemapBufferToVram
b _08100104
@@ -7964,7 +7964,7 @@ sub_8100F18: @ 8100F18
movs r1, 0x1
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
add sp, 0xC
pop {r0}
bx r0
asm/link_rfu_3.s
+22 -22
View File
@@ -3088,7 +3088,7 @@ _08117210:
movs r0, 0x6
strb r0, [r1, 0x1]
ldr r1, _08117274 @ =gMain
ldr r0, _08117278 @ =c2_exit_to_overworld_2_switch
ldr r0, _08117278 @ =CB2_ReturnToField
str r0, [r1, 0x8]
ldr r0, _0811727C @ =sub_8050138
bl SetMainCallback2
@@ -3107,7 +3107,7 @@ _08117268: .4byte gUnknown_2031CCC
_0811726C: .4byte gBlockRecvBuffer
_08117270: .4byte gUnknown_2031DA4
_08117274: .4byte gMain
_08117278: .4byte c2_exit_to_overworld_2_switch
_08117278: .4byte CB2_ReturnToField
_0811727C: .4byte sub_8050138
thumb_func_end sub_8117130
@@ -3251,7 +3251,7 @@ _08117384:
eors r0, r1
lsls r0, 24
lsrs r0, 24
ldr r1, _081173BC @ =c2_exit_to_overworld_2_switch
ldr r1, _081173BC @ =CB2_ReturnToField
bl sub_808B700
_081173A2:
bl RunTasks
@@ -3263,7 +3263,7 @@ _081173A2:
bx r0
.align 2, 0
_081173B8: .4byte sub_8117280
_081173BC: .4byte c2_exit_to_overworld_2_switch
_081173BC: .4byte CB2_ReturnToField
thumb_func_end sub_8117354
thumb_func_start sub_81173C0
@@ -3645,7 +3645,7 @@ _08117640:
.4byte _081178E0
.4byte _08117784
_08117784:
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r1, _08117798 @ =gMain
ldr r0, _0811779C @ =sub_811C1C8
str r0, [r1, 0x8]
@@ -3656,7 +3656,7 @@ _08117784:
_08117798: .4byte gMain
_0811779C: .4byte sub_811C1C8
_081177A0:
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _081177C4 @ =gBlockSendBuffer
movs r1, 0x1
bl sub_8117594
@@ -3672,7 +3672,7 @@ _081177A0:
.align 2, 0
_081177C4: .4byte gBlockSendBuffer
_081177C8:
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
bl sp000_heal_pokemon
bl SavePlayerParty
bl LoadPlayerBag
@@ -3688,7 +3688,7 @@ _081177C8:
.align 2, 0
_081177EC: .4byte gBlockSendBuffer
_081177F0:
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
bl sp000_heal_pokemon
bl SavePlayerParty
bl LoadPlayerBag
@@ -3706,7 +3706,7 @@ _08117818:
ldr r0, _0811783C @ =gBlockSendBuffer
movs r1, 0x1
bl sub_8117594
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
movs r0, 0x3
str r0, [sp]
movs r0, 0
@@ -7001,19 +7001,19 @@ _08119512:
ldr r1, _0811952C @ =gUnknown_203B06C
movs r0, 0x1
strh r0, [r1]
ldr r1, _08119530 @ =gUnknown_3005020
ldr r1, _08119530 @ =gFieldCallback
ldr r0, _08119534 @ =sub_807DCE4
str r0, [r1]
ldr r1, _08119538 @ =c2_exit_to_overworld_2_switch
ldr r1, _08119538 @ =CB2_ReturnToField
movs r0, 0x8
bl sub_81277F4
b _081198DC
.align 2, 0
_08119528: .4byte gPaletteFade
_0811952C: .4byte gUnknown_203B06C
_08119530: .4byte gUnknown_3005020
_08119530: .4byte gFieldCallback
_08119534: .4byte sub_807DCE4
_08119538: .4byte c2_exit_to_overworld_2_switch
_08119538: .4byte CB2_ReturnToField
_0811953C:
adds r0, r6, 0
adds r0, 0x16
@@ -7354,10 +7354,10 @@ _081197CA:
lsls r0, 22
lsrs r0, 22
strh r0, [r2]
ldr r1, _08119834 @ =gUnknown_3005020
ldr r1, _08119834 @ =gFieldCallback
ldr r0, _08119838 @ =sub_807DCE4
str r0, [r1]
ldr r1, _0811983C @ =c2_exit_to_overworld_2_switch
ldr r1, _0811983C @ =CB2_ReturnToField
movs r0, 0x9
bl sub_81277F4
adds r0, r6, 0
@@ -7371,9 +7371,9 @@ _08119824: .4byte gUnknown_203B06C
_08119828: .4byte gUnknown_203B064
_0811982C: .4byte gUnknown_203B06A
_08119830: .4byte gUnknown_203B068
_08119834: .4byte gUnknown_3005020
_08119834: .4byte gFieldCallback
_08119838: .4byte sub_807DCE4
_0811983C: .4byte c2_exit_to_overworld_2_switch
_0811983C: .4byte CB2_ReturnToField
_08119840:
ldr r1, _08119890 @ =gUnknown_203B058
movs r0, 0x44
@@ -8593,7 +8593,7 @@ _0811A174:
negs r0, r0
b _0811A1A4
_0811A186:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
movs r2, 0x80
@@ -13151,13 +13151,13 @@ _0811C4C0:
bl sub_811C150
cmp r0, 0
beq _0811C516
ldr r0, _0811C4E0 @ =c2_exit_to_overworld_2_switch
ldr r0, _0811C4E0 @ =CB2_ReturnToField
bl SetMainCallback2
b _0811C516
.align 2, 0
_0811C4D8: .4byte gUnknown_203B08C
_0811C4DC: .4byte gUnknown_841E58D
_0811C4E0: .4byte c2_exit_to_overworld_2_switch
_0811C4E0: .4byte CB2_ReturnToField
_0811C4E4:
ldr r0, _0811C4FC @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
@@ -13181,7 +13181,7 @@ _0811C500:
bl sub_811C150
cmp r0, 0
beq _0811C516
ldr r0, _0811C53C @ =c2_exit_to_overworld_2_switch
ldr r0, _0811C53C @ =CB2_ReturnToField
bl SetMainCallback2
_0811C516:
bl RunTasks
@@ -13197,7 +13197,7 @@ _0811C52A:
.align 2, 0
_0811C534: .4byte gUnknown_203B08C
_0811C538: .4byte gUnknown_841E572
_0811C53C: .4byte c2_exit_to_overworld_2_switch
_0811C53C: .4byte CB2_ReturnToField
thumb_func_end sub_811C1C8
.align 2, 0 @ Don't pad with nop.
asm/menu.s
+7 -7
View File
@@ -2272,8 +2272,8 @@ sub_810FF04: @ 810FF04
bx r1
thumb_func_end sub_810FF04
thumb_func_start sub_810FF60
sub_810FF60: @ 810FF60
thumb_func_start CreateYesNoMenu
CreateYesNoMenu: @ 810FF60
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2422,7 +2422,7 @@ sub_810FF60: @ 810FF60
.align 2, 0
_0811009C: .4byte gUnknown_203ADF3
_081100A0: .4byte gUnknown_841623D
thumb_func_end sub_810FF60
thumb_func_end CreateYesNoMenu
thumb_func_start sub_81100A4
sub_81100A4: @ 81100A4
@@ -2439,14 +2439,14 @@ sub_81100A4: @ 81100A4
movs r2, 0
str r2, [sp, 0x8]
movs r3, 0
bl sub_810FF60
bl CreateYesNoMenu
add sp, 0xC
pop {r0}
bx r0
thumb_func_end sub_81100A4
thumb_func_start ProcessMenuInputNoWrap_
ProcessMenuInputNoWrap_: @ 81100C8
thumb_func_start Menu_ProcessInputNoWrapClearOnChoose
Menu_ProcessInputNoWrapClearOnChoose: @ 81100C8
push {r4,lr}
bl ProcessMenuInputNoWrapAround
lsls r0, 24
@@ -2461,7 +2461,7 @@ _081100DE:
pop {r4}
pop {r1}
bx r1
thumb_func_end ProcessMenuInputNoWrap_
thumb_func_end Menu_ProcessInputNoWrapClearOnChoose
thumb_func_start sub_81100E8
sub_81100E8: @ 81100E8
asm/menu_helpers.s
+2 -2
View File
@@ -129,7 +129,7 @@ sub_80BF560: @ 80BF560
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -210,7 +210,7 @@ CreateYesNoMenuWithCallbacks: @ 80BF5D0
str r5, [sp, 0x4]
movs r4, 0
str r4, [sp, 0x8]
bl sub_810FF60
bl CreateYesNoMenu
ldr r0, _080BF624 @ =gUnknown_20399C8
str r7, [r0]
ldr r1, _080BF628 @ =gTasks
asm/new_menu_helpers.s
+5 -5
View File
@@ -272,8 +272,8 @@ _080F695E:
bx r1
thumb_func_end sub_80F68F0
thumb_func_start sub_80F696C
sub_80F696C: @ 80F696C
thumb_func_start DecompressAndLoadBgGfxUsingHeap
DecompressAndLoadBgGfxUsingHeap: @ 80F696C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -333,7 +333,7 @@ _080F69D2:
.align 2, 0
_080F69E0: .4byte task_free_buf_after_copying_tile_data_to_vram
_080F69E4: .4byte gTasks
thumb_func_end sub_80F696C
thumb_func_end DecompressAndLoadBgGfxUsingHeap
thumb_func_start sub_80F69E8
sub_80F69E8: @ 80F69E8
@@ -2156,7 +2156,7 @@ sub_80F7858: @ 80F7858
movs r1, 0x2
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
add sp, 0xC
pop {r0}
bx r0
@@ -2179,7 +2179,7 @@ sub_80F7880: @ 80F7880
movs r1, 0x2
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
add sp, 0xC
pop {r0}
bx r0
asm/option_menu.s
+2 -2
View File
@@ -967,7 +967,7 @@ sub_8088B00: @ 8088B00
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r1, _08088BBC @ =gUnknown_3005020
ldr r1, _08088BBC @ =gFieldCallback
ldr r0, _08088BC0 @ =sub_807DF64
str r0, [r1]
ldr r0, _08088BC4 @ =gMain
@@ -1050,7 +1050,7 @@ sub_8088B00: @ 8088B00
pop {r0}
bx r0
.align 2, 0
_08088BBC: .4byte gUnknown_3005020
_08088BBC: .4byte gFieldCallback
_08088BC0: .4byte sub_807DF64
_08088BC4: .4byte gMain
_08088BC8: .4byte gSaveBlock2Ptr
asm/overworld.s
+43 -43
View File
@@ -3022,8 +3022,8 @@ sav1_saved_warp2_map_get_name: @ 8056238
_0805625C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_saved_warp2_map_get_name
thumb_func_start sav1_map_get_name
sav1_map_get_name: @ 8056260
thumb_func_start GetCurrentRegionMapSectionId
GetCurrentRegionMapSectionId: @ 8056260
push {lr}
ldr r0, _08056284 @ =gSaveBlock1Ptr
ldr r1, [r0]
@@ -3042,7 +3042,7 @@ sav1_map_get_name: @ 8056260
bx r1
.align 2, 0
_08056284: .4byte gSaveBlock1Ptr
thumb_func_end sav1_map_get_name
thumb_func_end GetCurrentRegionMapSectionId
thumb_func_start sav1_map_get_battletype
sav1_map_get_battletype: @ 8056288
@@ -3196,8 +3196,8 @@ _080563E8: .4byte gUnknown_3005014
_080563EC: .4byte gUnknown_300501C
thumb_func_end sub_8056354
thumb_func_start sub_80563F0
sub_80563F0: @ 80563F0
thumb_func_start CleanupOverworldWindowsAndTilemaps
CleanupOverworldWindowsAndTilemaps: @ 80563F0
push {lr}
bl sub_80F6C8C
ldr r0, _08056414 @ =gUnknown_300501C
@@ -3215,7 +3215,7 @@ sub_80563F0: @ 80563F0
_08056414: .4byte gUnknown_300501C
_08056418: .4byte gUnknown_3005014
_0805641C: .4byte gUnknown_3005018
thumb_func_end sub_80563F0
thumb_func_end CleanupOverworldWindowsAndTilemaps
thumb_func_start sub_8056420
sub_8056420: @ 8056420
@@ -3457,24 +3457,24 @@ _08056604: .4byte gFieldCallback2
_08056608:
movs r1, 0
str r1, [r4]
ldr r0, _08056614 @ =gUnknown_3005020
ldr r0, _08056614 @ =gFieldCallback
str r1, [r0]
b _08056636
.align 2, 0
_08056614: .4byte gUnknown_3005020
_08056614: .4byte gFieldCallback
_08056618:
ldr r0, _08056628 @ =gUnknown_3005020
ldr r0, _08056628 @ =gFieldCallback
ldr r0, [r0]
cmp r0, 0
beq _0805662C
bl _call_via_r0
b _08056630
.align 2, 0
_08056628: .4byte gUnknown_3005020
_08056628: .4byte gFieldCallback
_0805662C:
bl sub_807DF64
_08056630:
ldr r1, _08056640 @ =gUnknown_3005020
ldr r1, _08056640 @ =gFieldCallback
movs r0, 0
str r0, [r1]
_08056636:
@@ -3484,7 +3484,7 @@ _08056638:
pop {r1}
bx r1
.align 2, 0
_08056640: .4byte gUnknown_3005020
_08056640: .4byte gFieldCallback
thumb_func_end map_post_load_hook_exec
thumb_func_start CB2_NewGame
@@ -3498,7 +3498,7 @@ CB2_NewGame: @ 8056644
bl PlayTimeCounter_Start
bl ScriptContext1_Init
bl ScriptContext2_Disable
ldr r1, _0805668C @ =gUnknown_3005020
ldr r1, _0805668C @ =gFieldCallback
ldr r0, _08056690 @ =sub_807DF7C
str r0, [r1]
ldr r1, _08056694 @ =gFieldCallback2
@@ -3514,7 +3514,7 @@ CB2_NewGame: @ 8056644
pop {r0}
bx r0
.align 2, 0
_0805668C: .4byte gUnknown_3005020
_0805668C: .4byte gFieldCallback
_08056690: .4byte sub_807DF7C
_08056694: .4byte gFieldCallback2
_08056698: .4byte gMain + 0x438
@@ -3545,7 +3545,7 @@ c2_whiteout: @ 80566A4
bl sub_80559F8
bl ScriptContext1_Init
bl ScriptContext2_Disable
ldr r1, _0805670C @ =gUnknown_3005020
ldr r1, _0805670C @ =gFieldCallback
ldr r0, _08056710 @ =sub_807F5F0
str r0, [r1]
mov r1, sp
@@ -3565,7 +3565,7 @@ _08056702:
bx r0
.align 2, 0
_08056708: .4byte gMain
_0805670C: .4byte gUnknown_3005020
_0805670C: .4byte gFieldCallback
_08056710: .4byte sub_807F5F0
_08056714: .4byte sub_8056534
_08056718: .4byte sub_80565B4
@@ -3624,7 +3624,7 @@ _08056784: .4byte sub_80565B4
sub_8056788: @ 8056788
push {lr}
bl sub_80569BC
ldr r0, _080567A0 @ =gUnknown_3005020
ldr r0, _080567A0 @ =gFieldCallback
ldr r1, _080567A4 @ =sub_807DE58
str r1, [r0]
ldr r0, _080567A8 @ =c2_80567AC
@@ -3632,7 +3632,7 @@ sub_8056788: @ 8056788
pop {r0}
bx r0
.align 2, 0
_080567A0: .4byte gUnknown_3005020
_080567A0: .4byte gFieldCallback
_080567A4: .4byte sub_807DE58
_080567A8: .4byte c2_80567AC
thumb_func_end sub_8056788
@@ -3659,8 +3659,8 @@ _080567D4: .4byte c1_link_related
_080567D8: .4byte sub_80565B4
thumb_func_end c2_80567AC
thumb_func_start c2_exit_to_overworld_2_switch
c2_exit_to_overworld_2_switch: @ 80567DC
thumb_func_start CB2_ReturnToField
CB2_ReturnToField: @ 80567DC
push {lr}
bl is_c1_link_related_active
cmp r0, 0x1
@@ -3679,7 +3679,7 @@ _080567FE:
bx r0
.align 2, 0
_08056804: .4byte c2_exit_to_overworld_2_local
thumb_func_end c2_exit_to_overworld_2_switch
thumb_func_end CB2_ReturnToField
thumb_func_start c2_exit_to_overworld_2_local
c2_exit_to_overworld_2_local: @ 8056808
@@ -3731,26 +3731,26 @@ c2_8056854: @ 8056854
ldrb r0, [r0]
cmp r0, 0
beq _08056888
ldr r1, _08056880 @ =gUnknown_3005020
ldr r1, _08056880 @ =gFieldCallback
ldr r0, _08056884 @ =sub_807DE58
b _0805688C
.align 2, 0
_08056878: .4byte c1_link_related
_0805687C: .4byte gWirelessCommType
_08056880: .4byte gUnknown_3005020
_08056880: .4byte gFieldCallback
_08056884: .4byte sub_807DE58
_08056888:
ldr r1, _080568A0 @ =gUnknown_3005020
ldr r1, _080568A0 @ =gFieldCallback
ldr r0, _080568A4 @ =sub_807DDD0
_0805688C:
str r0, [r1]
bl ScriptContext1_Init
bl ScriptContext2_Disable
bl c2_exit_to_overworld_2_switch
bl CB2_ReturnToField
pop {r0}
bx r0
.align 2, 0
_080568A0: .4byte gUnknown_3005020
_080568A0: .4byte gFieldCallback
_080568A4: .4byte sub_807DDD0
thumb_func_end c2_8056854
@@ -3761,7 +3761,7 @@ sub_80568A8: @ 80568A8
ldr r1, _080568BC @ =gFieldCallback2
ldr r0, _080568C0 @ =sub_807E3BC
str r0, [r1]
bl c2_exit_to_overworld_2_switch
bl CB2_ReturnToField
pop {r0}
bx r0
.align 2, 0
@@ -3773,14 +3773,14 @@ _080568C0: .4byte sub_807E3BC
sub_80568C4: @ 80568C4
push {lr}
bl sub_80569BC
ldr r1, _080568D8 @ =gUnknown_3005020
ldr r1, _080568D8 @ =gFieldCallback
ldr r0, _080568DC @ =sub_807DD44
str r0, [r1]
bl c2_exit_to_overworld_2_switch
bl CB2_ReturnToField
pop {r0}
bx r0
.align 2, 0
_080568D8: .4byte gUnknown_3005020
_080568D8: .4byte gFieldCallback
_080568DC: .4byte sub_807DD44
thumb_func_end sub_80568C4
@@ -3788,29 +3788,29 @@ _080568DC: .4byte sub_807DD44
c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80568E0
push {lr}
bl sub_80569BC
ldr r1, _080568F4 @ =gUnknown_3005020
ldr r0, _080568F8 @ =sub_807DD24
ldr r1, _080568F4 @ =gFieldCallback
ldr r0, _080568F8 @ =FieldCallback_ReturnToEventScript2
str r0, [r1]
bl c2_exit_to_overworld_2_switch
bl CB2_ReturnToField
pop {r0}
bx r0
.align 2, 0
_080568F4: .4byte gUnknown_3005020
_080568F8: .4byte sub_807DD24
_080568F4: .4byte gFieldCallback
_080568F8: .4byte FieldCallback_ReturnToEventScript2
thumb_func_end c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_start sub_80568FC
sub_80568FC: @ 80568FC
push {lr}
bl sub_80569BC
ldr r1, _08056910 @ =gUnknown_3005020
ldr r1, _08056910 @ =gFieldCallback
ldr r0, _08056914 @ =sub_807DF7C
str r0, [r1]
bl c2_exit_to_overworld_2_switch
bl CB2_ReturnToField
pop {r0}
bx r0
.align 2, 0
_08056910: .4byte gUnknown_3005020
_08056910: .4byte gFieldCallback
_08056914: .4byte sub_807DF7C
thumb_func_end sub_80568FC
@@ -3867,17 +3867,17 @@ _08056990: .4byte gFieldCallback2
_08056994: .4byte gUnknown_2031DE0
_08056998: .4byte sub_805671C
_0805699C:
ldr r0, _080569B0 @ =gUnknown_3005020
ldr r0, _080569B0 @ =gFieldCallback
ldr r1, _080569B4 @ =sub_8056918
str r1, [r0]
ldr r0, _080569B8 @ =sub_8056534
bl sub_80565E0
bl c2_exit_to_overworld_2_switch
bl CB2_ReturnToField
_080569AC:
pop {r0}
bx r0
.align 2, 0
_080569B0: .4byte gUnknown_3005020
_080569B0: .4byte gFieldCallback
_080569B4: .4byte sub_8056918
_080569B8: .4byte sub_8056534
thumb_func_end sub_8056938
@@ -5150,7 +5150,7 @@ _0805748C: .4byte sub_805671C
_08057490:
ldr r0, _080574A0 @ =sub_8056534
bl sub_80565E0
bl c2_exit_to_overworld_2_switch
bl CB2_ReturnToField
_0805749A:
pop {r0}
bx r0
@@ -5619,7 +5619,7 @@ sub_8057854: @ 8057854
ands r0, r1
cmp r0, 0
bne _08057876
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _08057880 @ =sub_805671C
bl SetMainCallback2
adds r0, r4, 0
asm/party_menu.s
+18 -18
View File
@@ -2585,7 +2585,7 @@ sub_811FEA4: @ 811FEA4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -4198,7 +4198,7 @@ sub_8120AC4: @ 8120AC4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -6926,7 +6926,7 @@ sub_812200C: @ 812200C
movs r1, 0x2
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
add sp, 0xC
pop {r0}
bx r0
@@ -10113,7 +10113,7 @@ sub_8123930: @ 8123930
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -10752,7 +10752,7 @@ sub_8123E8C: @ 8123E8C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -10871,7 +10871,7 @@ sub_8123F80: @ 8123F80
push {r7}
lsls r0, 24
lsrs r5, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -11790,7 +11790,7 @@ _08124754: .4byte gUnknown_203B0A0
_08124758: .4byte sub_80C4EF8
_0812475C:
ldr r1, _08124780 @ =gUnknown_203B0A0
ldr r0, _08124784 @ =c2_exit_to_overworld_2_switch
ldr r0, _08124784 @ =CB2_ReturnToField
str r0, [r1]
bl GetCursorSelectionMonId
lsls r0, 24
@@ -11807,7 +11807,7 @@ _08124778:
b _081247B4
.align 2, 0
_08124780: .4byte gUnknown_203B0A0
_08124784: .4byte c2_exit_to_overworld_2_switch
_08124784: .4byte CB2_ReturnToField
_08124788: .4byte gPlayerParty
_0812478C:
cmp r4, 0
@@ -11897,7 +11897,7 @@ sub_8124828: @ 8124828
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -11915,7 +11915,7 @@ _08124848:
b _081248A2
_0812484E:
ldr r1, _0812487C @ =gUnknown_203B0A0
ldr r0, _08124880 @ =c2_exit_to_overworld_2_switch
ldr r0, _08124880 @ =CB2_ReturnToField
str r0, [r1]
bl GetCursorSelectionMonId
lsls r0, 24
@@ -11936,7 +11936,7 @@ _0812484E:
b _081248A2
.align 2, 0
_0812487C: .4byte gUnknown_203B0A0
_08124880: .4byte c2_exit_to_overworld_2_switch
_08124880: .4byte CB2_ReturnToField
_08124884: .4byte gPlayerParty
_08124888: .4byte gUnknown_203B09C
_0812488C:
@@ -14561,7 +14561,7 @@ sub_8125DBC: @ 8125DBC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -15016,7 +15016,7 @@ sub_8126170: @ 8126170
muls r1, r0
ldr r0, _081261A4 @ =gPlayerParty
adds r4, r1, r0
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r5, r0, 24
cmp r5, 0
@@ -17093,7 +17093,7 @@ sub_8127268: @ 8127268
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -19308,7 +19308,7 @@ sub_8128370: @ 8128370
str r0, [sp]
ldr r0, _081283A0 @ =sub_811FB28
str r0, [sp, 0x4]
ldr r0, _081283A4 @ =c2_exit_to_overworld_2_switch
ldr r0, _081283A4 @ =CB2_ReturnToField
str r0, [sp, 0x8]
movs r0, 0x6
movs r1, 0
@@ -19322,7 +19322,7 @@ sub_8128370: @ 8128370
_08128398: .4byte gFieldCallback2
_0812839C: .4byte hm_add_c3_without_phase_2
_081283A0: .4byte sub_811FB28
_081283A4: .4byte c2_exit_to_overworld_2_switch
_081283A4: .4byte CB2_ReturnToField
thumb_func_end sub_8128370
thumb_func_start sub_81283A8
@@ -19338,7 +19338,7 @@ sub_81283A8: @ 81283A8
str r1, [sp]
ldr r1, _081283DC @ =sub_811FB28
str r1, [sp, 0x4]
ldr r1, _081283E0 @ =c2_exit_to_overworld_2_switch
ldr r1, _081283E0 @ =CB2_ReturnToField
str r1, [sp, 0x8]
movs r1, 0
movs r2, 0xB
@@ -19351,7 +19351,7 @@ sub_81283A8: @ 81283A8
_081283D4: .4byte gFieldCallback2
_081283D8: .4byte hm_add_c3_without_phase_2
_081283DC: .4byte sub_811FB28
_081283E0: .4byte c2_exit_to_overworld_2_switch
_081283E0: .4byte CB2_ReturnToField
thumb_func_end sub_81283A8
thumb_func_start hm_add_c3_without_phase_2
asm/player_pc.s
+21 -21
View File
@@ -627,12 +627,12 @@ sub_80EBB70: @ 80EBB70
ands r0, r1
cmp r0, 0
bne _080EBB9C
bl sub_80563F0
ldr r2, _080EBBA8 @ =c2_exit_to_overworld_2_switch
bl CleanupOverworldWindowsAndTilemaps
ldr r2, _080EBBA8 @ =CB2_ReturnToField
movs r0, 0x3
movs r1, 0
bl sub_8107DB4
ldr r1, _080EBBAC @ =gUnknown_3005020
ldr r1, _080EBBAC @ =gFieldCallback
ldr r0, _080EBBB0 @ =sub_80EBC0C
str r0, [r1]
adds r0, r4, 0
@@ -643,8 +643,8 @@ _080EBB9C:
bx r0
.align 2, 0
_080EBBA4: .4byte gPaletteFade
_080EBBA8: .4byte c2_exit_to_overworld_2_switch
_080EBBAC: .4byte gUnknown_3005020
_080EBBA8: .4byte CB2_ReturnToField
_080EBBAC: .4byte gFieldCallback
_080EBBB0: .4byte sub_80EBC0C
thumb_func_end sub_80EBB70
@@ -740,14 +740,14 @@ sub_80EBC38: @ 80EBC38
adds r0, r6, r0
ldr r1, _080EBC70 @ =sub_80EBD18
str r1, [r0]
ldr r1, _080EBC74 @ =gUnknown_3005020
ldr r1, _080EBC74 @ =gFieldCallback
ldr r0, _080EBC78 @ =sub_80EBCAC
str r0, [r1]
b _080EBC9C
.align 2, 0
_080EBC6C: .4byte gTasks+0x8
_080EBC70: .4byte sub_80EBD18
_080EBC74: .4byte gUnknown_3005020
_080EBC74: .4byte gFieldCallback
_080EBC78: .4byte sub_80EBCAC
_080EBC7C:
ldrb r0, [r4, 0x14]
@@ -808,9 +808,9 @@ sub_80EBCD8: @ 80EBCD8
ands r0, r1
cmp r0, 0
bne _080EBD06
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldrb r0, [r5, 0xC]
ldr r1, _080EBD14 @ =c2_exit_to_overworld_2_switch
ldr r1, _080EBD14 @ =CB2_ReturnToField
bl sub_810D3F4
adds r0, r4, 0
bl DestroyTask
@@ -821,7 +821,7 @@ _080EBD06:
.align 2, 0
_080EBD0C: .4byte gTasks+0x8
_080EBD10: .4byte gPaletteFade
_080EBD14: .4byte c2_exit_to_overworld_2_switch
_080EBD14: .4byte CB2_ReturnToField
thumb_func_end sub_80EBCD8
thumb_func_start sub_80EBD18
@@ -1438,7 +1438,7 @@ sub_80EC1D4: @ 80EC1D4
cmp r0, 0
bne _080EC216
bl sub_810EDB0
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r2, _080EC220 @ =gSaveBlock1Ptr
ldr r1, _080EC224 @ =gUnknown_203AAC4
ldrh r0, [r1]
@@ -1543,17 +1543,17 @@ _080EC2B6:
thumb_func_start sub_80EC2C0
sub_80EC2C0: @ 80EC2C0
push {lr}
ldr r0, _080EC2D4 @ =gUnknown_3005020
ldr r0, _080EC2D4 @ =gFieldCallback
ldr r1, _080EC2D8 @ =sub_80EC260
str r1, [r0]
ldr r0, _080EC2DC @ =c2_exit_to_overworld_2_switch
ldr r0, _080EC2DC @ =CB2_ReturnToField
bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_080EC2D4: .4byte gUnknown_3005020
_080EC2D4: .4byte gFieldCallback
_080EC2D8: .4byte sub_80EC260
_080EC2DC: .4byte c2_exit_to_overworld_2_switch
_080EC2DC: .4byte CB2_ReturnToField
thumb_func_end sub_80EC2C0
thumb_func_start sub_80EC2E0
@@ -1599,7 +1599,7 @@ sub_80EC324: @ 80EC324
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r0, 24
movs r1, 0x1
@@ -1753,7 +1753,7 @@ sub_80EC444: @ 80EC444
cmp r0, 0
bne _080EC468
bl sub_810EDB0
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
bl sub_81273D8
adds r0, r4, 0
bl DestroyTask
@@ -1834,17 +1834,17 @@ _080EC4F6:
thumb_func_start sub_80EC500
sub_80EC500: @ 80EC500
push {lr}
ldr r0, _080EC514 @ =gUnknown_3005020
ldr r0, _080EC514 @ =gFieldCallback
ldr r1, _080EC518 @ =sub_80EC474
str r1, [r0]
ldr r0, _080EC51C @ =c2_exit_to_overworld_2_switch
ldr r0, _080EC51C @ =CB2_ReturnToField
bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_080EC514: .4byte gUnknown_3005020
_080EC514: .4byte gFieldCallback
_080EC518: .4byte sub_80EC474
_080EC51C: .4byte c2_exit_to_overworld_2_switch
_080EC51C: .4byte CB2_ReturnToField
thumb_func_end sub_80EC500
thumb_func_start sub_80EC520
asm/pokedex_screen.s
+2 -2
View File
@@ -95,7 +95,7 @@ sub_810250C: @ 810250C
movs r0, 0x3
adds r2, r4, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
b _081025AE
.align 2, 0
_08102598: .4byte gUnknown_8451EBC
@@ -106,7 +106,7 @@ _081025A0:
movs r0, 0x3
adds r2, r4, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
_081025AE:
ldr r0, _081026A8 @ =gUnknown_8451ECC
bl InitWindows
asm/pokemon_storage_system.s
+13 -13
View File
@@ -1737,7 +1737,7 @@ _0808C680:
ands r0, r1
cmp r0, 0
bne _0808C69C
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldrb r0, [r5, 0xC]
bl sub_808CDE4
adds r0, r4, 0
@@ -1883,18 +1883,18 @@ sub_808C7B4: @ 808C7B4
bl sub_808FDF0
ldr r1, _0808C7D0 @ =gUnknown_20397A8
strb r0, [r1]
ldr r1, _0808C7D4 @ =gUnknown_3005020
ldr r1, _0808C7D4 @ =gFieldCallback
ldr r0, _0808C7D8 @ =mapldr_0808C6D8
str r0, [r1]
ldr r0, _0808C7DC @ =c2_exit_to_overworld_2_switch
ldr r0, _0808C7DC @ =CB2_ReturnToField
bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_0808C7D0: .4byte gUnknown_20397A8
_0808C7D4: .4byte gUnknown_3005020
_0808C7D4: .4byte gFieldCallback
_0808C7D8: .4byte mapldr_0808C6D8
_0808C7DC: .4byte c2_exit_to_overworld_2_switch
_0808C7DC: .4byte CB2_ReturnToField
thumb_func_end sub_808C7B4
thumb_func_start sub_808C7E0
@@ -4700,7 +4700,7 @@ _0808DF24:
adds r0, 0x1
strb r0, [r1]
_0808DF3A:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -5479,7 +5479,7 @@ _0808E59C:
.align 2, 0
_0808E5B8: .4byte gUnknown_20397B0
_0808E5BC:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -6284,7 +6284,7 @@ _0808EC40:
.align 2, 0
_0808EC50: .4byte gMain
_0808EC54:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -6426,7 +6426,7 @@ _0808ED74:
.align 2, 0
_0808ED84: .4byte gMain
_0808ED88:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -6681,7 +6681,7 @@ sub_808EF8C: @ 808EF8C
movs r0, 0x3
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r0, _0808EFC0 @ =gUnknown_83CE4D0
ldr r1, _0808EFC4 @ =0x0600f800
bl LZ77UnCompVram
@@ -6724,7 +6724,7 @@ sub_808EFE4: @ 808EFE4
movs r0, 0x1
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r0, _0808F038 @ =gUnknown_83CE5FC
ldr r5, _0808F03C @ =gUnknown_20397B0
ldr r1, [r5]
@@ -8345,7 +8345,7 @@ sub_808FCE8: @ 808FCE8
str r1, [sp, 0x8]
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
lsls r4, 24
asrs r4, 24
adds r0, r4, 0
@@ -12046,7 +12046,7 @@ _08091938:
str r0, [sp]
movs r0, 0x2
movs r2, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
movs r0, 0x2
bl CopyBgTilemapBufferToVram
add sp, 0x4
asm/pokemon_summary_screen.s
+2 -2
View File
@@ -14088,7 +14088,7 @@ _0813B84E:
sub_813B854: @ 813B854
push {lr}
sub sp, 0x4
ldr r3, _0813B86C @ =c2_exit_to_overworld_2_switch
ldr r3, _0813B86C @ =CB2_ReturnToField
movs r0, 0
str r0, [sp]
movs r1, 0
@@ -14098,7 +14098,7 @@ sub_813B854: @ 813B854
pop {r0}
bx r0
.align 2, 0
_0813B86C: .4byte c2_exit_to_overworld_2_switch
_0813B86C: .4byte CB2_ReturnToField
thumb_func_end sub_813B854
.align 2, 0 @ Don't pad with nop.
asm/region_map.s
+8 -8
View File
@@ -118,13 +118,13 @@ sub_80BFEDC: @ 80BFEDC
str r2, [r4]
cmp r2, 0
bne _080BFF08
ldr r0, _080BFF04 @ =c2_exit_to_overworld_2_switch
ldr r0, _080BFF04 @ =CB2_ReturnToField
bl SetMainCallback2
b _080BFF38
.align 2, 0
_080BFEFC: .4byte gUnknown_20399D4
_080BFF00: .4byte 0x000047c0
_080BFF04: .4byte c2_exit_to_overworld_2_switch
_080BFF04: .4byte CB2_ReturnToField
_080BFF08:
ldr r1, _080BFF40 @ =gUnknown_2031DE0
movs r0, 0x1
@@ -172,13 +172,13 @@ sub_80BFF50: @ 80BFF50
str r2, [r4]
cmp r2, 0
bne _080BFF7C
ldr r0, _080BFF78 @ =c2_exit_to_overworld_2_switch
ldr r0, _080BFF78 @ =CB2_ReturnToField
bl SetMainCallback2
b _080BFFB4
.align 2, 0
_080BFF70: .4byte gUnknown_20399D4
_080BFF74: .4byte 0x000047c0
_080BFF78: .4byte c2_exit_to_overworld_2_switch
_080BFF78: .4byte CB2_ReturnToField
_080BFF7C:
ldr r1, _080BFFBC @ =gUnknown_2031DE0
movs r0, 0x1
@@ -6451,7 +6451,7 @@ _080C3300:
ldr r1, _080C3338 @ =0x000047bc
adds r0, r1
ldr r1, [r0]
ldr r0, _080C333C @ =c2_exit_to_overworld_2_switch
ldr r0, _080C333C @ =CB2_ReturnToField
cmp r1, r0
bne _080C331A
_080C3318:
@@ -6474,7 +6474,7 @@ _080C332C:
.align 2, 0
_080C3334: .4byte gUnknown_20399D4
_080C3338: .4byte 0x000047bc
_080C333C: .4byte c2_exit_to_overworld_2_switch
_080C333C: .4byte CB2_ReturnToField
_080C3340: .4byte gUnknown_20399E4
_080C3344: .4byte sub_80C3348
thumb_func_end sub_80C31C0
@@ -10276,12 +10276,12 @@ _080C5220:
ldrb r0, [r0, 0x2]
cmp r0, 0x1
bne _080C5258
ldr r0, _080C5254 @ =c2_exit_to_overworld_2_switch
ldr r0, _080C5254 @ =CB2_ReturnToField
bl SetMainCallback2
b _080C525E
.align 2, 0
_080C5250: .4byte gUnknown_20399FC
_080C5254: .4byte c2_exit_to_overworld_2_switch
_080C5254: .4byte CB2_ReturnToField
_080C5258:
ldr r0, _080C5274 @ =sub_8124AB0
bl SetMainCallback2
asm/reshow_battle_screen.s
+2 -2
View File
@@ -661,7 +661,7 @@ _08077CD2:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r5, _08077D98 @ =gMultiuseSpriteTemplate
adds r0, r7, 0
movs r1, 0x2
@@ -887,7 +887,7 @@ _08077EA8:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r5, _08077FCC @ =gMultiuseSpriteTemplate
adds r0, r7, 0
movs r1, 0x2
asm/safari_zone.s
+4 -4
View File
@@ -122,12 +122,12 @@ sub_80A0F4C: @ 80A0F4C
ldrb r0, [r0]
cmp r0, 0
beq _080A0F68
ldr r0, _080A0F64 @ =c2_exit_to_overworld_2_switch
ldr r0, _080A0F64 @ =CB2_ReturnToField
bl SetMainCallback2
b _080A0FB0
.align 2, 0
_080A0F60: .4byte gUnknown_2039994
_080A0F64: .4byte c2_exit_to_overworld_2_switch
_080A0F64: .4byte CB2_ReturnToField
_080A0F68:
ldr r0, _080A0F88 @ =gUnknown_2023E8A
ldrb r0, [r0]
@@ -136,7 +136,7 @@ _080A0F68:
ldr r0, _080A0F8C @ =gUnknown_81BFB87
bl ScriptContext2_RunNewScript
bl warp_in
ldr r1, _080A0F90 @ =gUnknown_3005020
ldr r1, _080A0F90 @ =gFieldCallback
ldr r0, _080A0F94 @ =sub_807E3EC
str r0, [r1]
ldr r0, _080A0F98 @ =sub_805671C
@@ -145,7 +145,7 @@ _080A0F68:
.align 2, 0
_080A0F88: .4byte gUnknown_2023E8A
_080A0F8C: .4byte gUnknown_81BFB87
_080A0F90: .4byte gUnknown_3005020
_080A0F90: .4byte gFieldCallback
_080A0F94: .4byte sub_807E3EC
_080A0F98: .4byte sub_805671C
_080A0F9C:
asm/script_menu.s
+1 -1
View File
@@ -690,7 +690,7 @@ task_yes_no_maybe: @ 809CE54
.align 2, 0
_0809CE74: .4byte gTasks
_0809CE78:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
movs r0, 0x1
asm/script_pokemon_util_80BF8FC.s
+6 -6
View File
@@ -112,14 +112,14 @@ sub_80BF9BC: @ 80BF9BC
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
ldr r3, _080BF9FC @ =c2_exit_to_overworld_2_switch
ldr r3, _080BF9FC @ =CB2_ReturnToField
movs r4, 0
str r4, [sp]
bl sub_8134738
movs r0, 0x3
bl sub_8138B38
ldr r1, _080BFA00 @ =gUnknown_3005020
ldr r0, _080BFA04 @ =sub_807DD24
ldr r1, _080BFA00 @ =gFieldCallback
ldr r0, _080BFA04 @ =FieldCallback_ReturnToEventScript2
str r0, [r1]
add sp, 0x4
pop {r4}
@@ -129,9 +129,9 @@ sub_80BF9BC: @ 80BF9BC
_080BF9F0: .4byte gPlayerParty
_080BF9F4: .4byte gSpecialVar_0x8004
_080BF9F8: .4byte gPlayerPartyCount
_080BF9FC: .4byte c2_exit_to_overworld_2_switch
_080BFA00: .4byte gUnknown_3005020
_080BFA04: .4byte sub_807DD24
_080BF9FC: .4byte CB2_ReturnToField
_080BFA00: .4byte gFieldCallback
_080BFA04: .4byte FieldCallback_ReturnToEventScript2
thumb_func_end sub_80BF9BC
thumb_func_start ScrSpecial_CountPokemonMoves
asm/shop.s
+12 -12
View File
@@ -288,18 +288,18 @@ _0809ACD0: .4byte sub_809AD40
thumb_func_start sub_809ACD4
sub_809ACD4: @ 809ACD4
push {lr}
ldr r2, _0809ACEC @ =c2_exit_to_overworld_2_switch
ldr r2, _0809ACEC @ =CB2_ReturnToField
movs r0, 0x2
movs r1, 0x3
bl sub_8107DB4
ldr r1, _0809ACF0 @ =gUnknown_3005020
ldr r1, _0809ACF0 @ =gFieldCallback
ldr r0, _0809ACF4 @ =sub_809AD74
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0809ACEC: .4byte c2_exit_to_overworld_2_switch
_0809ACF0: .4byte gUnknown_3005020
_0809ACEC: .4byte CB2_ReturnToField
_0809ACF0: .4byte gFieldCallback
_0809ACF4: .4byte sub_809AD74
thumb_func_end sub_809ACD4
@@ -1452,17 +1452,17 @@ _0809B66C: .4byte gUnknown_2039968
thumb_func_start sub_809B670
sub_809B670: @ 809B670
push {lr}
ldr r0, _0809B684 @ =gUnknown_3005020
ldr r0, _0809B684 @ =gFieldCallback
ldr r1, _0809B688 @ =sub_809AD74
str r1, [r0]
ldr r0, _0809B68C @ =c2_exit_to_overworld_2_switch
ldr r0, _0809B68C @ =CB2_ReturnToField
bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_0809B684: .4byte gUnknown_3005020
_0809B684: .4byte gFieldCallback
_0809B688: .4byte sub_809AD74
_0809B68C: .4byte c2_exit_to_overworld_2_switch
_0809B68C: .4byte CB2_ReturnToField
thumb_func_end sub_809B670
thumb_func_start sub_809B690
@@ -2644,7 +2644,7 @@ sub_809C004: @ 809C004
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _0809C03C @ =gUnknown_3005020
ldr r1, _0809C03C @ =gFieldCallback
ldr r0, _0809C040 @ =sub_809AD74
str r0, [r1]
movs r0, 0x1
@@ -2666,7 +2666,7 @@ sub_809C004: @ 809C004
pop {r0}
bx r0
.align 2, 0
_0809C03C: .4byte gUnknown_3005020
_0809C03C: .4byte gFieldCallback
_0809C040: .4byte sub_809AD74
_0809C044: .4byte gTasks
_0809C048: .4byte sub_809C04C
@@ -2693,7 +2693,7 @@ sub_809C04C: @ 809C04C
movs r2, 0
bl DestroyListMenu
bl sub_809B604
ldr r0, _0809C090 @ =c2_exit_to_overworld_2_switch
ldr r0, _0809C090 @ =CB2_ReturnToField
bl SetMainCallback2
adds r0, r4, 0
bl DestroyTask
@@ -2704,7 +2704,7 @@ _0809C082:
.align 2, 0
_0809C088: .4byte gTasks+0x8
_0809C08C: .4byte gPaletteFade
_0809C090: .4byte c2_exit_to_overworld_2_switch
_0809C090: .4byte CB2_ReturnToField
thumb_func_end sub_809C04C
thumb_func_start nullsub_52
asm/slot_machine.s
+3 -3
View File
@@ -629,7 +629,7 @@ _0813FD00:
strh r0, [r4]
b _0813FD78
_0813FD08:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -3541,7 +3541,7 @@ _081411D0:
movs r0, 0
movs r1, 0xA
movs r2, 0xD0
bl sub_814FE40
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xF0
@@ -4603,7 +4603,7 @@ sub_8141AD8: @ 8141AD8
movs r1, 0x2
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
lsls r4, 24
asrs r4, 24
adds r0, r4, 0
asm/start_menu.s
+8 -8
View File
@@ -856,7 +856,7 @@ _0806F428:
bl IncrementGameStat
bl PlayRainStoppingSoundEffect
bl sub_806EF18
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0806F448 @ =sub_810275C
bl SetMainCallback2
movs r0, 0x1
@@ -883,7 +883,7 @@ _0806F460: .4byte gPaletteFade
_0806F464:
bl PlayRainStoppingSoundEffect
bl sub_806EF18
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0806F47C @ =CB2_PartyMenuFromStartMenu
bl SetMainCallback2
movs r0, 0x1
@@ -910,7 +910,7 @@ _0806F494: .4byte gPaletteFade
_0806F498:
bl PlayRainStoppingSoundEffect
bl sub_806EF18
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0806F4B0 @ =UseFameCheckerFromMenu
bl SetMainCallback2
movs r0, 0x1
@@ -937,7 +937,7 @@ _0806F4C8: .4byte gPaletteFade
_0806F4CC:
bl PlayRainStoppingSoundEffect
bl sub_806EF18
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0806F4E4 @ =sub_80568A8
bl sub_808B698
movs r0, 0x1
@@ -976,7 +976,7 @@ _0806F510: .4byte gPaletteFade
_0806F514:
bl PlayRainStoppingSoundEffect
bl sub_806EF18
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0806F534 @ =sub_8088388
bl SetMainCallback2
ldr r1, _0806F538 @ =gMain
@@ -1030,7 +1030,7 @@ sub_806F56C: @ 806F56C
_0806F580: .4byte gPaletteFade
_0806F584:
bl PlayRainStoppingSoundEffect
bl sub_80563F0
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0806F59C @ =gUnknown_300502C
ldrb r0, [r0]
ldr r1, _0806F5A0 @ =sub_80568A8
@@ -1362,7 +1362,7 @@ _0806F7F4: .4byte sub_806F7F8
thumb_func_start sub_806F7F8
sub_806F7F8: @ 806F7F8
push {lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -1481,7 +1481,7 @@ _0806F8D8: .4byte sub_806F8DC
thumb_func_start sub_806F8DC
sub_806F8DC: @ 806F8DC
push {lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
asm/text_window.s
+3 -3
View File
@@ -171,8 +171,8 @@ sub_814FDF4: @ 814FDF4
_0814FE3C: .4byte gUnknown_8471E8C
thumb_func_end sub_814FDF4
thumb_func_start sub_814FE40
sub_814FE40: @ 814FE40
thumb_func_start LoadUserWindowBorderGfx
LoadUserWindowBorderGfx: @ 814FE40
push {r4,lr}
adds r4, r1, 0
adds r3, r2, 0
@@ -193,7 +193,7 @@ sub_814FE40: @ 814FE40
bx r0
.align 2, 0
_0814FE68: .4byte gSaveBlock2Ptr
thumb_func_end sub_814FE40
thumb_func_end LoadUserWindowBorderGfx
thumb_func_start sub_814FE6C
sub_814FE6C: @ 814FE6C
asm/trade.s
+31 -31
View File
@@ -3432,7 +3432,7 @@ _0804E2A6:
movs r1, 0x3
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
ldr r0, [r4]
adds r0, 0x6F
movs r1, 0x4
@@ -3912,7 +3912,7 @@ _0804E670: .4byte 0x0000bbcc
thumb_func_start sub_804E674
sub_804E674: @ 804E674
push {r4,lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -4019,7 +4019,7 @@ _0804E740: .4byte gUnknown_2031DA8
thumb_func_start sub_804E744
sub_804E744: @ 804E744
push {r4,r5,lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r5, r0, 24
cmp r5, 0
@@ -4162,7 +4162,7 @@ sub_804E830: @ 804E830
movs r1, 0x3
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
ldr r0, [r4]
adds r0, 0xA8
strb r5, [r0]
@@ -7337,7 +7337,7 @@ _080500C8:
bl GetMonSpritePalStruct
ldrh r0, [r0, 0x4]
adds r1, r4, 0
bl sub_803F7D4
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, _08050128 @ =gMultiuseSpriteTemplate
movs r1, 0x78
movs r2, 0x3C
@@ -7841,7 +7841,7 @@ sub_80504CC: @ 80504CC
movs r0, 0x3
bl SetBgTilemapBuffer
bl DeactivateAllTextPrinters
ldr r0, _080505B8 @ =gUnknown_8D00000
ldr r0, _080505B8 @ =gBattleTextboxTiles
mov r10, r0
movs r0, 0
mov r9, r0
@@ -7849,7 +7849,7 @@ sub_80504CC: @ 80504CC
mov r1, r10
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r0, _080505BC @ =gFile_graphics_interface_menu_map_tilemap
mov r8, r0
ldr r4, _080505C0 @ =gDecompressionBuffer
@@ -7860,7 +7860,7 @@ sub_80504CC: @ 80504CC
adds r2, r5, 0
movs r3, 0
bl CopyToBgTilemapBuffer
ldr r6, _080505C4 @ =gUnknown_8D004D8
ldr r6, _080505C4 @ =gBattleTextboxPalette
adds r0, r6, 0
movs r1, 0
movs r2, 0x20
@@ -7873,7 +7873,7 @@ sub_80504CC: @ 80504CC
mov r1, r10
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
mov r0, r8
adds r1, r4, 0
bl LZDecompressWram
@@ -7896,10 +7896,10 @@ sub_80504CC: @ 80504CC
bx r0
.align 2, 0
_080505B4: .4byte gUnknown_826D1D4
_080505B8: .4byte gUnknown_8D00000
_080505B8: .4byte gBattleTextboxTiles
_080505BC: .4byte gFile_graphics_interface_menu_map_tilemap
_080505C0: .4byte gDecompressionBuffer
_080505C4: .4byte gUnknown_8D004D8
_080505C4: .4byte gBattleTextboxPalette
_080505C8: .4byte gUnknown_826D1BC
thumb_func_end sub_80504CC
@@ -8360,11 +8360,11 @@ _080509A4:
ldr r1, _08050A00 @ =0x00005206
movs r0, 0xC
bl SetGpuReg
ldr r0, _08050A04 @ =gUnknown_8EAEA20
ldr r0, _08050A04 @ =gTradeGba2_Pal
movs r1, 0x10
movs r2, 0x60
bl LoadPalette
ldr r3, _08050A08 @ =gUnknown_8EAEA80
ldr r3, _08050A08 @ =gTradeGba_Gfx
ldr r4, _08050A0C @ =0x06004000
movs r5, 0xA1
lsls r5, 5
@@ -8388,8 +8388,8 @@ _080509E6:
.align 2, 0
_080509FC: .4byte gUnknown_2031DAC
_08050A00: .4byte 0x00005206
_08050A04: .4byte gUnknown_8EAEA20
_08050A08: .4byte gUnknown_8EAEA80
_08050A04: .4byte gTradeGba2_Pal
_08050A08: .4byte gTradeGba_Gfx
_08050A0C: .4byte 0x06004000
_08050A10: .4byte 0x040000d4
_08050A14: .4byte 0x80000800
@@ -8436,7 +8436,7 @@ _08050A66:
ldr r1, _08050ABC @ =0x80000800
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
ldr r3, _08050AC0 @ =gUnknown_8EAEA80
ldr r3, _08050AC0 @ =gTradeGba_Gfx
movs r4, 0xC0
lsls r4, 19
movs r5, 0xA1
@@ -8471,7 +8471,7 @@ _08050AB0: .4byte gUnknown_8269A5C
_08050AB4: .4byte 0x06002800
_08050AB8: .4byte 0x040000d4
_08050ABC: .4byte 0x80000800
_08050AC0: .4byte gUnknown_8EAEA80
_08050AC0: .4byte gTradeGba_Gfx
_08050AC4:
ldr r0, _08050AF4 @ =gUnknown_2031DAC
ldr r2, [r0]
@@ -8769,11 +8769,11 @@ _08050D48:
ldr r1, _08050DC0 @ =0x00005206
movs r0, 0xC
bl SetGpuReg
ldr r0, _08050DC4 @ =gUnknown_8EAEA20
ldr r0, _08050DC4 @ =gTradeGba2_Pal
movs r1, 0x10
movs r2, 0x60
bl LoadPalette
ldr r3, _08050DC8 @ =gUnknown_8EAEA80
ldr r3, _08050DC8 @ =gTradeGba_Gfx
ldr r4, _08050DCC @ =0x06004000
movs r5, 0xA1
lsls r5, 5
@@ -8800,7 +8800,7 @@ _08050D98:
orrs r0, r7
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
ldr r1, _08050DD8 @ =gUnknown_826601C
ldr r1, _08050DD8 @ =gUnknown_08331F60
ldr r2, _08050DDC @ =0x06009000
ldr r0, _08050DD0 @ =0x040000d4
str r1, [r0]
@@ -8816,12 +8816,12 @@ _08050DB4:
.align 2, 0
_08050DBC: .4byte gUnknown_2031DAC
_08050DC0: .4byte 0x00005206
_08050DC4: .4byte gUnknown_8EAEA20
_08050DC8: .4byte gUnknown_8EAEA80
_08050DC4: .4byte gTradeGba2_Pal
_08050DC8: .4byte gTradeGba_Gfx
_08050DCC: .4byte 0x06004000
_08050DD0: .4byte 0x040000d4
_08050DD4: .4byte 0x80000800
_08050DD8: .4byte gUnknown_826601C
_08050DD8: .4byte gUnknown_08331F60
_08050DDC: .4byte 0x06009000
thumb_func_end sub_8050968
@@ -11137,7 +11137,7 @@ _080522BC:
bl Free
str r4, [r7]
_0805230A:
ldr r0, _08052328 @ =c2_exit_to_overworld_2_switch
ldr r0, _08052328 @ =CB2_ReturnToField
bl SetMainCallback2
bl sub_8053AE4
bl sub_812B484
@@ -11150,7 +11150,7 @@ _0805231A:
bx r1
.align 2, 0
_08052324: .4byte gPaletteFade
_08052328: .4byte c2_exit_to_overworld_2_switch
_08052328: .4byte CB2_ReturnToField
thumb_func_end sub_8050F3C
thumb_func_start sub_805232C
@@ -13362,7 +13362,7 @@ _08053718:
bl Free
str r4, [r7]
_08053766:
ldr r0, _08053784 @ =c2_exit_to_overworld_2_switch
ldr r0, _08053784 @ =CB2_ReturnToField
bl SetMainCallback2
bl sub_8053AE4
bl sub_812B484
@@ -13375,7 +13375,7 @@ _08053776:
bx r1
.align 2, 0
_08053780: .4byte gPaletteFade
_08053784: .4byte c2_exit_to_overworld_2_switch
_08053784: .4byte CB2_ReturnToField
thumb_func_end sub_805232C
thumb_func_start sub_8053788
@@ -14875,8 +14875,8 @@ sub_8054470: @ 8054470
bne _08054494
ldr r0, _080544A0 @ =sub_80505CC
bl SetMainCallback2
ldr r1, _080544A4 @ =gUnknown_3005020
ldr r0, _080544A8 @ =sub_807DD24
ldr r1, _080544A4 @ =gFieldCallback
ldr r0, _080544A8 @ =FieldCallback_ReturnToEventScript2
str r0, [r1]
adds r0, r4, 0
bl DestroyTask
@@ -14887,8 +14887,8 @@ _08054494:
.align 2, 0
_0805449C: .4byte gPaletteFade
_080544A0: .4byte sub_80505CC
_080544A4: .4byte gUnknown_3005020
_080544A8: .4byte sub_807DD24
_080544A4: .4byte gFieldCallback
_080544A8: .4byte FieldCallback_ReturnToEventScript2
thumb_func_end sub_8054470
thumb_func_start sub_80544AC
asm/union_room_chat.s
+2 -2
View File
@@ -1720,7 +1720,7 @@ _081291E8:
bl sub_812B4B8
bl sub_8129B88
bl sub_81284BC
ldr r0, _08129214 @ =c2_exit_to_overworld_2_switch
ldr r0, _08129214 @ =CB2_ReturnToField
bl SetMainCallback2
_08129206:
add sp, 0x4
@@ -1729,7 +1729,7 @@ _08129206:
bx r0
.align 2, 0
_08129210: .4byte gPaletteFade
_08129214: .4byte c2_exit_to_overworld_2_switch
_08129214: .4byte CB2_ReturnToField
thumb_func_end sub_8128FB8
thumb_func_start sub_8129218
asm/unk_8147AA8.s
+3 -3
View File
@@ -4875,7 +4875,7 @@ _08149DF0:
movs r0, 0
movs r1, 0xA
movs r2, 0xD0
bl sub_814FE40
bl LoadUserWindowBorderGfx
movs r0, 0
bl CopyBgTilemapBufferToVram
movs r0, 0x2
@@ -5961,7 +5961,7 @@ _0814A73C:
thumb_func_start sub_814A744
sub_814A744: @ 814A744
push {lr}
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r0, 24
pop {r1}
@@ -6075,7 +6075,7 @@ sub_814A7D0: @ 814A7D0
movs r1, 0x2
movs r2, 0
movs r3, 0x2
bl sub_810FF60
bl CreateYesNoMenu
add sp, 0x14
pop {r4,r5}
pop {r0}
asm/unk_814B6F0.s
+2 -2
View File
@@ -39,7 +39,7 @@ _0814B716:
str r0, [r5]
adds r0, r4, 0
bl SetMainCallback2
ldr r0, _0814B748 @ =c2_exit_to_overworld_2_switch
ldr r0, _0814B748 @ =CB2_ReturnToField
cmp r4, r0
bne _0814B73E
ldr r0, _0814B74C @ =0x0000012f
@@ -53,7 +53,7 @@ _0814B740:
pop {r1}
bx r1
.align 2, 0
_0814B748: .4byte c2_exit_to_overworld_2_switch
_0814B748: .4byte CB2_ReturnToField
_0814B74C: .4byte 0x0000012f
_0814B750: .4byte sub_8056534
thumb_func_end sub_814B6FC
asm/unk_814BB4C.s
+1 -1
View File
@@ -2949,7 +2949,7 @@ _0814D1CA:
bl sub_80F7858
b _0814D230
_0814D1D0:
bl ProcessMenuInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
asm/wireless_communication_status_screen.s
+1 -1
View File
@@ -80,7 +80,7 @@ sub_814F1E4: @ 814F1E4
movs r0, 0x1
movs r2, 0
movs r3, 0
bl sub_80F696C
bl DecompressAndLoadBgGfxUsingHeap
ldr r1, _0814F314 @ =gUnknown_846F8E0
movs r0, 0x1
movs r2, 0