From 0b708aeadec55bcc0e9916e5c56ad50714995b98 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 17 Oct 2019 16:13:02 -0400 Subject: Initial trainers dump --- asm/battle_setup.s | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'asm') diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 5a9797056..3f8d7ec4f 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -2033,8 +2033,8 @@ sub_8080618: @ 8080618 bx r0 thumb_func_end sub_8080618 - thumb_func_start sub_8080628 -sub_8080628: @ 8080628 + thumb_func_start PlayTrainerEncounterMusic +PlayTrainerEncounterMusic: @ 8080628 push {lr} ldr r0, _08080660 @ =gUnknown_203ADFA ldrb r0, [r0] @@ -2083,15 +2083,18 @@ _08080670: .4byte _080806AE .4byte _080806AE _080806A8: + @ MUS_SHOUJO movs r0, 0x8E lsls r0, 1 b _080806BA _080806AE: + @ MUS_SHOUNEN ldr r0, _080806B4 @ =0x0000011d b _080806BA .align 2, 0 _080806B4: .4byte 0x0000011d _080806B8: + @ MUS_ROCKET ldr r0, _080806C4 @ =0x0000011b _080806BA: bl PlayNewMapMusic @@ -2100,7 +2103,7 @@ _080806BE: bx r0 .align 2, 0 _080806C4: .4byte 0x0000011b - thumb_func_end sub_8080628 + thumb_func_end PlayTrainerEncounterMusic thumb_func_start sub_80806C8 sub_80806C8: @ 80806C8 -- cgit v1.2.3 From c40fdc5eb6e97f4f26c6124d003203dfcf4767f6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 17 Oct 2019 22:32:06 -0400 Subject: Begin fresh dump of mystery_event_msg --- asm/macros/event.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'asm') diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 7ce50a5e1..83ae4f493 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1225,10 +1225,9 @@ .byte 0xb7 .endm - .macro setvaddress long, word + .macro setvaddress long .byte 0xb8 .4byte \long - .2byte \word .endm .macro vgoto pointer -- cgit v1.2.3 From a7b278ac2ddc0bb87530064585b47bbcabb3a157 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Oct 2019 09:59:41 -0400 Subject: Restore documentation to mystery_event_msg --- asm/field_specials.s | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'asm') diff --git a/asm/field_specials.s b/asm/field_specials.s index c0294fcac..a4df8b6ea 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -4329,8 +4329,8 @@ _080CC728: .4byte 0x00000808 _080CC72C: .4byte 0x0000404d thumb_func_end sub_80CC59C - thumb_func_start sub_80CC730 -sub_80CC730: @ 80CC730 + thumb_func_start Special_BattleCardAction +Special_BattleCardAction: @ 80CC730 push {lr} ldr r0, _080CC744 @ =gSpecialVar_Result ldrh r0, [r0] @@ -4371,6 +4371,7 @@ _080CC772: lsrs r0, 16 b _080CC78A _080CC77C: + @ AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c", 3873) ldr r0, _080CC790 @ =gUnknown_83F5EF0 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c" ldr r1, _080CC794 @ =0x00000f21 ldr r2, _080CC798 @ =gUnknown_83F5F24 "0" @@ -4384,7 +4385,7 @@ _080CC78A: _080CC790: .4byte gUnknown_83F5EF0 _080CC794: .4byte 0x00000f21 _080CC798: .4byte gUnknown_83F5F24 - thumb_func_end sub_80CC730 + thumb_func_end Special_BattleCardAction thumb_func_start set_unknown_box_id set_unknown_box_id: @ 80CC79C -- cgit v1.2.3 From a16d9af699f367458d6832377a2806659d303bbe Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Oct 2019 15:13:35 -0400 Subject: Document renewable_hidden_items --- asm/field_control_avatar.s | 2 +- asm/overworld.s | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'asm') diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 2caa5a7fd..aa66c7d5e 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -365,7 +365,7 @@ sub_806CAC8: @ 806CAC8 movs r0, 0x5 bl IncrementGameStat bl sub_8146CA4 - bl sub_815D8C8 + bl IncrementRenewableHiddenItemStepCounter bl sub_80CC918 bl sub_80CB054 bl sub_80CCFBC diff --git a/asm/overworld.s b/asm/overworld.s index bd5ab7500..d4993c154 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -1717,7 +1717,7 @@ sub_8055864: @ 8055864 bl sub_8055CB8 bl sav1_reset_battle_music_maybe bl mapheader_run_script_with_tag_x3 - bl sub_815D8F8 + bl TryRegenerateRenewableHiddenItems bl not_trainer_hill_battle_pyramid ldr r4, _0805591C @ =gMapHeader ldr r0, [r4] @@ -1794,7 +1794,7 @@ _08055974: bl sub_8055CB8 bl sav1_reset_battle_music_maybe bl mapheader_run_script_with_tag_x3 - bl sub_815D8F8 + bl TryRegenerateRenewableHiddenItems bl UpdateLocationHistoryForRoamer bl RoamerMoveToOtherLocationSet bl sub_8110920 -- cgit v1.2.3 From 7ac60bc3afec848530721dc19d2c1a9ff10ea3a5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Oct 2019 16:18:34 -0400 Subject: Dump map object graphics info, 1 --- asm/field_map_obj.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm') diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 2b16f5e1f..57f7fbe1c 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -2774,14 +2774,14 @@ _0805F2E0: bls _0805F2E6 movs r1, 0x10 _0805F2E6: - ldr r0, _0805F2F4 @ =gUnknown_839FDB0 + ldr r0, _0805F2F4 @ =gMapObjectGraphicsInfoPointers lsls r1, 2 adds r1, r0 ldr r0, [r1] pop {r1} bx r1 .align 2, 0 -_0805F2F4: .4byte gUnknown_839FDB0 +_0805F2F4: .4byte gMapObjectGraphicsInfoPointers thumb_func_end GetFieldObjectGraphicsInfo thumb_func_start FieldObjectHandleDynamicGraphicsId -- cgit v1.2.3 From 9d8c5b22506ee867785012db89a9ab1c3006179a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 22:37:08 -0400 Subject: Two additional script macros --- asm/macros/event.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'asm') diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 83ae4f493..98910b1cc 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1441,3 +1441,14 @@ setorcopyvar 0x8002, \fanfare callstd 9 .endm + + .macro famechecker person, index + setvar VAR_0x8004, \person + setvar VAR_0x8005, \index + special SetFlavorTextFlagFromSpecialVars + .endm + + .macro set_gym_trainers gym + setvar VAR_0x8008, \gym + call EventScript_1A6B18 + .endm -- cgit v1.2.3 From 2aeefdc5de73c630a79b183e7bc2a66ad48ed424 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 20 Oct 2019 20:20:45 -0400 Subject: update famechecker macro --- asm/macros/event.inc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'asm') diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 98910b1cc..0b5ab8915 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -37,6 +37,13 @@ .4byte \destination .endm + lt = 0 + eq = 1 + gt = 2 + le = 3 + ge = 4 + ne = 5 + @ If the result of the last comparison matches condition (see Comparison operators), calls destination. .macro call_if condition, destination .byte 0x07 @@ -1442,13 +1449,13 @@ callstd 9 .endm - .macro famechecker person, index + .macro famechecker person:req, index:req, function=SetFlavorTextFlagFromSpecialVars setvar VAR_0x8004, \person setvar VAR_0x8005, \index - special SetFlavorTextFlagFromSpecialVars + special \function .endm - .macro set_gym_trainers gym + .macro set_gym_trainers gym:req setvar VAR_0x8008, \gym call EventScript_1A6B18 .endm -- cgit v1.2.3 From 6b503e306d73c749794cf7b61126287e3941f12f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 20 Oct 2019 20:38:23 -0400 Subject: script switch/case; name script conditionals --- asm/macros/event.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm') diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 0b5ab8915..21e3e65c0 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1412,7 +1412,7 @@ @ Supplementary .macro goto_if_eq dest - goto_if 1, \dest + goto_if eq, \dest .endm .macro switch var -- cgit v1.2.3 From 9aa5709329f4cbd497d0f21af10218f8a7547151 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 20 Oct 2019 21:24:16 -0400 Subject: use TRUE and FALSE for flag conditionals; more story flags --- asm/field_specials.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asm') diff --git a/asm/field_specials.s b/asm/field_specials.s index a4df8b6ea..3bcc47ce6 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -1081,8 +1081,8 @@ sub_80CADC4: @ 80CADC4 bx r0 thumb_func_end sub_80CADC4 - thumb_func_start sub_80CADEC -sub_80CADEC: @ 80CADEC + thumb_func_start Special_SetVermilionTrashCans +Special_SetVermilionTrashCans: @ 80CADEC push {r4,r5,lr} bl Random lsls r0, 16 @@ -1377,7 +1377,7 @@ _080CB04C: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80CADEC + thumb_func_end Special_SetVermilionTrashCans thumb_func_start sub_80CB054 sub_80CB054: @ 80CB054 -- cgit v1.2.3 From a1bddb8f8c3f43d0942e2874f9d873d4bcf05371 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 09:58:14 -0400 Subject: Remaining story flags referenced in event scripts --- asm/field_specials.s | 8 +++++--- asm/party_menu.s | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'asm') diff --git a/asm/field_specials.s b/asm/field_specials.s index 3bcc47ce6..85baed06e 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -5616,8 +5616,10 @@ _080CD14C: bx r1 thumb_func_end sub_80CD0F4 - thumb_func_start sub_80CD154 -sub_80CD154: @ 80CD154 + @ Determines which of Lorelei's doll collection to show + @ based on how many times you've entered the Hall of Fame. + thumb_func_start Special_ComputeLoreleiDollCollection +Special_ComputeLoreleiDollCollection: @ 80CD154 push {r4,lr} movs r0, 0xA bl GetGameStat @@ -5664,7 +5666,7 @@ _080CD1AE: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80CD154 + thumb_func_end Special_ComputeLoreleiDollCollection thumb_func_start sub_80CD1B4 sub_80CD1B4: @ 80CD1B4 diff --git a/asm/party_menu.s b/asm/party_menu.s index ab17008ec..52a1aec97 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -4345,7 +4345,7 @@ _08120BD0: lsls r0, 1 b _08120BDE _08120BD6: - ldr r0, _08120BE4 @ =gUnknown_8459B60 + ldr r0, _08120BE4 @ =gMoveTutorMoves lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -4353,7 +4353,7 @@ _08120BDE: pop {r1} bx r1 .align 2, 0 -_08120BE4: .4byte gUnknown_8459B60 +_08120BE4: .4byte gMoveTutorMoves thumb_func_end sub_8120BA8 thumb_func_start sub_8120BE8 -- cgit v1.2.3 From 3a910078c149950c498309ba80cc0989eaab80a4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 12:08:37 -0400 Subject: Rename routines and objects related to move tutor --- asm/party_menu.s | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'asm') diff --git a/asm/party_menu.s b/asm/party_menu.s index 52a1aec97..946d184e6 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -4284,7 +4284,7 @@ _08120B64: lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 - bl sub_8120BE8 + bl IsMonCompatibleWithMoveTutorMove lsls r0, 24 cmp r0, 0 bne _08120B80 @@ -4293,7 +4293,7 @@ _08120B7C: b _08120B9E _08120B80: mov r0, r8 - bl sub_8120BA8 + bl GetMoveTutorMove _08120B86: lsls r0, 16 lsrs r1, r0, 16 @@ -4315,8 +4315,8 @@ _08120B9E: bx r1 thumb_func_end sub_8120B20 - thumb_func_start sub_8120BA8 -sub_8120BA8: @ 8120BA8 + thumb_func_start GetMoveTutorMove +GetMoveTutorMove: @ 8120BA8 push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -4333,16 +4333,16 @@ _08120BBC: b _08120BD6 _08120BC2: movs r0, 0xA9 - lsls r0, 1 + lsls r0, 1 @ MOVE_FRENZY_PLANT b _08120BDE _08120BC8: - ldr r0, _08120BCC @ =0x00000133 + ldr r0, _08120BCC @ =0x00000133 @ MOVE_BLAST_BURN b _08120BDE .align 2, 0 _08120BCC: .4byte 0x00000133 _08120BD0: movs r0, 0x9A - lsls r0, 1 + lsls r0, 1 @ MOVE_HYDRO_CANNON b _08120BDE _08120BD6: ldr r0, _08120BE4 @ =gMoveTutorMoves @@ -4354,10 +4354,10 @@ _08120BDE: bx r1 .align 2, 0 _08120BE4: .4byte gMoveTutorMoves - thumb_func_end sub_8120BA8 + thumb_func_end GetMoveTutorMove - thumb_func_start sub_8120BE8 -sub_8120BE8: @ 8120BE8 + thumb_func_start IsMonCompatibleWithMoveTutorMove +IsMonCompatibleWithMoveTutorMove: @ 8120BE8 push {lr} lsls r0, 16 lsrs r0, 16 @@ -4375,19 +4375,19 @@ _08120C00: beq _08120C12 b _08120C18 _08120C06: - cmp r0, 0x3 + cmp r0, 3 @ SPECIES_VENUSAUR beq _08120C34 b _08120C2A _08120C0C: - cmp r0, 0x6 + cmp r0, 6 @ SPECIES_CHARIZARD beq _08120C34 b _08120C2A _08120C12: - cmp r0, 0x9 + cmp r0, 9 @ SPECIES_BLASTOISE beq _08120C34 b _08120C2A _08120C18: - ldr r1, _08120C30 @ =gUnknown_8459B7E + ldr r1, _08120C30 @ =gMoveTutorMoveCompatibilityTable lsls r0, 1 adds r0, r1 ldrh r0, [r0] @@ -4400,13 +4400,13 @@ _08120C2A: movs r0, 0 b _08120C36 .align 2, 0 -_08120C30: .4byte gUnknown_8459B7E +_08120C30: .4byte gMoveTutorMoveCompatibilityTable _08120C34: movs r0, 0x1 _08120C36: pop {r1} bx r1 - thumb_func_end sub_8120BE8 + thumb_func_end IsMonCompatibleWithMoveTutorMove thumb_func_start sub_8120C3C sub_8120C3C: @ 8120C3C @@ -16549,7 +16549,7 @@ sub_8126DC8: @ 8126DC8 bl GetMonNickname ldr r4, _08126E5C @ =gSpecialVar_0x8005 ldrb r0, [r4] - bl sub_8120BA8 + bl GetMoveTutorMove strh r0, [r7, 0xE] ldr r0, _08126E60 @ =gStringVar2 movs r1, 0xE -- cgit v1.2.3 From 629b9268e16ad3180dd32554d9d78bd97296a849 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 12:30:57 -0400 Subject: Name massage step counter --- asm/field_specials.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asm') diff --git a/asm/field_specials.s b/asm/field_specials.s index 85baed06e..cef042cf1 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -4611,8 +4611,8 @@ _080CC940: .4byte 0x00004025 _080CC944: .4byte 0x000001f3 thumb_func_end sub_80CC918 - thumb_func_start sub_80CC948 -sub_80CC948: @ 80CC948 + thumb_func_start Special_DaisyMassageServices +Special_DaisyMassageServices: @ 80CC948 push {lr} ldr r0, _080CC968 @ =gSpecialVar_0x8004 ldrh r1, [r0] @@ -4631,7 +4631,7 @@ sub_80CC948: @ 80CC948 _080CC968: .4byte gSpecialVar_0x8004 _080CC96C: .4byte gPlayerParty _080CC970: .4byte 0x00004025 - thumb_func_end sub_80CC948 + thumb_func_end Special_DaisyMassageServices thumb_func_start sub_80CC974 sub_80CC974: @ 80CC974 -- cgit v1.2.3 From c5db70322987a977f5b15d7a04a5a3e8cc080724 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 13:34:31 -0400 Subject: Update hidden item json fields --- asm/macros/map.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm') diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 075993fd3..d903899fe 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -55,8 +55,8 @@ inc _num_signs .endm - .macro bg_hidden_item_event x, y, height, item, flag, unknown - bg_event \x, \y, \height, 7, 0, \item, \flag, \unknown + .macro bg_hidden_item_event x, y, height, item, flag, quantity, underfoot + bg_event \x, \y, \height, 7, 0, \item, \flag, \quantity | (\underfoot << 7) .endm .macro map_events npcs, warps, traps, signs -- cgit v1.2.3 From 10ef6706080e519285dc9f4091a5f9af6855961f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 15:44:09 -0400 Subject: Documentation for start-of-credits script --- asm/field_specials.s | 12 ++++++------ asm/script_pokemon_util_80BF8FC.s | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'asm') diff --git a/asm/field_specials.s b/asm/field_specials.s index cef042cf1..34b6f8b75 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -581,8 +581,8 @@ _080CAA2C: .4byte 0x0000028f _080CAA30: .4byte gSaveBlock1Ptr thumb_func_end sub_80CA9A8 - thumb_func_start SpawnScriptFieldObject -SpawnScriptFieldObject: @ 80CAA34 + thumb_func_start SpawnCameraObject +SpawnCameraObject: @ 80CAA34 push {lr} sub sp, 0x8 ldr r0, _080CAA80 @ =gSaveBlock1Ptr @@ -621,10 +621,10 @@ SpawnScriptFieldObject: @ 80CAA34 .align 2, 0 _080CAA80: .4byte gSaveBlock1Ptr _080CAA84: .4byte gMapObjects - thumb_func_end SpawnScriptFieldObject + thumb_func_end SpawnCameraObject - thumb_func_start RemoveScriptFieldObject -RemoveScriptFieldObject: @ 80CAA88 + thumb_func_start RemoveCameraObject +RemoveCameraObject: @ 80CAA88 push {lr} bl GetPlayerAvatarObjectId lsls r0, 24 @@ -640,7 +640,7 @@ RemoveScriptFieldObject: @ 80CAA88 bx r0 .align 2, 0 _080CAAA8: .4byte gSaveBlock1Ptr - thumb_func_end RemoveScriptFieldObject + thumb_func_end RemoveCameraObject thumb_func_start sub_80CAAAC sub_80CAAAC: @ 80CAAAC diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 297d09e9a..32eb732b8 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80BF8FC -sub_80BF8FC: @ 80BF8FC + thumb_func_start Special_ChooseMonToDeleteMove +Special_ChooseMonToDeleteMove: @ 80BF8FC push {lr} sub sp, 0x4 bl ScriptContext2_Enable @@ -34,7 +34,7 @@ sub_80BF8FC: @ 80BF8FC .align 2, 0 _080BF934: .4byte sub_80BF97C _080BF938: .4byte gTasks - thumb_func_end sub_80BF8FC + thumb_func_end Special_ChooseMonToDeleteMove thumb_func_start sub_80BF93C sub_80BF93C: @ 80BF93C @@ -100,8 +100,8 @@ _080BF9B4: .4byte gPaletteFade _080BF9B8: .4byte gTasks thumb_func_end sub_80BF97C - thumb_func_start sub_80BF9BC -sub_80BF9BC: @ 80BF9BC + thumb_func_start Special_ChooseMoveToDelete +Special_ChooseMoveToDelete: @ 80BF9BC push {r4,lr} sub sp, 0x4 ldr r0, _080BF9F0 @ =gPlayerParty @@ -132,7 +132,7 @@ _080BF9F8: .4byte gPlayerPartyCount _080BF9FC: .4byte CB2_ReturnToField _080BFA00: .4byte gFieldCallback _080BFA04: .4byte FieldCallback_ReturnToEventScript2 - thumb_func_end sub_80BF9BC + thumb_func_end Special_ChooseMoveToDelete thumb_func_start ScrSpecial_CountPokemonMoves ScrSpecial_CountPokemonMoves: @ 80BFA08 @@ -333,8 +333,8 @@ sub_80BFAA8: @ 80BFAA8 _080BFBA4: .4byte gPPUpGetMask thumb_func_end sub_80BFAA8 - thumb_func_start sub_80BFBA8 -sub_80BFBA8: @ 80BFBA8 + thumb_func_start Special_DeleteSelectedMove +Special_DeleteSelectedMove: @ 80BFBA8 push {r4-r6,lr} mov r6, r8 push {r6} @@ -385,7 +385,7 @@ _080BFBFC: _080BFC08: .4byte gSpecialVar_0x8004 _080BFC0C: .4byte gPlayerParty _080BFC10: .4byte gSpecialVar_0x8005 - thumb_func_end sub_80BFBA8 + thumb_func_end Special_DeleteSelectedMove thumb_func_start sub_80BFC14 sub_80BFC14: @ 80BFC14 -- cgit v1.2.3 From a41b6329e39b09b5a9821dec9d1776229666cf6d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 15:46:06 -0400 Subject: Fix name of a field special --- asm/script_pokemon_util_80BF8FC.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asm') diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 32eb732b8..bf461b039 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -5,8 +5,8 @@ .text - thumb_func_start Special_ChooseMonToDeleteMove -Special_ChooseMonToDeleteMove: @ 80BF8FC + thumb_func_start Special_ChooseMonFromParty +Special_ChooseMonFromParty: @ 80BF8FC push {lr} sub sp, 0x4 bl ScriptContext2_Enable @@ -34,7 +34,7 @@ Special_ChooseMonToDeleteMove: @ 80BF8FC .align 2, 0 _080BF934: .4byte sub_80BF97C _080BF938: .4byte gTasks - thumb_func_end Special_ChooseMonToDeleteMove + thumb_func_end Special_ChooseMonFromParty thumb_func_start sub_80BF93C sub_80BF93C: @ 80BF93C -- cgit v1.2.3 From 8df72e4da6223f5d284029cb8503850523978a76 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 19:03:38 -0400 Subject: Document battle outcome checks in scripts --- asm/field_specials.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asm') diff --git a/asm/field_specials.s b/asm/field_specials.s index 34b6f8b75..1fec988f4 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -176,14 +176,14 @@ _080CA744: .4byte gStringVar1 _080CA748: .4byte gUnknown_8417FCC thumb_func_end sub_80CA714 - thumb_func_start sub_80CA74C -sub_80CA74C: @ 80CA74C + thumb_func_start Special_GetBattleOutcome +Special_GetBattleOutcome: @ 80CA74C ldr r0, _080CA754 @ =gBattleOutcome ldrb r0, [r0] bx lr .align 2, 0 _080CA754: .4byte gBattleOutcome - thumb_func_end sub_80CA74C + thumb_func_end Special_GetBattleOutcome thumb_func_start Special_SetHiddenItemFlag Special_SetHiddenItemFlag: @ 80CA758 -- cgit v1.2.3 From 6ee1bd06218bd80ca9cce754d34ba8cdd9701dc8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 21:15:54 -0400 Subject: Decompile event_data.s --- asm/event_data.s | 867 --------------------------------------------------- asm/field_specials.s | 8 +- 2 files changed, 4 insertions(+), 871 deletions(-) delete mode 100644 asm/event_data.s (limited to 'asm') diff --git a/asm/event_data.s b/asm/event_data.s deleted file mode 100644 index f4aa51496..000000000 --- a/asm/event_data.s +++ /dev/null @@ -1,867 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start InitEventData -InitEventData: @ 806E0D0 - push {r4,lr} - ldr r4, _0806E108 @ =gSaveBlock1Ptr - ldr r0, [r4] - movs r1, 0xEE - lsls r1, 4 - adds r0, r1 - movs r2, 0x90 - lsls r2, 1 - movs r1, 0 - bl memset - ldr r0, [r4] - movs r1, 0x80 - lsls r1, 5 - adds r0, r1 - movs r2, 0x80 - lsls r2, 2 - movs r1, 0 - bl memset - ldr r0, _0806E10C @ =gUnknown_20370E0 - movs r1, 0 - movs r2, 0x10 - bl memset - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0806E108: .4byte gSaveBlock1Ptr -_0806E10C: .4byte gUnknown_20370E0 - thumb_func_end InitEventData - - thumb_func_start sub_806E110 -sub_806E110: @ 806E110 - push {lr} - ldr r0, _0806E150 @ =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0xEE - lsls r1, 4 - adds r2, r0, r1 - movs r1, 0 - str r1, [r2] - movs r1, 0x80 - lsls r1, 5 - adds r0, r1 - movs r1, 0 - movs r2, 0x20 - bl memset - ldr r0, _0806E154 @ =0x00000803 - bl FlagClear - ldr r0, _0806E158 @ =0x00000804 - bl FlagClear - ldr r0, _0806E15C @ =0x00000805 - bl FlagClear - ldr r0, _0806E160 @ =0x00000807 - bl FlagClear - ldr r0, _0806E164 @ =0x00000842 - bl FlagClear - pop {r0} - bx r0 - .align 2, 0 -_0806E150: .4byte gSaveBlock1Ptr -_0806E154: .4byte 0x00000803 -_0806E158: .4byte 0x00000804 -_0806E15C: .4byte 0x00000805 -_0806E160: .4byte 0x00000807 -_0806E164: .4byte 0x00000842 - thumb_func_end sub_806E110 - - thumb_func_start sub_806E168 -sub_806E168: @ 806E168 - push {lr} - ldr r0, _0806E184 @ =0x0000403c - bl GetVarPointer - ldr r1, _0806E188 @ =gSaveBlock2Ptr - ldr r2, [r1] - movs r1, 0 - strb r1, [r2, 0x1A] - strh r1, [r0] - ldr r0, _0806E18C @ =0x00000838 - bl FlagClear - pop {r0} - bx r0 - .align 2, 0 -_0806E184: .4byte 0x0000403c -_0806E188: .4byte gSaveBlock2Ptr -_0806E18C: .4byte 0x00000838 - thumb_func_end sub_806E168 - - thumb_func_start sub_806E190 -sub_806E190: @ 806E190 - push {lr} - ldr r0, _0806E1B0 @ =0x0000403c - bl GetVarPointer - ldr r1, _0806E1B4 @ =gSaveBlock2Ptr - ldr r2, [r1] - movs r1, 0xDA - strb r1, [r2, 0x1A] - ldr r2, _0806E1B8 @ =0x00000302 - adds r1, r2, 0 - strh r1, [r0] - ldr r0, _0806E1BC @ =0x00000838 - bl FlagSet - pop {r0} - bx r0 - .align 2, 0 -_0806E1B0: .4byte 0x0000403c -_0806E1B4: .4byte gSaveBlock2Ptr -_0806E1B8: .4byte 0x00000302 -_0806E1BC: .4byte 0x00000838 - thumb_func_end sub_806E190 - - thumb_func_start sub_806E1C0 -sub_806E1C0: @ 806E1C0 - push {lr} - ldr r0, _0806E1EC @ =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x1A] - cmp r0, 0xDA - bne _0806E1FC - ldr r0, _0806E1F0 @ =0x0000403c - bl VarGet - lsls r0, 16 - ldr r1, _0806E1F4 @ =0x03020000 - cmp r0, r1 - bne _0806E1FC - ldr r0, _0806E1F8 @ =0x00000838 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0806E1FC - movs r0, 0x1 - b _0806E1FE - .align 2, 0 -_0806E1EC: .4byte gSaveBlock2Ptr -_0806E1F0: .4byte 0x0000403c -_0806E1F4: .4byte 0x03020000 -_0806E1F8: .4byte 0x00000838 -_0806E1FC: - movs r0, 0 -_0806E1FE: - pop {r1} - bx r1 - thumb_func_end sub_806E1C0 - - thumb_func_start sub_806E204 -sub_806E204: @ 806E204 - push {lr} - ldr r0, _0806E224 @ =0x0000404e - bl GetVarPointer - ldr r1, _0806E228 @ =gSaveBlock2Ptr - ldr r2, [r1] - movs r1, 0 - strb r1, [r2, 0x1B] - strh r1, [r0] - movs r0, 0x84 - lsls r0, 4 - bl FlagClear - pop {r0} - bx r0 - .align 2, 0 -_0806E224: .4byte 0x0000404e -_0806E228: .4byte gSaveBlock2Ptr - thumb_func_end sub_806E204 - - thumb_func_start EnableNationalPokedex -EnableNationalPokedex: @ 806E22C - push {lr} - ldr r0, _0806E250 @ =0x0000404e - bl GetVarPointer - ldr r1, _0806E254 @ =gSaveBlock2Ptr - ldr r2, [r1] - movs r1, 0xB9 - strb r1, [r2, 0x1B] - ldr r2, _0806E258 @ =0x00006258 - adds r1, r2, 0 - strh r1, [r0] - movs r0, 0x84 - lsls r0, 4 - bl FlagSet - pop {r0} - bx r0 - .align 2, 0 -_0806E250: .4byte 0x0000404e -_0806E254: .4byte gSaveBlock2Ptr -_0806E258: .4byte 0x00006258 - thumb_func_end EnableNationalPokedex - - thumb_func_start IsNationalPokedexEnabled -IsNationalPokedexEnabled: @ 806E25C - push {lr} - ldr r0, _0806E288 @ =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x1B] - cmp r0, 0xB9 - bne _0806E294 - ldr r0, _0806E28C @ =0x0000404e - bl VarGet - lsls r0, 16 - ldr r1, _0806E290 @ =0x62580000 - cmp r0, r1 - bne _0806E294 - movs r0, 0x84 - lsls r0, 4 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0806E294 - movs r0, 0x1 - b _0806E296 - .align 2, 0 -_0806E288: .4byte gSaveBlock2Ptr -_0806E28C: .4byte 0x0000404e -_0806E290: .4byte 0x62580000 -_0806E294: - movs r0, 0 -_0806E296: - pop {r1} - bx r1 - thumb_func_end IsNationalPokedexEnabled - - thumb_func_start sub_806E29C -sub_806E29C: @ 806E29C - push {lr} - ldr r0, _0806E2A8 @ =0x00000839 - bl FlagClear - pop {r0} - bx r0 - .align 2, 0 -_0806E2A8: .4byte 0x00000839 - thumb_func_end sub_806E29C - - thumb_func_start sub_806E2AC -sub_806E2AC: @ 806E2AC - push {lr} - ldr r0, _0806E2B8 @ =0x00000839 - bl FlagSet - pop {r0} - bx r0 - .align 2, 0 -_0806E2B8: .4byte 0x00000839 - thumb_func_end sub_806E2AC - - thumb_func_start Flag_0x839_IsSet -Flag_0x839_IsSet: @ 806E2BC - push {lr} - ldr r0, _0806E2CC @ =0x00000839 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_0806E2CC: .4byte 0x00000839 - thumb_func_end Flag_0x839_IsSet - - thumb_func_start sub_806E2D0 -sub_806E2D0: @ 806E2D0 - push {lr} - movs r0, 0xF6 - lsls r0, 2 - bl FlagClear - ldr r0, _0806E340 @ =0x000003d9 - bl FlagClear - ldr r0, _0806E344 @ =0x000003da - bl FlagClear - ldr r0, _0806E348 @ =0x000003db - bl FlagClear - movs r0, 0xF7 - lsls r0, 2 - bl FlagClear - ldr r0, _0806E34C @ =0x000003dd - bl FlagClear - ldr r0, _0806E350 @ =0x000003de - bl FlagClear - ldr r0, _0806E354 @ =0x000003df - bl FlagClear - movs r0, 0xF8 - lsls r0, 2 - bl FlagClear - ldr r0, _0806E358 @ =0x000003e1 - bl FlagClear - ldr r0, _0806E35C @ =0x000003e2 - bl FlagClear - ldr r0, _0806E360 @ =0x000003e3 - bl FlagClear - movs r0, 0xF9 - lsls r0, 2 - bl FlagClear - ldr r0, _0806E364 @ =0x000003e5 - bl FlagClear - ldr r0, _0806E368 @ =0x000003e6 - bl FlagClear - ldr r0, _0806E36C @ =0x000003e7 - bl FlagClear - pop {r0} - bx r0 - .align 2, 0 -_0806E340: .4byte 0x000003d9 -_0806E344: .4byte 0x000003da -_0806E348: .4byte 0x000003db -_0806E34C: .4byte 0x000003dd -_0806E350: .4byte 0x000003de -_0806E354: .4byte 0x000003df -_0806E358: .4byte 0x000003e1 -_0806E35C: .4byte 0x000003e2 -_0806E360: .4byte 0x000003e3 -_0806E364: .4byte 0x000003e5 -_0806E368: .4byte 0x000003e6 -_0806E36C: .4byte 0x000003e7 - thumb_func_end sub_806E2D0 - - thumb_func_start sub_806E370 -sub_806E370: @ 806E370 - push {lr} - ldr r0, _0806E3C0 @ =0x000040b5 - movs r1, 0 - bl VarSet - ldr r0, _0806E3C4 @ =0x000040b6 - movs r1, 0 - bl VarSet - ldr r0, _0806E3C8 @ =0x000040b7 - movs r1, 0 - bl VarSet - ldr r0, _0806E3CC @ =0x000040b8 - movs r1, 0 - bl VarSet - ldr r0, _0806E3D0 @ =0x000040b9 - movs r1, 0 - bl VarSet - ldr r0, _0806E3D4 @ =0x000040ba - movs r1, 0 - bl VarSet - ldr r0, _0806E3D8 @ =0x000040bb - movs r1, 0 - bl VarSet - ldr r0, _0806E3DC @ =0x000040bc - movs r1, 0 - bl VarSet - ldr r0, _0806E3E0 @ =0x00004024 - movs r1, 0 - bl VarSet - pop {r0} - bx r0 - .align 2, 0 -_0806E3C0: .4byte 0x000040b5 -_0806E3C4: .4byte 0x000040b6 -_0806E3C8: .4byte 0x000040b7 -_0806E3CC: .4byte 0x000040b8 -_0806E3D0: .4byte 0x000040b9 -_0806E3D4: .4byte 0x000040ba -_0806E3D8: .4byte 0x000040bb -_0806E3DC: .4byte 0x000040bc -_0806E3E0: .4byte 0x00004024 - thumb_func_end sub_806E370 - - thumb_func_start DisableResetRTC -DisableResetRTC: @ 806E3E4 - push {lr} - ldr r0, _0806E3F8 @ =0x00004032 - movs r1, 0 - bl VarSet - ldr r0, _0806E3FC @ =0x00000837 - bl FlagClear - pop {r0} - bx r0 - .align 2, 0 -_0806E3F8: .4byte 0x00004032 -_0806E3FC: .4byte 0x00000837 - thumb_func_end DisableResetRTC - - thumb_func_start EnableResetRTC -EnableResetRTC: @ 806E400 - push {lr} - ldr r0, _0806E418 @ =0x00004032 - movs r1, 0x92 - lsls r1, 4 - bl VarSet - ldr r0, _0806E41C @ =0x00000837 - bl FlagSet - pop {r0} - bx r0 - .align 2, 0 -_0806E418: .4byte 0x00004032 -_0806E41C: .4byte 0x00000837 - thumb_func_end EnableResetRTC - - thumb_func_start CanResetRTC -CanResetRTC: @ 806E420 - push {lr} - ldr r0, _0806E444 @ =0x00000837 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0806E44C - ldr r0, _0806E448 @ =0x00004032 - bl VarGet - lsls r0, 16 - movs r1, 0x92 - lsls r1, 20 - cmp r0, r1 - bne _0806E44C - movs r0, 0x1 - b _0806E44E - .align 2, 0 -_0806E444: .4byte 0x00000837 -_0806E448: .4byte 0x00004032 -_0806E44C: - movs r0, 0 -_0806E44E: - pop {r1} - bx r1 - thumb_func_end CanResetRTC - - thumb_func_start GetVarPointer -GetVarPointer: @ 806E454 - push {r4-r6,lr} - lsls r0, 16 - lsrs r4, r0, 16 - adds r6, r4, 0 - ldr r0, _0806E468 @ =0x00003fff - cmp r4, r0 - bhi _0806E46C - movs r0, 0 - b _0806E518 - .align 2, 0 -_0806E468: .4byte 0x00003fff -_0806E46C: - lsls r0, r4, 16 - cmp r0, 0 - blt _0806E50C - ldr r0, _0806E484 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x1 - beq _0806E488 - cmp r0, 0x1 - ble _0806E4EE - cmp r0, 0x2 - beq _0806E4B8 - b _0806E4EE - .align 2, 0 -_0806E484: .4byte gUnknown_3005E88 -_0806E488: - movs r0, 0 - adds r1, r4, 0 - bl sub_8112D40 - adds r2, r0, 0 - cmp r2, 0 - beq _0806E4EE - ldr r0, _0806E4B0 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r3, _0806E4B4 @ =0xffffc000 - adds r0, r4, r3 - lsls r0, 1 - movs r3, 0x80 - lsls r3, 5 - adds r1, r3 - adds r1, r0 - ldrh r0, [r2] - strh r0, [r1] - b _0806E4EE - .align 2, 0 -_0806E4B0: .4byte gSaveBlock1Ptr -_0806E4B4: .4byte 0xffffc000 -_0806E4B8: - ldr r0, _0806E4FC @ =0xffffc000 - adds r5, r4, r0 - lsls r0, r5, 16 - lsrs r0, 16 - movs r1, 0x1 - bl sub_806E528 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0806E4EE - ldr r0, _0806E500 @ =gUnknown_300507C - strh r5, [r0] - ldr r0, _0806E504 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r2, _0806E4FC @ =0xffffc000 - adds r0, r4, r2 - lsls r0, 1 - movs r3, 0x80 - lsls r3, 5 - adds r1, r3 - adds r1, r0 - ldrh r2, [r1] - movs r0, 0 - adds r1, r4, 0 - bl sub_8112DB0 -_0806E4EE: - ldr r0, _0806E504 @ =gSaveBlock1Ptr - lsls r1, r6, 1 - ldr r2, _0806E508 @ =0xffff9000 - adds r1, r2 - ldr r0, [r0] - adds r0, r1 - b _0806E518 - .align 2, 0 -_0806E4FC: .4byte 0xffffc000 -_0806E500: .4byte gUnknown_300507C -_0806E504: .4byte gSaveBlock1Ptr -_0806E508: .4byte 0xffff9000 -_0806E50C: - ldr r0, _0806E520 @ =gSpecialVars - ldr r3, _0806E524 @ =0xffff8000 - adds r1, r6, r3 - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] -_0806E518: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_0806E520: .4byte gSpecialVars -_0806E524: .4byte 0xffff8000 - thumb_func_end GetVarPointer - - thumb_func_start sub_806E528 -sub_806E528: @ 806E528 - push {lr} - lsls r0, 16 - lsrs r2, r0, 16 - adds r0, r2, 0 - lsls r1, 24 - cmp r1, 0 - bne _0806E554 - ldr r0, _0806E54C @ =0x0000022f - cmp r2, r0 - bls _0806E548 - ldr r1, _0806E550 @ =0xfffff800 - adds r0, r2, r1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1F - bhi _0806E562 -_0806E548: - movs r0, 0 - b _0806E564 - .align 2, 0 -_0806E54C: .4byte 0x0000022f -_0806E550: .4byte 0xfffff800 -_0806E554: - cmp r2, 0x2F - bls _0806E548 - subs r0, 0x50 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x63 - bls _0806E548 -_0806E562: - movs r0, 0x1 -_0806E564: - pop {r1} - bx r1 - thumb_func_end sub_806E528 - - thumb_func_start VarGet -VarGet: @ 806E568 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl GetVarPointer - cmp r0, 0 - beq _0806E57C - ldrh r0, [r0] - b _0806E57E -_0806E57C: - adds r0, r4, 0 -_0806E57E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end VarGet - - thumb_func_start VarSet -VarSet: @ 806E584 - push {r4,lr} - lsls r0, 16 - lsrs r0, 16 - lsls r1, 16 - lsrs r4, r1, 16 - bl GetVarPointer - cmp r0, 0 - beq _0806E59C - strh r4, [r0] - movs r0, 0x1 - b _0806E59E -_0806E59C: - movs r0, 0 -_0806E59E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end VarSet - - thumb_func_start VarGetFieldObjectGraphicsId -VarGetFieldObjectGraphicsId: @ 806E5A4 - push {lr} - lsls r0, 24 - lsrs r0, 8 - ldr r1, _0806E5BC @ =0x40100000 - adds r0, r1 - lsrs r0, 16 - bl VarGet - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_0806E5BC: .4byte 0x40100000 - thumb_func_end VarGetFieldObjectGraphicsId - - thumb_func_start sub_806E5C0 -sub_806E5C0: @ 806E5C0 - push {r4-r6,lr} - lsls r5, r0, 16 - lsrs r4, r5, 16 - adds r6, r4, 0 - cmp r4, 0 - bne _0806E5D0 - movs r0, 0 - b _0806E66E -_0806E5D0: - ldr r0, _0806E5E8 @ =0x00003fff - cmp r4, r0 - bhi _0806E65C - ldr r0, _0806E5EC @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x1 - beq _0806E5F0 - cmp r0, 0x1 - ble _0806E644 - cmp r0, 0x2 - beq _0806E618 - b _0806E644 - .align 2, 0 -_0806E5E8: .4byte 0x00003fff -_0806E5EC: .4byte gUnknown_3005E88 -_0806E5F0: - movs r0, 0x1 - adds r1, r4, 0 - bl sub_8112D40 - adds r2, r0, 0 - cmp r2, 0 - beq _0806E644 - ldr r0, _0806E614 @ =gSaveBlock1Ptr - ldr r0, [r0] - lsrs r1, r5, 19 - movs r3, 0xEE - lsls r3, 4 - adds r0, r3 - adds r0, r1 - ldrb r1, [r2] - strb r1, [r0] - b _0806E644 - .align 2, 0 -_0806E614: .4byte gSaveBlock1Ptr -_0806E618: - adds r0, r4, 0 - movs r1, 0 - bl sub_806E528 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0806E644 - ldr r0, _0806E654 @ =gUnknown_300507C - strh r4, [r0] - ldr r0, _0806E658 @ =gSaveBlock1Ptr - ldr r0, [r0] - lsrs r1, r5, 19 - movs r2, 0xEE - lsls r2, 4 - adds r0, r2 - adds r0, r1 - ldrb r2, [r0] - movs r0, 0x1 - adds r1, r4, 0 - bl sub_8112DB0 -_0806E644: - ldr r0, _0806E658 @ =gSaveBlock1Ptr - lsrs r1, r6, 3 - movs r3, 0xEE - lsls r3, 4 - adds r1, r3 - ldr r0, [r0] - b _0806E66C - .align 2, 0 -_0806E654: .4byte gUnknown_300507C -_0806E658: .4byte gSaveBlock1Ptr -_0806E65C: - ldr r1, _0806E674 @ =0xffffc000 - adds r0, r6, r1 - cmp r0, 0 - bge _0806E668 - ldr r2, _0806E678 @ =0xffffc007 - adds r0, r6, r2 -_0806E668: - asrs r0, 3 - ldr r1, _0806E67C @ =gUnknown_20370E0 -_0806E66C: - adds r0, r1 -_0806E66E: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_0806E674: .4byte 0xffffc000 -_0806E678: .4byte 0xffffc007 -_0806E67C: .4byte gUnknown_20370E0 - thumb_func_end sub_806E5C0 - - thumb_func_start FlagSet -FlagSet: @ 806E680 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl sub_806E5C0 - adds r2, r0, 0 - cmp r2, 0 - beq _0806E6A0 - movs r0, 0x7 - ands r0, r4 - movs r1, 0x1 - lsls r1, r0 - ldrb r0, [r2] - orrs r1, r0 - strb r1, [r2] -_0806E6A0: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end FlagSet - - thumb_func_start FlagClear -FlagClear: @ 806E6A8 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl sub_806E5C0 - adds r2, r0, 0 - cmp r2, 0 - beq _0806E6C8 - movs r0, 0x7 - ands r0, r4 - movs r1, 0x1 - lsls r1, r0 - ldrb r0, [r2] - bics r0, r1 - strb r0, [r2] -_0806E6C8: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end FlagClear - - thumb_func_start FlagGet -FlagGet: @ 806E6D0 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl sub_806E5C0 - cmp r0, 0 - beq _0806E6F4 - ldrb r0, [r0] - movs r1, 0x7 - ands r1, r4 - asrs r0, r1 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0806E6F4 - movs r0, 0x1 - b _0806E6F6 -_0806E6F4: - movs r0, 0 -_0806E6F6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end FlagGet - - thumb_func_start sub_806E6FC -sub_806E6FC: @ 806E6FC - ldr r1, _0806E754 @ =gSpecialVar_0x8000 - movs r0, 0 - strh r0, [r1] - ldr r1, _0806E758 @ =gSpecialVar_0x8001 - strh r0, [r1] - ldr r1, _0806E75C @ =gSpecialVar_0x8002 - strh r0, [r1] - ldr r1, _0806E760 @ =gSpecialVar_0x8003 - strh r0, [r1] - ldr r1, _0806E764 @ =gSpecialVar_0x8004 - strh r0, [r1] - ldr r1, _0806E768 @ =gSpecialVar_0x8005 - strh r0, [r1] - ldr r1, _0806E76C @ =gSpecialVar_0x8006 - strh r0, [r1] - ldr r1, _0806E770 @ =gSpecialVar_0x8007 - strh r0, [r1] - ldr r1, _0806E774 @ =gSpecialVar_0x8008 - strh r0, [r1] - ldr r1, _0806E778 @ =gSpecialVar_0x8009 - strh r0, [r1] - ldr r1, _0806E77C @ =gSpecialVar_0x800A - strh r0, [r1] - ldr r1, _0806E780 @ =gSpecialVar_0x800B - strh r0, [r1] - ldr r1, _0806E784 @ =gSpecialVar_Facing - strh r0, [r1] - ldr r1, _0806E788 @ =gSpecialVar_Result - strh r0, [r1] - ldr r1, _0806E78C @ =gSpecialVar_ItemId - strh r0, [r1] - ldr r1, _0806E790 @ =gSpecialVar_LastTalked - strh r0, [r1] - ldr r1, _0806E794 @ =gSpecialVar_MonBoxId - strh r0, [r1] - ldr r1, _0806E798 @ =gSpecialVar_MonBoxPos - strh r0, [r1] - ldr r1, _0806E79C @ =gUnknown_20370DA - strh r0, [r1] - ldr r1, _0806E7A0 @ =gUnknown_20370DC - strh r0, [r1] - ldr r1, _0806E7A4 @ =gUnknown_20370DE - strh r0, [r1] - bx lr - .align 2, 0 -_0806E754: .4byte gSpecialVar_0x8000 -_0806E758: .4byte gSpecialVar_0x8001 -_0806E75C: .4byte gSpecialVar_0x8002 -_0806E760: .4byte gSpecialVar_0x8003 -_0806E764: .4byte gSpecialVar_0x8004 -_0806E768: .4byte gSpecialVar_0x8005 -_0806E76C: .4byte gSpecialVar_0x8006 -_0806E770: .4byte gSpecialVar_0x8007 -_0806E774: .4byte gSpecialVar_0x8008 -_0806E778: .4byte gSpecialVar_0x8009 -_0806E77C: .4byte gSpecialVar_0x800A -_0806E780: .4byte gSpecialVar_0x800B -_0806E784: .4byte gSpecialVar_Facing -_0806E788: .4byte gSpecialVar_Result -_0806E78C: .4byte gSpecialVar_ItemId -_0806E790: .4byte gSpecialVar_LastTalked -_0806E794: .4byte gSpecialVar_MonBoxId -_0806E798: .4byte gSpecialVar_MonBoxPos -_0806E79C: .4byte gUnknown_20370DA -_0806E7A0: .4byte gUnknown_20370DC -_0806E7A4: .4byte gUnknown_20370DE - thumb_func_end sub_806E6FC - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/field_specials.s b/asm/field_specials.s index 1fec988f4..faf899cfe 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -3142,19 +3142,19 @@ sub_80CBDE8: @ 80CBDE8 ldr r1, _080CBDF8 @ =gSelectedEventObject movs r0, 0 strb r0, [r1] - ldr r1, _080CBDFC @ =gUnknown_20370DA + ldr r1, _080CBDFC @ =gSpecialVar_TextColor movs r0, 0xFF strh r0, [r1] bx lr .align 2, 0 _080CBDF8: .4byte gSelectedEventObject -_080CBDFC: .4byte gUnknown_20370DA +_080CBDFC: .4byte gSpecialVar_TextColor thumb_func_end sub_80CBDE8 thumb_func_start ContextNpcGetTextColor ContextNpcGetTextColor: @ 80CBE00 push {lr} - ldr r0, _080CBE18 @ =gUnknown_20370DA + ldr r0, _080CBE18 @ =gSpecialVar_TextColor ldrh r0, [r0] cmp r0, 0xFF bne _080CBE44 @@ -3165,7 +3165,7 @@ ContextNpcGetTextColor: @ 80CBE00 movs r0, 0x3 b _080CBE48 .align 2, 0 -_080CBE18: .4byte gUnknown_20370DA +_080CBE18: .4byte gSpecialVar_TextColor _080CBE1C: .4byte gSelectedEventObject _080CBE20: ldr r2, _080CBE4C @ =gMapObjects -- cgit v1.2.3 From d51915bb0d658772c57178e28ab702ffcff018da Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 09:50:49 -0400 Subject: Document some variables --- asm/field_specials.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm') diff --git a/asm/field_specials.s b/asm/field_specials.s index faf899cfe..d7297ba13 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -5417,7 +5417,7 @@ sub_80CCFBC: @ 80CCFBC ldr r0, _080CCFF0 @ =gSaveBlock1Ptr ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _080CCFF4 @ =0x00003802 + ldr r0, _080CCFF4 @ =0x00003802 MAP_BIRTH_ISLAND_EXTERIOR cmp r1, r0 bne _080CD000 adds r0, r2, 0x1 -- cgit v1.2.3 From aabb95139d236b57b52f17dac962cce2a694f162 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 10:44:00 -0400 Subject: stab in the dark at documenting menews_jisan --- asm/field_control_avatar.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm') diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index aa66c7d5e..9c0677c09 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -364,7 +364,7 @@ sub_806CAC8: @ 806CAC8 beq _0806CB74 movs r0, 0x5 bl IncrementGameStat - bl sub_8146CA4 + bl MENewsJisanStepCounter bl IncrementRenewableHiddenItemStepCounter bl sub_80CC918 bl sub_80CB054 -- cgit v1.2.3 From 949a4c3b5ddeecd1ad6ba22414fab632eb118280 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 11:24:09 -0400 Subject: Document unk_8159F40 (pokedude battle party info) --- asm/battle_setup.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm') diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 54f374c78..e8e0071db 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -595,7 +595,7 @@ sub_807FB08: @ 807FB08 ldr r0, _0807FB3C @ =sub_807FAF8 str r0, [r1, 0x8] bl SavePlayerParty - bl sub_8159F40 + bl InitPokedudePartyAndOpponent bl GetWildBattleTransition lsls r0, 24 lsrs r0, 24 -- cgit v1.2.3 From 1de8b7b197358e52eef5a95e30d7ae069415c7a6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 13:09:47 -0400 Subject: Document overworld whiteout funcs --- asm/field_control_avatar.s | 4 ++-- asm/field_screen_effect.s | 8 ++++---- asm/overworld.s | 32 ++++++++++++++++---------------- asm/wild_encounter.s | 6 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) (limited to 'asm') diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 9c0677c09..842c9c33e 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1822,11 +1822,11 @@ _0806D6EC: lsrs r0, 24 cmp r0, 0x1 bne _0806D704 - ldr r0, _0806D700 @ =gUnknown_81A8DFD + ldr r0, _0806D700 @ =EventScript_PoisonWhiteOut bl ScriptContext1_SetupScript b _0806D730 .align 2, 0 -_0806D700: .4byte gUnknown_81A8DFD +_0806D700: .4byte EventScript_PoisonWhiteOut _0806D704: bl ShouldEggHatch lsls r0, 24 diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index 079abee2c..f8c0970c9 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -985,25 +985,25 @@ _0807F5B6: bne _0807F5E4 adds r0, r6, 0 bl DestroyTask - ldr r0, _0807F5CC @ =gUnknown_81A8D97 + ldr r0, _0807F5CC @ =EventScript_AfterWhiteOutHeal bl ScriptContext1_SetupScript b _0807F5E4 .align 2, 0 -_0807F5CC: .4byte gUnknown_81A8D97 +_0807F5CC: .4byte EventScript_AfterWhiteOutHeal _0807F5D0: bl sub_807E418 cmp r0, 0x1 bne _0807F5E4 adds r0, r6, 0 bl DestroyTask - ldr r0, _0807F5EC @ =gUnknown_81A8DD8 + ldr r0, _0807F5EC @ =EventScript_MomHeal bl ScriptContext1_SetupScript _0807F5E4: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0807F5EC: .4byte gUnknown_81A8DD8 +_0807F5EC: .4byte EventScript_MomHeal thumb_func_end sub_807F45C thumb_func_start sub_807F5F0 diff --git a/asm/overworld.s b/asm/overworld.s index d4993c154..1640bf2c4 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -15,7 +15,7 @@ sub_8054BC8: @ 8054BC8 movs r0, 0xA4 lsls r0, 2 adds r4, r0 - bl sub_8054C04 + bl ComputeWhiteOutMoneyLoss adds r1, r0, 0 adds r0, r4, 0 bl RemoveMoney @@ -31,17 +31,17 @@ _08054BFC: .4byte gUnknown_81A654B _08054C00: .4byte gSaveBlock1Ptr thumb_func_end sub_8054BC8 - thumb_func_start sub_8054C04 -sub_8054C04: @ 8054C04 + thumb_func_start ComputeWhiteOutMoneyLoss +ComputeWhiteOutMoneyLoss: @ 8054C04 push {r4,lr} - bl sub_8054C70 + bl CountBadgesForOverworldWhiteOutLossCalculation adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 bl GetPlayerPartyHighestLevel lsls r0, 24 lsrs r0, 24 - ldr r1, _08054C40 @ =gUnknown_826D294 + ldr r1, _08054C40 @ =sWhiteOutMoneyLossMultipliers adds r4, r1 ldrb r1, [r4] lsls r1, 2 @@ -62,14 +62,14 @@ _08054C38: pop {r1} bx r1 .align 2, 0 -_08054C40: .4byte gUnknown_826D294 +_08054C40: .4byte sWhiteOutMoneyLossMultipliers _08054C44: .4byte gSaveBlock1Ptr - thumb_func_end sub_8054C04 + thumb_func_end ComputeWhiteOutMoneyLoss - thumb_func_start sub_8054C48 -sub_8054C48: @ 8054C48 + thumb_func_start Special_OverworldWhiteOutGetMoneyLoss +Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48 push {r4,r5,lr} - bl sub_8054C04 + bl ComputeWhiteOutMoneyLoss adds r4, r0, 0 ldr r5, _08054C6C @ =gStringVar1 bl CountDigits @@ -85,14 +85,14 @@ sub_8054C48: @ 8054C48 bx r0 .align 2, 0 _08054C6C: .4byte gStringVar1 - thumb_func_end sub_8054C48 + thumb_func_end Special_OverworldWhiteOutGetMoneyLoss - thumb_func_start sub_8054C70 -sub_8054C70: @ 8054C70 + thumb_func_start CountBadgesForOverworldWhiteOutLossCalculation +CountBadgesForOverworldWhiteOutLossCalculation: @ 8054C70 push {r4-r6,lr} movs r6, 0 movs r5, 0 - ldr r4, _08054C9C @ =gUnknown_826D29E + ldr r4, _08054C9C @ =sWhiteOutMoneyLossBadgeFlagIDs _08054C78: ldrh r0, [r4] bl FlagGet @@ -112,8 +112,8 @@ _08054C8A: pop {r1} bx r1 .align 2, 0 -_08054C9C: .4byte gUnknown_826D29E - thumb_func_end sub_8054C70 +_08054C9C: .4byte sWhiteOutMoneyLossBadgeFlagIDs + thumb_func_end CountBadgesForOverworldWhiteOutLossCalculation thumb_func_start sub_8054CA0 sub_8054CA0: @ 8054CA0 diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index b7ac02d0a..dedcfa761 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -966,8 +966,8 @@ _08082E48: bx r1 thumb_func_end sub_8082CBC - thumb_func_start sub_8082E54 -sub_8082E54: @ 8082E54 + thumb_func_start Special_RockSmashEncounter +Special_RockSmashEncounter: @ 8082E54 push {r4,lr} bl sub_8082934 lsls r0, 16 @@ -1018,7 +1018,7 @@ _08082EB6: bx r0 .align 2, 0 _08082EBC: .4byte gSpecialVar_Result - thumb_func_end sub_8082E54 + thumb_func_end Special_RockSmashEncounter thumb_func_start SweetScentWildEncounter SweetScentWildEncounter: @ 8082EC0 -- cgit v1.2.3 From 6742a901af56e986b81adc7eca04c62820c185e0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 13:40:01 -0400 Subject: Dump data/overworld.s --- asm/overworld.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm') diff --git a/asm/overworld.s b/asm/overworld.s index 1640bf2c4..3fecdfa5c 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -749,7 +749,7 @@ warp_shift: @ 8055198 str r0, [r2, 0x4] str r1, [r2, 0x8] ldr r2, _080551D0 @ =gUnknown_2031DC4 - ldr r0, _080551D4 @ =gUnknown_826D2B0 + ldr r0, _080551D4 @ =sDummyWarpData ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r2] @@ -763,7 +763,7 @@ _080551C4: .4byte gUnknown_2031DB4 _080551C8: .4byte gSaveBlock1Ptr _080551CC: .4byte gUnknown_2031DBC _080551D0: .4byte gUnknown_2031DC4 -_080551D4: .4byte gUnknown_826D2B0 +_080551D4: .4byte sDummyWarpData _080551D8: .4byte gUnknown_2031DCC thumb_func_end warp_shift -- cgit v1.2.3 From a5521e6b691bea41032acd277fc93fba77ec8bd4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 16:47:41 -0400 Subject: Remove incomplete menews_jison constant defs --- asm/field_specials.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asm') diff --git a/asm/field_specials.s b/asm/field_specials.s index d7297ba13..eba95e9cf 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -1591,8 +1591,8 @@ _080CB1FE: bx r1 thumb_func_end Special_CheckAddCoins - thumb_func_start sub_80CB204 -sub_80CB204: @ 80CB204 + thumb_func_start Special_GetElevatorFloor +Special_GetElevatorFloor: @ 80CB204 push {r4,lr} movs r3, 0x4 ldr r0, _080CB22C @ =gSaveBlock1Ptr @@ -1742,7 +1742,7 @@ _080CB314: bx r0 .align 2, 0 _080CB324: .4byte 0x0000403a - thumb_func_end sub_80CB204 + thumb_func_end Special_GetElevatorFloor thumb_func_start sub_80CB328 sub_80CB328: @ 80CB328 -- cgit v1.2.3 From 8249a58a2cedc0b3ec9f5033a4745c13e49a86ae Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 21:24:16 -0400 Subject: Split trainers and port species and move names --- asm/field_specials.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'asm') diff --git a/asm/field_specials.s b/asm/field_specials.s index eba95e9cf..653923fda 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -4953,7 +4953,7 @@ _080CCBEA: cmp r7, 0 bne _080CCC34 ldr r0, _080CCC24 @ =gStringVar2 - ldr r1, _080CCC28 @ =gUnknown_82481BE + ldr r1, _080CCC28 @ =gMoveNames + 0x112A FRENZY PLANT bl StringCopy ldr r1, _080CCC2C @ =gSpecialVar_0x8005 movs r0, 0xF @@ -4964,14 +4964,14 @@ _080CCBEA: _080CCC1C: .4byte gUnknown_83F6203 _080CCC20: .4byte gPlayerParty _080CCC24: .4byte gStringVar2 -_080CCC28: .4byte gUnknown_82481BE +_080CCC28: .4byte gMoveNames + 0x112A _080CCC2C: .4byte gSpecialVar_0x8005 _080CCC30: .4byte 0x000002de _080CCC34: cmp r7, 0x1 bne _080CCC5C ldr r0, _080CCC4C @ =gStringVar2 - ldr r1, _080CCC50 @ =gUnknown_824802B + ldr r1, _080CCC50 @ =gMoveNames + 0xF97 BLAST BURN bl StringCopy ldr r1, _080CCC54 @ =gSpecialVar_0x8005 movs r0, 0x10 @@ -4980,12 +4980,12 @@ _080CCC34: b _080CCC6E .align 2, 0 _080CCC4C: .4byte gStringVar2 -_080CCC50: .4byte gUnknown_824802B +_080CCC50: .4byte gMoveNames + 0xF97 _080CCC54: .4byte gSpecialVar_0x8005 _080CCC58: .4byte 0x000002df _080CCC5C: ldr r0, _080CCC80 @ =gStringVar2 - ldr r1, _080CCC84 @ =gUnknown_8248038 + ldr r1, _080CCC84 @ =gMoveNames + 0xFA4 HYDRO CANNON bl StringCopy ldr r1, _080CCC88 @ =gSpecialVar_0x8005 movs r0, 0x11 @@ -5003,7 +5003,7 @@ _080CCC7A: b _080CCCE4 .align 2, 0 _080CCC80: .4byte gStringVar2 -_080CCC84: .4byte gUnknown_8248038 +_080CCC84: .4byte gMoveNames + 0xFA4 _080CCC88: .4byte gSpecialVar_0x8005 _080CCC8C: movs r0, 0x64 -- cgit v1.2.3