summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_setup.s2
-rw-r--r--asm/cable_car.s2
-rw-r--r--asm/contest.s2
-rw-r--r--asm/daycare.s30
-rw-r--r--asm/decoration.s4
-rw-r--r--asm/egg_hatch.s845
-rw-r--r--asm/field_effect.s28
-rw-r--r--asm/field_screen.s22
-rwxr-xr-xasm/item_menu.s6
-rw-r--r--asm/item_use.s6
-rwxr-xr-xasm/learn_move.s2
-rw-r--r--asm/link.s4
-rwxr-xr-xasm/party_menu.s2
-rw-r--r--asm/player_pc.s6
-rwxr-xr-xasm/pokemon_storage_system.s2
-rw-r--r--asm/rom4.s24
-rw-r--r--asm/rom6.s4
-rw-r--r--asm/roulette.s2
-rw-r--r--asm/secret_base.s6
-rw-r--r--asm/shop.s4
-rw-r--r--asm/trade.s2
-rwxr-xr-xasm/walda_phrase.s2
22 files changed, 144 insertions, 863 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s
index 608d7843c..752e4adf1 100644
--- a/asm/battle_setup.s
+++ b/asm/battle_setup.s
@@ -585,7 +585,7 @@ sub_80B0AF8: @ 80B0AF8
_080B0B4C:
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF6F0
str r0, [r1]
_080B0B58:
diff --git a/asm/cable_car.s b/asm/cable_car.s
index 9307c54ff..ba228b729 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -775,7 +775,7 @@ _08150340:
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
bl warp_in
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
str r4, [r0]
ldr r0, =c2_load_new_map
bl SetMainCallback2
diff --git a/asm/contest.s b/asm/contest.s
index 76effb4e7..a380164cb 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -5582,7 +5582,7 @@ sub_80DA830: @ 80DA830
bne _080DA860
adds r0, r2, 0
bl DestroyTask
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_80DA874
str r1, [r0]
bl FreeAllWindowBuffers
diff --git a/asm/daycare.s b/asm/daycare.s
index 711d63e42..282a7b22c 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start pokemon_get_nick
-pokemon_get_nick: @ 806FA2C
+ thumb_func_start GetMonNick
+GetMonNick: @ 806FA2C
push {r4,lr}
sub sp, 0x14
adds r4, r1, 0
@@ -20,10 +20,10 @@ pokemon_get_nick: @ 806FA2C
pop {r4}
pop {r1}
bx r1
- thumb_func_end pokemon_get_nick
+ thumb_func_end GetMonNick
- thumb_func_start pokemon_get_nick_
-pokemon_get_nick_: @ 806FA4C
+ thumb_func_start GetBoxMonNick
+GetBoxMonNick: @ 806FA4C
push {r4,lr}
sub sp, 0x14
adds r4, r1, 0
@@ -37,7 +37,7 @@ pokemon_get_nick_: @ 806FA4C
pop {r4}
pop {r1}
bx r1
- thumb_func_end pokemon_get_nick_
+ thumb_func_end GetBoxMonNick
thumb_func_start daycare_count_pokemon
daycare_count_pokemon: @ 806FA6C
@@ -177,7 +177,7 @@ sub_806FB38: @ 806FB38
adds r4, 0x7C
adds r0, r6, 0
adds r1, r4, 0
- bl pokemon_get_nick
+ bl GetMonNick
adds r0, r4, 0
bl StripExtCtrlCodes
adds r4, 0xB
@@ -376,7 +376,7 @@ sub_806FCF8: @ 806FCF8
sub sp, 0x68
adds r5, r0, 0
ldr r1, =gStringVar1
- bl pokemon_get_nick_
+ bl GetBoxMonNick
adds r0, r5, 0
movs r1, 0xB
bl GetBoxMonData
@@ -547,7 +547,7 @@ sub_806FE54: @ 806FE54
bl ConvertIntToDecimalStringN
ldr r1, =gStringVar1
adds r0, r5, 0
- bl pokemon_get_nick_
+ bl GetBoxMonNick
adds r0, r4, 0
pop {r4,r5}
pop {r1}
@@ -565,7 +565,7 @@ sub_806FE88: @ 806FE88
lsrs r4, 24
ldr r1, =gStringVar1
adds r0, r5, 0
- bl pokemon_get_nick_
+ bl GetBoxMonNick
movs r0, 0x64
muls r4, r0
adds r4, 0x64
@@ -2280,7 +2280,7 @@ sub_8070C04: @ 8070C04
beq _08070C2E
ldr r1, =gStringVar1
adds r0, r4, 0
- bl pokemon_get_nick_
+ bl GetBoxMonNick
adds r0, r4, 0
movs r1, 0x7
mov r2, sp
@@ -2297,7 +2297,7 @@ _08070C2E:
beq _08070C44
ldr r1, =gStringVar2
adds r0, r4, 0
- bl pokemon_get_nick_
+ bl GetBoxMonNick
_08070C44:
add sp, 0xC
pop {r4}
@@ -2317,7 +2317,7 @@ sub_8070C58: @ 8070C58
ldr r4, =gPlayerParty
adds r0, r4
ldr r1, =gStringVar1
- bl pokemon_get_nick_
+ bl GetBoxMonNick
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
@@ -2788,7 +2788,7 @@ _08070FCC:
adds r5, r1, r0
adds r0, r4, 0
adds r1, r5, 0
- bl pokemon_get_nick_
+ bl GetBoxMonNick
adds r0, r5, 0
adds r1, r4, 0
bl sub_8070F98
@@ -2944,7 +2944,7 @@ sub_8071110: @ 8071110
adds r5, r0
adds r0, r5, 0
mov r1, sp
- bl pokemon_get_nick_
+ bl GetBoxMonNick
mov r0, sp
adds r1, r5, 0
bl sub_8070F98
diff --git a/asm/decoration.s b/asm/decoration.s
index 4efc70e04..48a76a8f9 100644
--- a/asm/decoration.s
+++ b/asm/decoration.s
@@ -4149,7 +4149,7 @@ _08128C30:
bl sub_812A3C8
ldr r0, =0x00000be5
bl FreeSpritePaletteByTag
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_8128CD4
str r0, [r1]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -6907,7 +6907,7 @@ _0812A280:
.pool
_0812A29C:
bl sub_812A3C8
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_812A334
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s
index d646dbb73..d97fc8c65 100644
--- a/asm/egg_hatch.s
+++ b/asm/egg_hatch.s
@@ -5,728 +5,9 @@
.text
- thumb_func_start sub_8071348
-sub_8071348: @ 8071348
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- sub sp, 0x50
- adds r5, r0, 0
- adds r6, r1, 0
- movs r1, 0xB
- bl GetMonData
- lsls r0, 16
- lsrs r0, 16
- str r0, [sp, 0x3C]
- movs r4, 0
- add r7, sp, 0x18
- add r0, sp, 0x30
- mov r8, r0
- movs r1, 0x31
- add r1, sp
- mov r10, r1
- mov r0, sp
- adds r0, 0x32
- str r0, [sp, 0x40]
- mov r1, sp
- adds r1, 0x34
- str r1, [sp, 0x48]
- adds r0, 0x1
- str r0, [sp, 0x44]
- adds r1, 0x4
- str r1, [sp, 0x4C]
-_08071386:
- adds r1, r4, 0
- adds r1, 0xD
- adds r0, r5, 0
- bl GetMonData
- lsls r1, r4, 1
- add r1, sp
- adds r1, 0x10
- strh r0, [r1]
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x3
- bls _08071386
- adds r0, r5, 0
- movs r1, 0
- bl GetMonData
- mov r9, r0
- movs r4, 0
-_080713AE:
- adds r1, r4, 0
- adds r1, 0x27
- adds r0, r5, 0
- bl GetMonData
- lsls r1, r4, 2
- adds r1, r7, r1
- str r0, [r1]
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x5
- bls _080713AE
- adds r0, r5, 0
- movs r1, 0x3
- bl GetMonData
- mov r1, r8
- strb r0, [r1]
- adds r0, r5, 0
- movs r1, 0x25
- bl GetMonData
- mov r1, r10
- strb r0, [r1]
- adds r0, r5, 0
- movs r1, 0x8
- bl GetMonData
- ldr r1, [sp, 0x40]
- strb r0, [r1]
- adds r0, r5, 0
- movs r1, 0x22
- bl GetMonData
- str r0, [sp, 0x38]
- adds r0, r5, 0
- movs r1, 0x50
- bl GetMonData
- ldr r1, [sp, 0x48]
- strb r0, [r1]
- movs r0, 0x1
- str r0, [sp]
- mov r0, r9
- str r0, [sp, 0x4]
- movs r0, 0
- str r0, [sp, 0x8]
- str r0, [sp, 0xC]
- adds r0, r6, 0
- ldr r1, [sp, 0x3C]
- movs r2, 0x5
- movs r3, 0x20
- bl CreateMon
- movs r4, 0
-_0807141E:
- adds r1, r4, 0
- adds r1, 0xD
- lsls r0, r4, 1
- mov r2, sp
- adds r2, r0
- adds r2, 0x10
- adds r0, r6, 0
- bl SetMonData
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x3
- bls _0807141E
- movs r4, 0
-_0807143C:
- adds r1, r4, 0
- adds r1, 0x27
- lsls r2, r4, 2
- adds r2, r7, r2
- adds r0, r6, 0
- bl SetMonData
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x5
- bls _0807143C
- movs r0, 0x2
- mov r1, r8
- strb r0, [r1]
- adds r0, r6, 0
- movs r1, 0x3
- mov r2, r8
- bl SetMonData
- adds r0, r6, 0
- movs r1, 0x25
- mov r2, r10
- bl SetMonData
- adds r0, r6, 0
- movs r1, 0x8
- ldr r2, [sp, 0x40]
- bl SetMonData
- movs r0, 0x78
- ldr r1, [sp, 0x44]
- strb r0, [r1]
- adds r0, r6, 0
- movs r1, 0x20
- ldr r2, [sp, 0x44]
- bl SetMonData
- adds r0, r6, 0
- movs r1, 0x22
- ldr r2, [sp, 0x4C]
- bl SetMonData
- adds r0, r6, 0
- movs r1, 0x50
- ldr r2, [sp, 0x48]
- bl SetMonData
- adds r0, r5, 0
- adds r1, r6, 0
- movs r2, 0x64
- bl memcpy
- add sp, 0x50
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_8071348
-
- thumb_func_start sub_80714B8
-sub_80714B8: @ 80714B8
- push {r4,r5,lr}
- sub sp, 0x14
- lsls r0, 24
- lsrs r0, 24
- add r4, sp, 0xC
- movs r1, 0x46
- strb r1, [r4]
- movs r1, 0x64
- adds r5, r0, 0
- muls r5, r1
- ldr r0, =gPlayerParty
- adds r5, r0
- ldr r1, =gEnemyParty
- adds r0, r5, 0
- bl sub_8071348
- adds r0, r5, 0
- movs r1, 0x2D
- adds r2, r4, 0
- bl SetMonData
- adds r0, r5, 0
- movs r1, 0xB
- bl GetMonData
- adds r4, r0, 0
- lsls r4, 16
- lsrs r4, 16
- mov r0, sp
- adds r1, r4, 0
- bl GetSpeciesName
- adds r0, r5, 0
- movs r1, 0x2
- mov r2, sp
- bl SetMonData
- adds r0, r4, 0
- bl SpeciesToNationalPokedexNum
- adds r4, r0, 0
- lsls r4, 16
- lsrs r4, 16
- adds r0, r4, 0
- movs r1, 0x2
- bl GetSetPokedexFlag
- adds r0, r4, 0
- movs r1, 0x3
- bl GetSetPokedexFlag
- ldr r1, =gStringVar1
- adds r0, r5, 0
- bl pokemon_get_nick
- mov r2, sp
- adds r2, 0xE
- movs r0, 0x4
- strh r0, [r2]
- adds r0, r5, 0
- movs r1, 0x26
- bl SetMonData
- add r2, sp, 0x10
- movs r0, 0
- strh r0, [r2]
- adds r0, r5, 0
- movs r1, 0x24
- bl SetMonData
- bl sav1_map_get_name
- mov r2, sp
- adds r2, 0x12
- strb r0, [r2]
- adds r0, r5, 0
- movs r1, 0x23
- bl SetMonData
- adds r0, r5, 0
- bl MonRestorePP
- adds r0, r5, 0
- bl CalculateMonStats
- add sp, 0x14
- pop {r4,r5}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_80714B8
-
- thumb_func_start sub_8071578
-sub_8071578: @ 8071578
- push {lr}
- ldr r0, =gSpecialVar_0x8004
- ldrb r0, [r0]
- bl sub_80714B8
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8071578
-
- thumb_func_start sub_807158C
-sub_807158C: @ 807158C
- push {r4-r6,lr}
- sub sp, 0x20
- lsls r1, 24
- lsrs r1, 24
- movs r2, 0x8C
- muls r1, r2
- adds r4, r0, r1
- adds r0, r4, 0
- mov r1, sp
- bl pokemon_get_nick_
- adds r0, r4, 0
- adds r0, 0x70
- ldrh r0, [r0]
- cmp r0, 0
- beq _08071608
- adds r6, r4, 0
- adds r6, 0x7C
- mov r0, sp
- adds r1, r6, 0
- bl StringCompareWithoutExtCtrlCodes
- adds r5, r4, 0
- adds r5, 0x74
- cmp r0, 0
- bne _080715CE
- ldr r0, =gSaveBlock2Ptr
- ldr r0, [r0]
- adds r1, r5, 0
- bl StringCompareWithoutExtCtrlCodes
- cmp r0, 0
- beq _08071608
-_080715CE:
- ldr r0, =gStringVar1
- mov r1, sp
- bl StringCopy
- ldr r0, =gStringVar2
- adds r4, 0x87
- ldrb r2, [r4]
- lsls r2, 28
- lsrs r2, 28
- adds r1, r5, 0
- bl sub_81DB5E8
- ldr r0, =gStringVar3
- ldrb r2, [r4]
- lsrs r2, 4
- adds r1, r6, 0
- bl sub_81DB5E8
- movs r0, 0x1
- b _0807160A
- .pool
-_08071608:
- movs r0, 0
-_0807160A:
- add sp, 0x20
- pop {r4-r6}
- pop {r1}
- bx r1
- thumb_func_end sub_807158C
-
- thumb_func_start sub_8071614
-sub_8071614: @ 8071614
- push {lr}
- ldr r0, =gSaveBlock1Ptr
- ldr r0, [r0]
- ldr r1, =0x00003030
- adds r0, r1
- ldr r1, =gSpecialVar_0x8004
- ldrb r1, [r1]
- bl sub_807158C
- lsls r0, 24
- lsrs r0, 24
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_8071614
-
- thumb_func_start sub_807163C
-sub_807163C: @ 807163C
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- mov r9, r3
- lsls r0, 24
- lsrs r3, r0, 24
- mov r8, r3
- lsls r1, 24
- lsrs r6, r1, 24
- lsls r2, 24
- lsrs r1, r2, 24
- adds r2, r1, 0
- movs r4, 0
- movs r7, 0
- movs r5, 0
- cmp r3, 0
- bne _0807166A
- movs r0, 0x64
- muls r1, r0
- ldr r0, =gPlayerParty
- adds r5, r1, r0
- movs r4, 0x1
-_0807166A:
- cmp r3, 0x1
- bne _0807167A
- movs r0, 0x64
- adds r1, r2, 0
- muls r1, r0
- ldr r0, =gPlayerParty
- adds r5, r1, r0
- movs r4, 0x3
-_0807167A:
- cmp r6, 0
- beq _08071688
- cmp r6, 0x1
- beq _080716D8
- b _08071712
- .pool
-_08071688:
- adds r0, r5, 0
- movs r1, 0xB
- bl GetMonData
- adds r4, r0, 0
- lsls r4, 16
- lsrs r4, 16
- adds r0, r5, 0
- movs r1, 0
- bl GetMonData
- adds r3, r0, 0
- lsls r0, r4, 3
- ldr r1, =gMonFrontPicTable
- adds r0, r1
- ldr r1, =gBattleSpritesGfx
- ldr r2, [r1]
- mov r6, r8
- lsls r1, r6, 1
- adds r1, 0x1
- lsls r1, 2
- adds r2, 0x4
- adds r2, r1
- ldr r1, [r2]
- adds r2, r4, 0
- bl HandleLoadSpecialPokePic_DontHandleDeoxys
- adds r0, r5, 0
- bl sub_806E794
- bl LoadCompressedObjectPalette
- mov r0, r9
- strh r4, [r0]
- b _08071712
- .pool
-_080716D8:
- adds r0, r5, 0
- bl sub_806E794
- ldrh r0, [r0, 0x4]
- adds r1, r4, 0
- bl sub_806A068
- ldr r0, =gUnknown_0202499C
- movs r1, 0x78
- movs r2, 0x4B
- movs r3, 0x6
- bl CreateSprite
- lsls r0, 24
- lsrs r7, r0, 24
- ldr r4, =gSprites
- lsls r1, r7, 4
- adds r1, r7
- lsls r1, 2
- adds r2, r1, r4
- adds r2, 0x3E
- ldrb r0, [r2]
- movs r3, 0x4
- orrs r0, r3
- strb r0, [r2]
- adds r4, 0x1C
- adds r1, r4
- ldr r0, =SpriteCallbackDummy
- str r0, [r1]
-_08071712:
- adds r0, r7, 0
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_807163C
-
- thumb_func_start sub_807172C
-sub_807172C: @ 807172C
- push {lr}
- bl LoadOam
- bl ProcessSpriteCopyRequests
- bl TransferPlttBuffer
- pop {r0}
- bx r0
- thumb_func_end sub_807172C
-
- thumb_func_start sub_8071740
-sub_8071740: @ 8071740
- push {lr}
- bl ScriptContext2_Enable
- ldr r0, =sub_8071760
- movs r1, 0xA
- bl CreateTask
- movs r0, 0x1
- movs r1, 0
- bl fade_screen
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8071740
-
- thumb_func_start sub_8071760
-sub_8071760: @ 8071760
- push {r4,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- ldr r0, =gPaletteFade
- ldrb r1, [r0, 0x7]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _08071788
- bl overworld_free_bg_tilemaps
- ldr r0, =c1_hatching_egg
- bl SetMainCallback2
- ldr r1, =gUnknown_03005DAC
- ldr r0, =sub_80AF168
- str r0, [r1]
- adds r0, r4, 0
- bl DestroyTask
-_08071788:
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8071760
-
- thumb_func_start c1_hatching_egg
-c1_hatching_egg: @ 80717A0
- push {r4,lr}
- sub sp, 0x4
- ldr r0, =gMain
- movs r1, 0x87
- lsls r1, 3
- adds r0, r1
- ldrb r0, [r0]
- cmp r0, 0x8
- bls _080717B4
- b _080719D6
-_080717B4:
- lsls r0, 2
- ldr r1, =_080717C8
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .pool
- .align 2, 0
-_080717C8:
- .4byte _080717EC
- .4byte _080718B8
- .4byte _080718D0
- .4byte _08071904
- .4byte _08071924
- .4byte _0807193C
- .4byte _08071954
- .4byte _08071970
- .4byte _080719C8
-_080717EC:
- movs r0, 0
- movs r1, 0
- bl SetGpuReg
- ldr r4, =gUnknown_03000DE0
- movs r0, 0x14
- bl Alloc
- str r0, [r4]
- bl init_uns_table_pokemon_copy
- ldr r2, [r4]
- ldr r0, =gSpecialVar_0x8004
- ldrh r0, [r0]
- movs r1, 0
- strb r0, [r2, 0x4]
- ldr r0, [r4]
- strb r1, [r0, 0x7]
- ldr r0, =sub_807172C
- bl SetVBlankCallback
- bl GetCurrentMapMusic
- ldr r1, =gSpecialVar_0x8005
- strh r0, [r1]
- bl reset_temp_tile_data_buffers
- movs r0, 0
- bl ResetBgsAndClearDma3BusyFlags
- ldr r1, =gUnknown_0832C064
- movs r0, 0
- movs r2, 0x2
- bl InitBgsFromTemplates
- movs r0, 0x1
- movs r1, 0
- movs r2, 0
- bl ChangeBgX
- movs r0, 0x1
- movs r1, 0
- movs r2, 0
- bl ChangeBgY
- movs r0, 0
- movs r1, 0
- movs r2, 0
- bl ChangeBgX
- movs r0, 0
- movs r1, 0
- movs r2, 0
- bl ChangeBgY
- movs r0, 0x1
- movs r1, 0x7
- movs r2, 0x2
- bl SetBgAttribute
- movs r0, 0x80
- lsls r0, 5
- bl Alloc
- adds r1, r0, 0
- movs r0, 0x1
- bl SetBgTilemapBuffer
- movs r0, 0x80
- lsls r0, 6
- bl Alloc
- adds r1, r0, 0
- movs r0, 0
- bl SetBgTilemapBuffer
- bl DeactivateAllTextPrinters
- bl ResetPaletteFade
- bl FreeAllSpritePalettes
- bl ResetSpriteData
- bl ResetTasks
- bl remove_some_task
- bl m4aSoundVSyncOn
- b _080719A6
- .pool
-_080718B8:
- ldr r0, =gUnknown_0832C06C
- bl InitWindows
- ldr r0, =gUnknown_03000DE0
- ldr r1, [r0]
- movs r0, 0
- strb r0, [r1, 0x8]
- b _080719A6
- .pool
-_080718D0:
- ldr r1, =gUnknown_08C00000
- movs r0, 0
- str r0, [sp]
- movs r2, 0
- movs r3, 0
- bl copy_decompressed_tile_data_to_vram_autofree
- ldr r1, =gUnknown_08C00524
- movs r0, 0
- movs r2, 0
- movs r3, 0
- bl CopyToBgTilemapBuffer
- ldr r0, =gUnknown_08C004E0
- movs r1, 0
- movs r2, 0x20
- bl LoadCompressedPalette
- b _080719A6
- .pool
-_08071904:
- ldr r0, =gUnknown_0832BFE4
- bl LoadSpriteSheet
- ldr r0, =gUnknown_0832BFEC
- bl LoadSpriteSheet
- ldr r0, =gUnknown_0832BFF4
- bl LoadSpritePalette
- b _080719A6
- .pool
-_08071924:
- movs r0, 0
- bl CopyBgTilemapBufferToVram
- ldr r0, =gUnknown_03000DE0
- ldr r0, [r0]
- ldrb r0, [r0, 0x4]
- bl sub_80714B8
- b _080719A6
- .pool
-_0807193C:
- ldr r0, =gUnknown_03000DE0
- ldr r3, [r0]
- ldrb r2, [r3, 0x4]
- adds r3, 0xC
- movs r0, 0
- movs r1, 0
- bl sub_807163C
- b _080719A6
- .pool
-_08071954:
- ldr r4, =gUnknown_03000DE0
- ldr r3, [r4]
- ldrb r2, [r3, 0x4]
- adds r3, 0xC
- movs r0, 0
- movs r1, 0x1
- bl sub_807163C
- ldr r1, [r4]
- strb r0, [r1, 0x1]
- b _080719A6
- .pool
-_08071970:
- movs r1, 0x82
- lsls r1, 5
- movs r0, 0
- bl SetGpuReg
- ldr r0, =gUnknown_08DD7300
- movs r1, 0x10
- movs r2, 0xA0
- bl LoadPalette
- ldr r1, =gUnknown_08DD7360
- movs r2, 0xA1
- lsls r2, 5
- movs r0, 0x1
- movs r3, 0
- bl LoadBgTiles
- ldr r1, =gUnknown_08331F60
- movs r2, 0x80
- lsls r2, 5
- movs r0, 0x1
- movs r3, 0
- bl CopyToBgTilemapBuffer
- movs r0, 0x1
- bl CopyBgTilemapBufferToVram
-_080719A6:
- ldr r1, =gMain
- movs r0, 0x87
- lsls r0, 3
- adds r1, r0
- ldrb r0, [r1]
- adds r0, 0x1
- strb r0, [r1]
- b _080719D6
- .pool
-_080719C8:
- ldr r0, =sub_8071A94
- bl SetMainCallback2
- ldr r0, =gUnknown_03000DE0
- ldr r1, [r0]
- movs r0, 0
- strb r0, [r1, 0x2]
-_080719D6:
- bl RunTasks
- bl RunTextPrinters
- bl AnimateSprites
- bl BuildOamBuffer
- bl UpdatePaletteFade
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end c1_hatching_egg
- thumb_func_start sub_80719FC
-sub_80719FC: @ 80719FC
+ thumb_func_start EggHatchSetMonNickname
+EggHatchSetMonNickname: @ 80719FC
push {lr}
ldr r0, =gSpecialVar_0x8004
ldrh r1, [r0]
@@ -738,7 +19,7 @@ sub_80719FC: @ 80719FC
movs r1, 0x2
bl SetMonData
bl sub_805F094
- ldr r0, =gUnknown_03000DE0
+ ldr r0, =gEggHatchData
ldr r0, [r0]
bl Free
ldr r0, =c2_exit_to_overworld_2_switch
@@ -746,10 +27,10 @@ sub_80719FC: @ 80719FC
pop {r0}
bx r0
.pool
- thumb_func_end sub_80719FC
+ thumb_func_end EggHatchSetMonNickname
- thumb_func_start c3_080472E4
-c3_080472E4: @ 8071A3C
+ thumb_func_start Task_EggHatchPlayBGM
+Task_EggHatchPlayBGM: @ 8071A3C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -789,16 +70,16 @@ _08071A80:
pop {r0}
bx r0
.pool
- thumb_func_end c3_080472E4
+ thumb_func_end Task_EggHatchPlayBGM
- thumb_func_start sub_8071A94
-sub_8071A94: @ 8071A94
+ thumb_func_start CB2_EggHatch_1
+CB2_EggHatch_1: @ 8071A94
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
sub sp, 0x8
- ldr r1, =gUnknown_03000DE0
+ ldr r1, =gEggHatchData
ldr r0, [r1]
ldrb r0, [r0, 0x2]
adds r5, r1, 0
@@ -840,7 +121,7 @@ _08071AF4:
movs r2, 0x4B
movs r3, 0x5
bl CreateSprite
- ldr r4, =gUnknown_03000DE0
+ ldr r4, =gEggHatchData
ldr r1, [r4]
strb r0, [r1]
movs r0, 0
@@ -851,7 +132,7 @@ _08071AF4:
ldrb r0, [r1, 0x2]
adds r0, 0x1
strb r0, [r1, 0x2]
- ldr r0, =c3_080472E4
+ ldr r0, =Task_EggHatchPlayBGM
movs r1, 0x5
bl CreateTask
b _08071E06
@@ -899,7 +180,7 @@ _08071B7A:
lsls r0, 2
adds r2, 0x1C
adds r0, r2
- ldr r1, =sub_8071E34
+ ldr r1, =SpriteCB_Egg_0
str r1, [r0]
b _08071E06
.pool
@@ -969,7 +250,7 @@ _08071C24:
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gStringVar1
- bl pokemon_get_nick
+ bl GetMonNick
ldr r4, =gStringVar4
ldr r1, =gUnknown_085ED5A5
adds r0, r4, 0
@@ -1021,7 +302,7 @@ _08071CA4:
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gStringVar1
- bl pokemon_get_nick
+ bl GetMonNick
ldr r4, =gStringVar4
ldr r1, =gUnknown_085ED5BE
adds r0, r4, 0
@@ -1079,7 +360,7 @@ _08071D36:
beq _08071DC4
b _08071E06
_08071D3C:
- ldr r0, =gUnknown_03000DE0
+ ldr r0, =gEggHatchData
mov r8, r0
ldr r0, [r0]
ldrb r0, [r0, 0x4]
@@ -1089,7 +370,7 @@ _08071D3C:
adds r0, r5
ldr r1, =gStringVar3
mov r9, r1
- bl pokemon_get_nick
+ bl GetMonNick
mov r1, r8
ldr r0, [r1]
ldrb r0, [r0, 0x4]
@@ -1117,7 +398,7 @@ _08071D3C:
movs r2, 0
bl GetMonData
str r0, [sp]
- ldr r0, =sub_80719FC
+ ldr r0, =EggHatchSetMonNickname
str r0, [sp, 0x4]
movs r0, 0x3
mov r1, r9
@@ -1135,7 +416,7 @@ _08071DB4:
movs r3, 0x10
bl BeginNormalPaletteFade
_08071DC4:
- ldr r0, =gUnknown_03000DE0
+ ldr r0, =gEggHatchData
ldr r1, [r0]
_08071DC8:
ldrb r0, [r1, 0x2]
@@ -1151,7 +432,7 @@ _08071DD4:
cmp r0, 0
bne _08071E06
bl sub_805F094
- ldr r4, =gUnknown_03000DE0
+ ldr r4, =gEggHatchData
ldr r0, [r4]
ldrb r0, [r0, 0x8]
bl RemoveWindow
@@ -1177,10 +458,10 @@ _08071E06:
pop {r0}
bx r0
.pool
- thumb_func_end sub_8071A94
+ thumb_func_end CB2_EggHatch_1
- thumb_func_start sub_8071E34
-sub_8071E34: @ 8071E34
+ thumb_func_start SpriteCB_Egg_0
+SpriteCB_Egg_0: @ 8071E34
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x2E]
@@ -1190,7 +471,7 @@ sub_8071E34: @ 8071E34
asrs r0, 16
cmp r0, 0x14
ble _08071E54
- ldr r0, =sub_8071E8C
+ ldr r0, =SpriteCB_Egg_1
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x2E]
@@ -1216,15 +497,15 @@ _08071E54:
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAnim
- bl sub_8072140
+ bl CreateRandomEggShardSprite
_08071E84:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8071E34
+ thumb_func_end SpriteCB_Egg_0
- thumb_func_start sub_8071E8C
-sub_8071E8C: @ 8071E8C
+ thumb_func_start SpriteCB_Egg_1
+SpriteCB_Egg_1: @ 8071E8C
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
@@ -1242,7 +523,7 @@ sub_8071E8C: @ 8071E8C
asrs r0, 16
cmp r0, 0x14
ble _08071EBC
- ldr r0, =sub_8071EF0
+ ldr r0, =SpriteCB_Egg_2
str r0, [r4, 0x1C]
strh r1, [r4, 0x2E]
strh r1, [r4, 0x32]
@@ -1272,10 +553,10 @@ _08071EE8:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8071E8C
+ thumb_func_end SpriteCB_Egg_1
- thumb_func_start sub_8071EF0
-sub_8071EF0: @ 8071EF0
+ thumb_func_start SpriteCB_Egg_2
+SpriteCB_Egg_2: @ 8071EF0
push {r4,r5,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
@@ -1293,10 +574,10 @@ sub_8071EF0: @ 8071EF0
asrs r0, 16
cmp r0, 0x26
ble _08071F5C
- ldr r0, =sub_8071FA4
+ ldr r0, =SpriteCB_Egg_3
str r0, [r4, 0x1C]
strh r5, [r4, 0x2E]
- ldr r4, =gUnknown_03000DE0
+ ldr r4, =gEggHatchData
ldr r0, [r4]
ldrb r1, [r0, 0x4]
movs r0, 0x64
@@ -1341,8 +622,8 @@ _08071F5C:
adds r0, r4, 0
movs r1, 0x2
bl StartSpriteAnim
- bl sub_8072140
- bl sub_8072140
+ bl CreateRandomEggShardSprite
+ bl CreateRandomEggShardSprite
_08071F90:
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -1354,10 +635,10 @@ _08071F9E:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8071EF0
+ thumb_func_end SpriteCB_Egg_2
- thumb_func_start sub_8071FA4
-sub_8071FA4: @ 8071FA4
+ thumb_func_start SpriteCB_Egg_3
+SpriteCB_Egg_3: @ 8071FA4
push {lr}
adds r1, r0, 0
ldrh r0, [r1, 0x2E]
@@ -1367,7 +648,7 @@ sub_8071FA4: @ 8071FA4
asrs r0, 16
cmp r0, 0x32
ble _08071FBE
- ldr r0, =sub_8071FC8
+ ldr r0, =SpriteCB_Egg_4
str r0, [r1, 0x1C]
movs r0, 0
strh r0, [r1, 0x2E]
@@ -1375,10 +656,10 @@ _08071FBE:
pop {r0}
bx r0
.pool
- thumb_func_end sub_8071FA4
+ thumb_func_end SpriteCB_Egg_3
- thumb_func_start sub_8071FC8
-sub_8071FC8: @ 8071FC8
+ thumb_func_start SpriteCB_Egg_4
+SpriteCB_Egg_4: @ 8071FC8
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -1400,7 +681,7 @@ _08071FE8:
bhi _08072004
movs r4, 0
_08071FF0:
- bl sub_8072140
+ bl CreateRandomEggShardSprite
lsls r0, r4, 16
movs r1, 0x80
lsls r1, 9
@@ -1429,7 +710,7 @@ _08072004:
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
- ldr r0, =sub_8072048
+ ldr r0, =SpriteCB_Egg_5
str r0, [r5, 0x1C]
strh r4, [r5, 0x2E]
_08072032:
@@ -1438,10 +719,10 @@ _08072032:
pop {r0}
bx r0
.pool
- thumb_func_end sub_8071FC8
+ thumb_func_end SpriteCB_Egg_4
- thumb_func_start sub_8072048
-sub_8072048: @ 8072048
+ thumb_func_start SpriteCB_Egg_5
+SpriteCB_Egg_5: @ 8072048
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -1450,7 +731,7 @@ sub_8072048: @ 8072048
cmp r0, 0
bne _08072084
ldr r4, =gSprites
- ldr r3, =gUnknown_03000DE0
+ ldr r3, =gEggHatchData
ldr r0, [r3]
ldrb r1, [r0, 0x1]
lsls r0, r1, 4
@@ -1490,7 +771,7 @@ _0807209E:
cmp r0, 0x9
bgt _080720BC
ldr r2, =gSprites
- ldr r0, =gUnknown_03000DE0
+ ldr r0, =gEggHatchData
ldr r0, [r0]
ldrb r1, [r0, 0x1]
lsls r0, r1, 4
@@ -1516,10 +797,10 @@ _080720CA:
pop {r0}
bx r0
.pool
- thumb_func_end sub_8072048
+ thumb_func_end SpriteCB_Egg_5
- thumb_func_start sub_80720E8
-sub_80720E8: @ 80720E8
+ thumb_func_start SpriteCB_EggShard
+SpriteCB_EggShard: @ 80720E8
push {r4,lr}
adds r2, r0, 0
ldrh r0, [r2, 0x30]
@@ -1566,14 +847,14 @@ _0807213A:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80720E8
+ thumb_func_end SpriteCB_EggShard
- thumb_func_start sub_8072140
-sub_8072140: @ 8072140
+ thumb_func_start CreateRandomEggShardSprite
+CreateRandomEggShardSprite: @ 8072140
push {r4-r6,lr}
sub sp, 0x8
ldr r2, =gUnknown_0832C084
- ldr r0, =gUnknown_03000DE0
+ ldr r0, =gEggHatchData
ldr r6, [r0]
ldrb r3, [r6, 0x7]
lsls r0, r3, 2
@@ -1601,16 +882,16 @@ sub_8072140: @ 8072140
movs r1, 0x3C
adds r2, r5, 0
adds r3, r4, 0
- bl sub_8072194
+ bl CreateEggShardSprite
add sp, 0x8
pop {r4-r6}
pop {r0}
bx r0
.pool
- thumb_func_end sub_8072140
+ thumb_func_end CreateRandomEggShardSprite
- thumb_func_start sub_8072194
-sub_8072194: @ 8072194
+ thumb_func_start CreateEggShardSprite
+CreateEggShardSprite: @ 8072194
push {r4-r6,lr}
mov r6, r10
mov r5, r9
@@ -1670,7 +951,7 @@ sub_8072194: @ 8072194
pop {r0}
bx r0
.pool
- thumb_func_end sub_8072194
+ thumb_func_end CreateEggShardSprite
thumb_func_start sub_8072214
sub_8072214: @ 8072214
@@ -1697,7 +978,7 @@ sub_8072214: @ 8072214
adds r0, r5, 0
movs r1, 0xFF
bl FillWindowPixelBuffer
- ldr r3, =gUnknown_03000DE0
+ ldr r3, =gEggHatchData
ldr r0, [r3]
movs r2, 0
strb r2, [r0, 0xE]
diff --git a/asm/field_effect.s b/asm/field_effect.s
index c40098993..3e218e7db 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -1945,7 +1945,7 @@ sub_80B69DC: @ 80B69DC
push {lr}
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =mapldr_080842E8
str r0, [r1]
pop {r0}
@@ -1962,7 +1962,7 @@ mapldr_080842E8: @ 80B69FC
bl CreateTask
bl ScriptContext2_Enable
bl player_bitmagic
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
@@ -2012,7 +2012,7 @@ _080B6A64:
bl warp_in
ldr r0, =c2_load_new_map
bl SetMainCallback2
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =mapldr_08084390
str r0, [r1]
adds r0, r5, 0
@@ -2058,7 +2058,7 @@ mapldr_08084390: @ 80B6AA4
_080B6AE6:
bl ScriptContext2_Enable
bl player_bitmagic
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r4}
@@ -2120,7 +2120,7 @@ sub_80B6B68: @ 80B6B68
ldr r0, =sub_80B6B94
movs r1, 0
bl CreateTask
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
@@ -2761,7 +2761,7 @@ sub_80B7060: @ 80B7060
bne _080B709C
bl sub_80E1570
bl warp_in
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80B70B4
str r0, [r1]
ldr r0, =c2_load_new_map
@@ -2786,7 +2786,7 @@ sub_80B70B4: @ 80B70B4
ldr r0, =sub_80B70DC
movs r1, 0
bl CreateTask
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
@@ -3727,7 +3727,7 @@ sub_80B7814: @ 80B7814
cmp r0, 0x1
bne _080B784C
bl warp_in
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =mapldr_080851BC
str r0, [r1]
ldr r0, =c2_load_new_map
@@ -3750,7 +3750,7 @@ mapldr_080851BC: @ 80B7868
bl sub_8085784
bl pal_fill_for_maplights
bl ScriptContext2_Enable
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
movs r1, 0
str r1, [r0]
ldr r0, =sub_80B7890
@@ -4202,7 +4202,7 @@ sub_80B7BF4: @ 80B7BF4
cmp r0, 0x1
bne _080B7C2C
bl warp_in
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80B6B68
str r0, [r1]
ldr r0, =c2_load_new_map
@@ -4399,7 +4399,7 @@ _080B7D86:
bl FieldObjectSetDirection
bl sub_8084E14
bl warp_in
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =mapldr_080859D4
str r0, [r1]
ldr r0, =c2_load_new_map
@@ -4462,7 +4462,7 @@ mapldr_080859D4: @ 80B7E48
bl pal_fill_for_maplights
bl ScriptContext2_Enable
bl player_bitmagic
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r2, =gMapObjects
@@ -4885,7 +4885,7 @@ _080B81B8:
bl warp_in
ldr r0, =c2_load_new_map
bl SetMainCallback2
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =mapldr_08085D88
str r0, [r1]
ldr r0, =sub_80B7FDC
@@ -4907,7 +4907,7 @@ mapldr_08085D88: @ 80B8200
bl pal_fill_for_maplights
bl ScriptContext2_Enable
bl player_bitmagic
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r2, =gMapObjects
diff --git a/asm/field_screen.s b/asm/field_screen.s
index e30408654..13f418f17 100644
--- a/asm/field_screen.s
+++ b/asm/field_screen.s
@@ -8725,7 +8725,7 @@ sub_80AF734: @ 80AF734
bl play_some_sound
movs r0, 0x9
bl PlaySE
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =mapldr_default
str r1, [r0]
ldr r0, =sub_80AFA0C
@@ -8743,7 +8743,7 @@ sp13E_warp_to_last_warp: @ 80AF76C
bl music_something
bl sub_80AF0B4
bl play_some_sound
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =mapldr_default
str r1, [r0]
ldr r0, =sub_80AFA0C
@@ -8763,7 +8763,7 @@ sub_80AF79C: @ 80AF79C
movs r1, 0x8
bl fade_screen
bl play_some_sound
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_80AF3B0
str r1, [r0]
ldr r0, =sub_80AFA0C
@@ -8778,7 +8778,7 @@ sub_80AF79C: @ 80AF79C
sub_80AF7D0: @ 80AF7D0
push {lr}
bl ScriptContext2_Enable
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =mapldr_default
str r1, [r0]
ldr r0, =sub_80AFA88
@@ -8793,7 +8793,7 @@ sub_80AF7D0: @ 80AF7D0
sp13F_fall_to_last_warp: @ 80AF7F4
push {lr}
bl sp13E_warp_to_last_warp
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80B6B68
str r0, [r1]
pop {r0}
@@ -8847,7 +8847,7 @@ sub_80AF848: @ 80AF848
ldr r0, =sub_80AFA0C
movs r1, 0xA
bl CreateTask
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF3E8
str r0, [r1]
pop {r0}
@@ -8869,7 +8869,7 @@ sub_80AF87C: @ 80AF87C
ldr r0, =sub_80AFA0C
movs r1, 0xA
bl CreateTask
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF40C
str r0, [r1]
pop {r0}
@@ -8885,7 +8885,7 @@ sub_80AF8B8: @ 80AF8B8
ldr r0, =sub_80AFA0C
movs r1, 0xA
bl CreateTask
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80FB768
str r0, [r1]
pop {r0}
@@ -9328,7 +9328,7 @@ sub_80AFC60: @ 80AFC60
bl play_some_sound
movs r0, 0x9
bl PlaySE
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_80AF3C8
str r1, [r0]
ldr r0, =task0A_fade_n_map_maybe
@@ -10078,7 +10078,7 @@ sub_80B0244: @ 80B0244
ldr r0, =sub_80AFA0C
movs r1, 0xA
bl CreateTask
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF3E8
str r0, [r1]
pop {r0}
@@ -10090,7 +10090,7 @@ sub_80B0244: @ 80B0244
sub_80B0268: @ 80B0268
push {lr}
bl ScriptContext2_Enable
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =mapldr_default
str r1, [r0]
ldr r0, =sub_80B01BC
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 914fdf2b3..f3eefb7b9 100755
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -5744,7 +5744,7 @@ unknown_ItemMenu_Show: @ 81ADE38
thumb_func_start bag_menu_leave_maybe_3
bag_menu_leave_maybe_3: @ 81ADE6C
push {lr}
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_819FA50
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -5779,7 +5779,7 @@ unknown_ItemMenu_Give2: @ 81ADE8C
thumb_func_start bag_menu_leave_maybe_2
bag_menu_leave_maybe_2: @ 81ADEBC
push {lr}
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_818DEF4
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -5810,7 +5810,7 @@ unknown_ItemMenu_Confirm2: @ 81ADEDC
thumb_func_start bag_menu_leave_maybe
bag_menu_leave_maybe: @ 81ADF00
push {lr}
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_818E564
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
diff --git a/asm/item_use.s b/asm/item_use.s
index a2488b6df..f3086ae5f 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -77,7 +77,7 @@ SetUpItemUseOnFieldCallback: @ 80FD0DC
ldrsh r0, [r0, r1]
cmp r0, 0x1
beq _080FD110
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =MapPostLoadHook_UseItem
str r0, [r1]
adds r0, r2, 0
@@ -1477,7 +1477,7 @@ _080FDB98:
b _080FDBDA
.pool
_080FDBC8:
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_80AF6D4
str r1, [r0]
movs r0, 0x1
@@ -1630,7 +1630,7 @@ sub_80FDD10: @ 80FDD10
ldr r1, =gUnknown_0203A0F4
ldr r0, =sub_80FDD74
str r0, [r1]
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =MapPostLoadHook_UseItem
str r0, [r1]
ldr r0, =gUnknown_0203CE54
diff --git a/asm/learn_move.s b/asm/learn_move.s
index c2ef76350..2fd4a3a33 100755
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -49,7 +49,7 @@ sub_8160664: @ 8160664
bne _08160688
ldr r0, =sub_81606A0
bl SetMainCallback2
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
adds r0, r4, 0
diff --git a/asm/link.s b/asm/link.s
index 9ee94412d..42d24b53d 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -24689,7 +24689,7 @@ _08016502:
ldr r1, =gUnknown_02022C40
movs r0, 0x1
strh r0, [r1]
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF128
str r0, [r1]
ldr r1, =c2_exit_to_overworld_2_switch
@@ -24987,7 +24987,7 @@ _0801677E:
lsls r0, 22
lsrs r0, 22
strh r0, [r2]
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF128
str r0, [r1]
ldr r1, =c2_exit_to_overworld_2_switch
diff --git a/asm/party_menu.s b/asm/party_menu.s
index cf00d63c1..5d5783116 100755
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -17478,7 +17478,7 @@ sub_81B968C: @ 81B968C
str r0, [sp]
movs r0, 0x3
bl sub_81BF8EC
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
add sp, 0x4
diff --git a/asm/player_pc.s b/asm/player_pc.s
index 7f4ab354c..8cf0ee332 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -583,7 +583,7 @@ _0816B310:
thumb_func_start sub_816B31C
sub_816B31C: @ 816B31C
push {lr}
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =mapldr_080EBC0C
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -1276,7 +1276,7 @@ _0816B8E6:
thumb_func_start sub_816B900
sub_816B900: @ 816B900
push {lr}
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =pal_fill_for_maplights_or_black
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -1535,7 +1535,7 @@ _0816BB1C:
thumb_func_start sub_816BB28
sub_816BB28: @ 816BB28
push {lr}
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_816BB48
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index df90540e8..3aca5c92d 100755
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -870,7 +870,7 @@ sub_80C7678: @ 80C7678
bl sub_80CAEA0
ldr r1, =gUnknown_02039D00
strb r0, [r1]
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =mapldr_0808C6D8
str r0, [r1]
ldr r0, =c2_exit_to_overworld_2_switch
diff --git a/asm/rom4.s b/asm/rom4.s
index 9e4e9f108..4ec39325e 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -3136,12 +3136,12 @@ map_post_load_hook_exec: @ 8085EA0
_08085EBC:
movs r1, 0
str r1, [r4]
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
str r1, [r0]
b _08085EEA
.pool
_08085ECC:
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r0, [r0]
cmp r0, 0
beq _08085EE0
@@ -3151,7 +3151,7 @@ _08085ECC:
_08085EE0:
bl mapldr_default
_08085EE4:
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
_08085EEA:
@@ -3174,7 +3174,7 @@ CB2_NewGame: @ 8085EF8
bl PlayTimeCounter_Start
bl ScriptContext1_Init
bl ScriptContext2_Disable
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80FB4E0
str r0, [r1]
ldr r1, =gUnknown_03005DB0
@@ -3214,7 +3214,7 @@ c2_whiteout: @ 8085F58
bl player_avatar_init_params_reset
bl ScriptContext1_Init
bl ScriptContext2_Disable
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF3C8
str r0, [r1]
mov r1, sp
@@ -3304,7 +3304,7 @@ _08086062:
sub_8086074: @ 8086074
push {lr}
bl sub_808631C
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_80AF314
str r1, [r0]
ldr r0, =c2_80567AC
@@ -3399,12 +3399,12 @@ c2_8056854: @ 8086140
ldrb r0, [r0]
cmp r0, 0
beq _08086174
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF314
b _08086178
.pool
_08086174:
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF214
_08086178:
str r0, [r1]
@@ -3433,7 +3433,7 @@ sub_8086194: @ 8086194
sub_80861B0: @ 80861B0
push {lr}
bl sub_808631C
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF188
str r0, [r1]
bl c2_exit_to_overworld_2_switch
@@ -3446,7 +3446,7 @@ sub_80861B0: @ 80861B0
c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80861CC
push {lr}
bl sub_808631C
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
bl c2_exit_to_overworld_2_switch
@@ -3459,7 +3459,7 @@ c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80861CC
sub_80861E8: @ 80861E8
push {lr}
bl sub_808631C
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF3C8
str r0, [r1]
bl c2_exit_to_overworld_2_switch
@@ -3562,7 +3562,7 @@ _080862BE:
.pool
_080862F4:
bl sub_80EDB44
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_8086204
str r1, [r0]
ldr r0, =c1_overworld
diff --git a/asm/rom6.s b/asm/rom6.s
index c5e0265a0..1b1be36c7 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -1984,7 +1984,7 @@ sub_8136524: @ 8136524
lsrs r0, 24
cmp r0, 0x1
bhi _0813655A
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
_0813655A:
@@ -4651,7 +4651,7 @@ sub_8137C3C: @ 8137C3C
push {lr}
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =mapldr_080CA5C0
str r0, [r1]
pop {r0}
diff --git a/asm/roulette.s b/asm/roulette.s
index 5742e089f..009f30717 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -3273,7 +3273,7 @@ sub_8141E7C: @ 8141E7C
bl ResetPaletteFade
bl ResetSpriteData
bl sub_8140418
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
ldr r0, =c2_exit_to_overworld_2_switch
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 2188e634d..2e87a7419 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -686,7 +686,7 @@ _080E900C:
_080E9030:
bl sub_80E8F9C
bl warp_in
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =sub_80AF168
str r1, [r0]
ldr r0, =c2_load_new_map
@@ -863,7 +863,7 @@ sub_80E916C: @ 80E916C
adds r0, r5, 0
bl warp1_set
bl warp_in
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80E9108
str r0, [r1]
ldr r0, =c2_load_new_map
@@ -1486,7 +1486,7 @@ _080E96F4:
movs r0, 0x7E
bl copy_saved_warp2_bank_and_enter_x_to_warp1
bl warp_in
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =mapldr_default
str r1, [r0]
ldr r0, =c2_load_new_map
diff --git a/asm/shop.s b/asm/shop.s
index 9e03399fc..c79250a43 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -227,7 +227,7 @@ HandleShopMenuSell: @ 80DFC0C
@ int CB2_ExitSellMenu()
CB2_ExitSellMenu: @ 80DFC48
push {lr}
- ldr r0, =gUnknown_03005DAC
+ ldr r0, =gFieldCallback
ldr r1, =MapPostLoadHook_ExitBuyOrSellMenu
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@@ -2668,7 +2668,7 @@ ExitBuyMenu: @ 80E1168
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =MapPostLoadHook_ExitBuyOrSellMenu
str r0, [r1]
movs r0, 0x1
diff --git a/asm/trade.s b/asm/trade.s
index 3f9323971..bfe1695f9 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -14195,7 +14195,7 @@ sub_807F110: @ 807F110
bne _0807F134
ldr r0, =sub_807B270
bl SetMainCallback2
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
adds r0, r4, 0
diff --git a/asm/walda_phrase.s b/asm/walda_phrase.s
index 2f1f7da60..dd5f30049 100755
--- a/asm/walda_phrase.s
+++ b/asm/walda_phrase.s
@@ -70,7 +70,7 @@ _081D9A68:
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
- ldr r1, =gUnknown_03005DAC
+ ldr r1, =gFieldCallback
ldr r0, =sub_80AF168
str r0, [r1]
ldr r0, =c2_exit_to_overworld_2_switch
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 02:32:26 +0000