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

Merge remote-tracking branch 'pret/master'

Browse Source
This commit is contained in:
Diegoisawesome
2017-09-09 20:54:41 -05:00
parent f29fc55796 eb280768a4
commit a1368c545d
211 changed files with 149330 additions and 147270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -3,6 +3,7 @@
*.i
*.elf
*.gba
*.sgm
*.1bpp
*.4bpp
*.8bpp
README.md
+21
View File
@@ -7,3 +7,24 @@ It builds the following rom:
* pokeemerald.gba `sha1: f3ae088181bf583e55daf962a92bb46f4f1d07b7`
To set up the repository, see [**INSTALL.md**](INSTALL.md).
## See also
* Disassembly of [**Pokémon Red/Blue**][pokered]
* Disassembly of [**Pokémon Yellow**][pokeyellow]
* Disassembly of [**Pokémon Crystal**][pokecrystal]
* Disassembly of [**Pokémon Pinball**][pokepinball]
* Disassembly of [**Pokémon TCG**][poketcg]
* Disassembly of [**Pokémon Ruby**][pokeruby]
* Discord: [**pret**][Discord]
* irc: **irc.freenode.net** [**#pret**][irc]
[pokered]: https://github.com/pret/pokered
[pokeyellow]: https://github.com/pret/pokeyellow
[pokecrystal]: https://github.com/pret/pokecrystal
[pokepinball]: https://github.com/pret/pokepinball
[poketcg]: https://github.com/pret/poketcg
[pokeruby]: https://github.com/pret/pokeruby
[Discord]: https://discord.gg/cJxDDVP
[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
asm/battle_2.s
+16487
View File
File diff suppressed because it is too large Load Diff
asm/battle_3.s
+39 -39
View File
@@ -141,7 +141,7 @@ _0803FBF8:
str r0, [r1]
movs r6, 0x1
_0803FC06:
ldr r1, =gUnknown_02024248
ldr r1, =gLastUsedMovesByBanks
ldrb r2, [r7]
lsls r0, r2, 1
adds r0, r1
@@ -336,7 +336,7 @@ _0803FDCE:
beq _0803FE58
ldr r0, =gCurrentMove
strh r1, [r0]
ldr r2, =gUnknown_02024208
ldr r2, =gLastUsedItem
ldrb r1, [r7]
movs r0, 0x58
muls r0, r1
@@ -420,8 +420,8 @@ _0803FEB8:
.pool
thumb_func_end sub_803FB4C
thumb_func_start sub_803FECC
sub_803FECC: @ 803FECC
thumb_func_start CheckMoveLimitations
CheckMoveLimitations: @ 803FECC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -479,7 +479,7 @@ _0803FF2E:
adds r6, r7, 0
muls r6, r2
str r6, [sp, 0x8]
ldr r2, =gUnknown_02024090
ldr r2, =gBattleMons + 0xC
adds r5, r6, r2
movs r6, 0
str r6, [sp, 0x10]
@@ -538,10 +538,10 @@ _0803FFAC:
muls r2, r0
ldr r1, [sp, 0x10]
adds r0, r1, r2
ldr r1, =gUnknown_02024090
ldr r1, =gBattleMons + 0xC
adds r0, r1
mov r12, r0
ldr r1, =gUnknown_02024248
ldr r1, =gLastUsedMovesByBanks
ldr r0, [sp, 0xC]
adds r1, r0, r1
str r1, [sp, 0x18]
@@ -665,7 +665,7 @@ _08040096:
pop {r1}
bx r1
.pool
thumb_func_end sub_803FECC
thumb_func_end CheckMoveLimitations
thumb_func_start sub_80400C8
sub_80400C8: @ 80400C8
@@ -674,7 +674,7 @@ sub_80400C8: @ 80400C8
ldrb r0, [r4]
movs r1, 0
movs r2, 0xFF
bl sub_803FECC
bl CheckMoveLimitations
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xF
@@ -737,7 +737,7 @@ sub_8040130: @ 8040130
ldrb r0, [r0]
cmp r6, r0
bge _080401B4
ldr r7, =gUnknown_02024090
ldr r7, =gBattleMons + 0xC
mov r8, r7
_0804015A:
lsls r0, r4, 24
@@ -997,7 +997,7 @@ _0804035A:
strb r0, [r6]
mov r3, r8
strb r0, [r3]
ldr r0, =gUnknown_0202428E
ldr r0, =gSideAffecting
adds r3, r1, r0
ldrh r1, [r3]
movs r0, 0x1
@@ -1082,7 +1082,7 @@ _08040422:
strb r0, [r7]
ldr r3, =gActiveBank
strb r0, [r3]
ldr r0, =gUnknown_0202428E
ldr r0, =gSideAffecting
adds r3, r1, r0
ldrh r1, [r3]
movs r0, 0x2
@@ -1177,7 +1177,7 @@ _080404EC:
lsls r0, 24
cmp r0, 0
bne _0804054E
ldr r2, =gUnknown_0202428E
ldr r2, =gSideAffecting
adds r2, r3, r2
ldrh r0, [r2]
ldr r3, =0x0000feff
@@ -1260,7 +1260,7 @@ _080405C0:
ldrb r0, [r2, 0x7]
strb r0, [r5]
strb r0, [r6]
ldr r0, =gUnknown_0202428E
ldr r0, =gSideAffecting
adds r3, r1, r0
ldrh r1, [r3]
movs r0, 0x20
@@ -2988,7 +2988,7 @@ _080414CC:
_080414DA:
ldrb r0, [r5]
bl GetBankIdentity
ldr r2, =gUnknown_0202428E
ldr r2, =gSideAffecting
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -3598,7 +3598,7 @@ b_clear_atk_up_if_hit_flag_unless_enraged: @ 8041A1C
ldr r4, =gUnknown_02024274
movs r6, 0x80
lsls r6, 16
ldr r2, =gUnknown_020240D4
ldr r2, =gBattleMons + 0x50
_08041A32:
ldr r1, [r2]
adds r0, r1, 0
@@ -3635,7 +3635,7 @@ sub_8041A6C: @ 8041A6C
sub sp, 0x10
movs r0, 0
mov r9, r0
ldr r1, =gUnknown_02024478
ldr r1, =gBattleScripting + 4
mov r10, r1
ldr r2, =gBattleStruct
mov r8, r2
@@ -4237,7 +4237,7 @@ _0804207C:
adds r0, r1, 0
movs r2, 0x1
movs r3, 0
bl sub_806957C
bl CalculateBaseDamage
ldr r1, =gBattleMoveDamage
str r0, [r1]
ldr r0, =gProtectStructs
@@ -4545,7 +4545,7 @@ _08042388:
ldrb r1, [r4]
movs r0, 0x58
muls r0, r1
ldr r1, =gUnknown_020240D0
ldr r1, =gBattleMons + 0x4C
adds r0, r1
str r0, [sp]
movs r0, 0
@@ -6796,11 +6796,11 @@ _08043840:
_08043854:
ldr r0, [sp, 0x8]
ldr r1, [sp, 0x10]
bl pokemon_species_get_gender_info
bl GetGenderFromSpeciesAndPersonality
adds r4, r0, 0
ldr r0, [sp, 0xC]
ldr r1, [sp, 0x14]
bl pokemon_species_get_gender_info
bl GetGenderFromSpeciesAndPersonality
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -6823,7 +6823,7 @@ _08043872:
_0804388E:
ldr r0, [sp, 0x8]
ldr r1, [sp, 0x10]
bl pokemon_species_get_gender_info
bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -6832,7 +6832,7 @@ _0804388E:
_080438A2:
ldr r0, [sp, 0xC]
ldr r1, [sp, 0x14]
bl pokemon_species_get_gender_info
bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -7166,7 +7166,7 @@ _08043BFC:
ldrb r1, [r4]
movs r0, 0x58
muls r0, r1
ldr r1, =gUnknown_020240D0
ldr r1, =gBattleMons + 0x4C
adds r0, r1
str r0, [sp]
movs r0, 0
@@ -8200,7 +8200,7 @@ berry_effects_maybe: @ 80444DC
str r1, [sp, 0xC]
add r0, sp, 0x4
strb r1, [r0]
ldr r4, =gUnknown_02024208
ldr r4, =gLastUsedItem
ldr r1, =gBattleMons
movs r0, 0x58
muls r0, r7
@@ -8532,7 +8532,7 @@ _08044836:
lsls r2, r5, 24
lsrs r2, 24
adds r0, r6, 0
bl CalcPPWithPPUps
bl CalculatePPWithBonus
lsls r0, 24
lsrs r2, r0, 24
add r0, sp, 0x4
@@ -8664,7 +8664,7 @@ _08044958:
str r0, [sp, 0xC]
adds r0, r7, 0
adds r1, r5, 0
bl b_history__record_item_x12_of_player
bl RecordItemEffectBattle
bl _080451D6
.pool
_0804497C:
@@ -8721,7 +8721,7 @@ _080449D2:
adds r0, r2, r0
ldr r0, [r0]
movs r1, 0
bl sub_806E880
bl GetFlavourRelationByPersonality
lsls r0, 24
cmp r0, 0
bge _080449F0
@@ -8782,7 +8782,7 @@ _08044A50:
adds r0, r1, r0
ldr r0, [r0]
movs r1, 0x1
bl sub_806E880
bl GetFlavourRelationByPersonality
lsls r0, 24
cmp r0, 0
bge _08044A6E
@@ -8845,7 +8845,7 @@ _08044ACC:
adds r0, r5, r0
ldr r0, [r0]
movs r1, 0x2
bl sub_806E880
bl GetFlavourRelationByPersonality
lsls r0, 24
cmp r0, 0
bge _08044AFC
@@ -8916,7 +8916,7 @@ _08044B60:
adds r0, r2, r0
ldr r0, [r0]
movs r1, 0x3
bl sub_806E880
bl GetFlavourRelationByPersonality
lsls r0, 24
cmp r0, 0
bge _08044B90
@@ -8987,7 +8987,7 @@ _08044BF2:
adds r0, r1, r0
ldr r0, [r0]
movs r1, 0x4
bl sub_806E880
bl GetFlavourRelationByPersonality
lsls r0, 24
cmp r0, 0
bge _08044C24
@@ -9315,7 +9315,7 @@ _08044EB4:
movs r0, 0x58
muls r0, r7
adds r4, r0, 0x1
ldr r5, =gUnknown_0202409C
ldr r5, =gBattleMons + 0x18
_08044EBC:
bl Random
lsls r0, 16
@@ -9749,7 +9749,7 @@ _08045280:
bcc _0804528C
b _0804582A
_0804528C:
ldr r4, =gUnknown_02024208
ldr r4, =gLastUsedItem
ldr r1, =gBattleMons
movs r0, 0x58
muls r0, r7
@@ -10158,7 +10158,7 @@ _0804567A:
movs r0, 0x58
muls r0, r1
_0804568C:
ldr r1, =gUnknown_020240D0
ldr r1, =gBattleMons + 0x4C
adds r0, r1
str r0, [sp]
movs r0, 0
@@ -10301,7 +10301,7 @@ _08045794:
beq _0804582A
cmp r1, 0
beq _0804582A
ldr r0, =gUnknown_02024208
ldr r0, =gLastUsedItem
mov r1, sp
ldrh r1, [r1, 0x14]
strh r1, [r0]
@@ -10864,7 +10864,7 @@ _08045D08:
ldr r0, [r0]
adds r2, 0x3C
adds r1, r2
bl sub_806E8D4
bl IsOtherTrainer
lsls r0, 24
cmp r0, 0
beq _08045DAC
@@ -10988,7 +10988,7 @@ _08045E20:
ldrb r1, [r0]
adds r0, r3, 0
movs r2, 0xFF
bl sub_803FECC
bl CheckMoveLimitations
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xF
@@ -11133,7 +11133,7 @@ _08045F8C:
adds r0, r1, 0
movs r2, 0x1
movs r3, 0
bl sub_806957C
bl CalculateBaseDamage
ldr r1, =gBattleMoveDamage
str r0, [r1]
ldr r1, =gBankTarget
asm/battle_4.s
+585 -585
View File
File diff suppressed because it is too large Load Diff
asm/battle_5.s
+5 -5
View File
@@ -96,7 +96,7 @@ _08056F3E:
adds r1, r0
ldr r0, [r2]
adds r0, r1
bl create_enemy_party
bl CreateSecretBaseEnemyParty
_08056FFA:
pop {r4-r6}
pop {r0}
@@ -253,7 +253,7 @@ _0805714A:
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x8
bl happiness_algorithm
bl AdjustFriendship
b _080571CE
.pool
_08057198:
@@ -266,7 +266,7 @@ _08057198:
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x6
bl happiness_algorithm
bl AdjustFriendship
b _080571CE
.pool
_080571B8:
@@ -279,7 +279,7 @@ _080571B8:
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x6
bl happiness_algorithm
bl AdjustFriendship
_080571CE:
pop {r4,r5}
pop {r0}
@@ -555,7 +555,7 @@ _08057406:
ldrb r1, [r4]
movs r0, 0x58
muls r0, r1
ldr r1, =gUnknown_020240D0
ldr r1, =gBattleMons + 0x4C
adds r0, r1
str r0, [sp]
movs r0, 0
asm/battle_7.s
+15 -15
View File
@@ -80,12 +80,12 @@ sub_805D19C: @ 805D19C
ldr r4, =gActiveBank
ldrb r0, [r4]
lsls r2, r0, 9
ldr r1, =gUnknown_02023068
ldr r1, =gBattleBufferA + 4
adds r2, r1
mov r10, r2
movs r1, 0
movs r2, 0xFF
bl sub_803FECC
bl CheckMoveLimitations
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -124,7 +124,7 @@ _0805D20E:
ldrb r1, [r0]
movs r0, 0x58
muls r0, r1
ldr r1, =gUnknown_020240CC
ldr r1, =gBattleMons + 0x48
adds r0, r1
ldr r0, [r0]
bl GetNatureFromPersonality
@@ -194,7 +194,7 @@ _0805D27C:
lsls r0, r6, 24
lsrs r0, 24
bl BattleAI_SetupAIData
bl sub_8130BA4
bl BattleAI_ChooseMoveOrAction
lsls r0, 24
lsrs r0, 24
mov r9, r0
@@ -2029,7 +2029,7 @@ _0805E24C:
ldrb r0, [r4]
bl battle_make_oam_normal_battle
_0805E252:
ldr r2, =gUnknown_03005D70
ldr r2, =gHealthBoxesIds
ldrb r1, [r4]
adds r1, r2
strb r0, [r1]
@@ -2044,7 +2044,7 @@ _0805E260:
ldrb r0, [r0]
cmp r0, 0x1
bhi _0805E288
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r1, r0
ldrb r0, [r0]
movs r1, 0
@@ -2052,7 +2052,7 @@ _0805E260:
b _0805E30E
.pool
_0805E288:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r1, r0
ldrb r0, [r0]
movs r1, 0x1
@@ -2071,7 +2071,7 @@ _0805E29C:
ands r0, r1
cmp r0, 0
bne _0805E302
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -2088,7 +2088,7 @@ _0805E29C:
b _0805E302
.pool
_0805E2E4:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -2103,7 +2103,7 @@ _0805E2E4:
movs r2, 0
bl healthbar_draw_field_maybe
_0805E302:
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@@ -2347,7 +2347,7 @@ _0805E4DE:
b _0805E77A
.pool
_0805E51C:
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _0805E558
@@ -2578,7 +2578,7 @@ _0805E70A:
adds r1, r2
ldr r2, =0x04000008
bl CpuSet
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _0805E74A
@@ -2639,7 +2639,7 @@ sub_805E7DC: @ 805E7DC
lsls r1, 24
cmp r1, 0
bne _0805E898
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _0805E7F8
@@ -2651,7 +2651,7 @@ _0805E7F8:
lsls r0, 24
lsrs r4, r0, 24
_0805E802:
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _0805E814
@@ -2714,7 +2714,7 @@ _0805E860:
b _0805E8E6
.pool
_0805E898:
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _0805E8E6
asm/battle_9.s
+6 -6
View File
@@ -2039,7 +2039,7 @@ _08063D02:
ldrb r1, [r0]
adds r0, r4, 0
ldr r2, [sp, 0x4]
bl move_effectiveness_something
bl TypeCalc
movs r1, 0x2
ands r1, r0
cmp r1, 0
@@ -2074,7 +2074,7 @@ _08063D58:
beq _08063D60
b _08063BE4
_08063D60:
ldr r0, =gUnknown_02024400
ldr r0, =gDynamicBasePower
movs r1, 0
strh r1, [r0]
ldr r0, =gBattleStruct
@@ -2167,11 +2167,11 @@ _08063DEE:
beq _08063E2A
ldrb r0, [r6]
ldr r1, [sp, 0x4]
bl sub_8046E7C
bl AI_CalcDmg
ldrb r1, [r6]
adds r0, r4, 0
ldr r2, [sp, 0x4]
bl move_effectiveness_something
bl TypeCalc
_08063E2A:
mov r2, r8
ldr r0, [r2]
@@ -2367,7 +2367,7 @@ _08063F8E:
bne _08063FA6
b _08064370
_08063FA6:
ldr r1, =gItemEffectInfoPointers
ldr r1, =gItemEffectTable
subs r0, 0xD
lsls r0, 2
adds r0, r1
@@ -2451,7 +2451,7 @@ _08064074:
mov r0, r9
movs r1, 0x4
movs r2, 0x4
bl sub_806CDDC
bl GetItemEffectParamOffset
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
asm/battle_anim.s
+44 -44
View File
@@ -123,7 +123,7 @@ move_something: @ 80A3A48
lsls r2, 24
lsrs r2, 24
mov r9, r2
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A3AE8
@@ -846,7 +846,7 @@ _080A406E:
movs r2, 0x80
lsls r2, 1
bl m4aMPlayVolumeControl
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A409C
@@ -1021,7 +1021,7 @@ _080A41FA:
lsrs r0, 24
cmp r0, 0x1
bls _080A4226
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A4230
@@ -1073,7 +1073,7 @@ _080A4266:
lsrs r0, 24
cmp r0, 0x1
bls _080A4294
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A42A4
@@ -1130,7 +1130,7 @@ b_side_obj__get_some_boolean: @ 80A4310
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A4330
@@ -1146,7 +1146,7 @@ _080A4330:
lsls r0, 24
cmp r0, 0
beq _080A4384
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A4374
@@ -1203,7 +1203,7 @@ sub_80A438C: @ 80A438C
beq _080A43AA
b _080A455E
_080A43AA:
bl sub_80A4DF0
bl IsContest
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1278,7 +1278,7 @@ _080A43F8:
negs r0, r0
adds r0, 0x20
strh r0, [r5]
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A447A
@@ -1347,7 +1347,7 @@ _080A44B0:
ldr r2, =0x04000008
adds r0, r4, 0
bl CpuSet
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A4524
@@ -1374,7 +1374,7 @@ _080A452E:
movs r1, 0
movs r2, 0
bl sub_8118FBC
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A4558
@@ -1645,7 +1645,7 @@ sub_80A477C: @ 80A477C
bl sub_80A6B30
cmp r4, 0
beq _080A479C
bl sub_80A4DF0
bl IsContest
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -1891,7 +1891,7 @@ sub_80A4980: @ 80A4980
lsrs r0, 24
cmp r0, 0x1
bls _080A49BC
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A49C4
@@ -1985,7 +1985,7 @@ _080A4A4A:
lsrs r0, 24
cmp r0, 0x1
bls _080A4A76
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A4A80
@@ -2018,7 +2018,7 @@ _080A4A8A:
lsrs r0, 24
cmp r0, 0x1
bls _080A4ABC
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A4AC0
@@ -2171,7 +2171,7 @@ sub_80A4BB0: @ 80A4BB0
lsrs r0, 24
cmp r0, 0x1
bls _080A4BEE
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A4BF8
@@ -2441,8 +2441,8 @@ ma13_goto: @ 80A4DCC
.pool
thumb_func_end ma13_goto
thumb_func_start sub_80A4DF0
sub_80A4DF0: @ 80A4DF0
thumb_func_start IsContest
IsContest: @ 80A4DF0
push {lr}
ldr r0, =gMain
ldr r1, =0x00000439
@@ -2460,7 +2460,7 @@ _080A4E10:
_080A4E12:
pop {r1}
bx r1
thumb_func_end sub_80A4DF0
thumb_func_end IsContest
thumb_func_start ma14_load_background
ma14_load_background: @ 80A4E18
@@ -2513,7 +2513,7 @@ sub_80A4E5C: @ 80A4E5C
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A4EA8
@@ -2670,7 +2670,7 @@ sub_80A4FC8: @ 80A4FC8
push {r4-r7,lr}
lsls r0, 16
lsrs r7, r0, 16
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A5050
@@ -2747,7 +2747,7 @@ _080A507E:
thumb_func_start dp01t_11_3_message_for_player_only
dp01t_11_3_message_for_player_only: @ 80A5090
push {lr}
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A50A2
@@ -2855,12 +2855,12 @@ ma18_load_background_probably: @ 80A5158
.pool
thumb_func_end ma18_load_background_probably
thumb_func_start sub_80A5178
sub_80A5178: @ 80A5178
thumb_func_start BattleAnimGetPanControl
BattleAnimGetPanControl: @ 80A5178
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A51C0
@@ -2888,7 +2888,7 @@ sub_80A5178: @ 80A5178
b _080A5252
.pool
_080A51C0:
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A51E8
@@ -2975,14 +2975,14 @@ _080A526C:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80A5178
thumb_func_end BattleAnimGetPanControl
thumb_func_start sub_80A5278
sub_80A5278: @ 80A5278
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A52C0
@@ -3016,7 +3016,7 @@ _080A52C0:
lsls r0, 24
cmp r0, 0
bne _080A52D8
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A52DE
@@ -3110,7 +3110,7 @@ ma19_08073BC8: @ 80A5354
orrs r4, r0
movs r0, 0x2
ldrsb r0, [r1, r0]
bl sub_80A5178
bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -3134,7 +3134,7 @@ ma1A_8073C00: @ 80A538C
str r0, [r4]
movs r0, 0x1
ldrsb r0, [r1, r0]
bl sub_80A5178
bl BattleAnimGetPanControl
lsls r0, 24
asrs r0, 24
bl SE12PanpotControl
@@ -3172,14 +3172,14 @@ ma1B_8073C2C: @ 80A53B8
ldrb r7, [r1, 0x5]
movs r0, 0x2
ldrsb r0, [r1, r0]
bl sub_80A5178
bl BattleAnimGetPanControl
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
lsls r4, 24
asrs r4, 24
adds r0, r4, 0
bl sub_80A5178
bl BattleAnimGetPanControl
mov r8, r0
lsls r5, 24
asrs r5, 24
@@ -3487,7 +3487,7 @@ ma1C_8073ED0: @ 80A565C
mov r9, r2
movs r0, 0x2
ldrsb r0, [r1, r0]
bl sub_80A5178
bl BattleAnimGetPanControl
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3592,7 +3592,7 @@ ma1D_08073FB4: @ 80A5740
mov r8, r0
movs r0, 0x2
ldrsb r0, [r1, r0]
bl sub_80A5178
bl BattleAnimGetPanControl
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3822,7 +3822,7 @@ sub_80A5944: @ 80A5944
ldr r0, [r4]
adds r0, 0x1
str r0, [r4]
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A5978
@@ -3870,7 +3870,7 @@ _080A59A2:
bl GetBankIdentity
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A59D2
@@ -3901,7 +3901,7 @@ sub_80A59DC: @ 80A59DC
ldr r1, [r0]
adds r1, 0x1
str r1, [r0]
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A5A04
@@ -3949,7 +3949,7 @@ _080A5A4A:
bl GetBankIdentity
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A5A78
@@ -3978,7 +3978,7 @@ ma2B_make_side_invisible: @ 80A5A80
ldr r4, =gBattleAnimScriptPtr
ldr r0, [r4]
ldrb r0, [r0, 0x1]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -4009,7 +4009,7 @@ ma2C_make_side_visible: @ 80A5ABC
ldr r4, =gBattleAnimScriptPtr
ldr r0, [r4]
ldrb r0, [r0, 0x1]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -4043,7 +4043,7 @@ sub_80A5AFC: @ 80A5AFC
ldrb r7, [r0, 0x1]
adds r0, 0x2
str r0, [r1]
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A5BA6
@@ -4078,7 +4078,7 @@ _080A5B54:
lsrs r4, r0, 24
movs r0, 0x1
_080A5B60:
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -4125,7 +4125,7 @@ sub_80A5BAC: @ 80A5BAC
ldrb r7, [r0, 0x1]
adds r0, 0x2
str r0, [r1]
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A5C38
@@ -4160,7 +4160,7 @@ _080A5C04:
lsrs r4, r0, 24
movs r0, 0x1
_080A5C10:
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
asm/battle_anin_80A9C70.s → asm/battle_anim_80A9C70.s
+1 -1
View File
@@ -348,7 +348,7 @@ sub_80A9EF4: @ 80A9EF4
ldr r1, =0xffdc0000
adds r0, r1
lsrs r4, r0, 16
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A9F32
asm/battle_anim_80FE840.s
+264 -264
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_8170478.s
+11 -11
View File
@@ -56,7 +56,7 @@ sub_8170478: @ 8170478
movs r1, 0x3
movs r2, 0x1
bl lcd_bg_operations
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r4, r0
ldrb r0, [r4]
ldr r1, =gSprites
@@ -328,7 +328,7 @@ _08170708:
movs r0, 0x4A
adds r1, r4, 0
bl SetGpuReg
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _0817076C
@@ -373,7 +373,7 @@ _0817076C:
movs r1, 0x1
movs r2, 0
bl lcd_bg_operations
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
add r0, r8
ldrb r0, [r0]
lsls r1, r0, 4
@@ -434,7 +434,7 @@ sub_8170834: @ 8170834
adds r7, r1, 0
lsls r2, 24
lsrs r2, 24
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r2, r0
ldrb r0, [r2]
lsls r5, r0, 4
@@ -561,7 +561,7 @@ sub_817094C: @ 817094C
push {r5,r6}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r0, r1
ldrb r0, [r0]
ldr r1, =gSprites
@@ -996,7 +996,7 @@ sub_8170CFC: @ 8170CFC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_02024208
ldr r0, =gLastUsedItem
ldrh r0, [r0]
bl ball_number_to_ball_processing_index
lsls r0, 24
@@ -1016,7 +1016,7 @@ sub_8170D24: @ 8170D24
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_02024208
ldr r0, =gLastUsedItem
ldrh r0, [r0]
bl ball_number_to_ball_processing_index
lsls r0, 24
@@ -1136,7 +1136,7 @@ sub_8170E04: @ 8170E04
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldr r0, =gUnknown_02024208
ldr r0, =gLastUsedItem
ldrh r0, [r0]
bl ball_number_to_ball_processing_index
adds r1, r0, 0
@@ -1276,7 +1276,7 @@ _08170F50:
movs r6, 0x17
movs r5, 0x5
_08170F54:
ldr r0, =gUnknown_02024208
ldr r0, =gLastUsedItem
ldrh r0, [r0]
bl ball_number_to_ball_processing_index
adds r4, r0, 0
@@ -1530,7 +1530,7 @@ _08171188:
strh r0, [r4, 0x38]
ldr r0, =sub_81711E8
str r0, [r4, 0x1C]
ldr r0, =gUnknown_02024208
ldr r0, =gLastUsedItem
ldrh r0, [r0]
bl ball_number_to_ball_processing_index
lsls r0, 24
@@ -2695,7 +2695,7 @@ sub_8171AE4: @ 8171AE4
bl StartSpriteAffineAnim
ldr r0, =sub_8171BAC
str r0, [r4, 0x1C]
ldr r0, =gUnknown_02024208
ldr r0, =gLastUsedItem
ldrh r0, [r0]
bl ball_number_to_ball_processing_index
lsls r0, 24
asm/battle_anim_sound_tasks.s
+1006
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_linkopponent.s
+108 -108
View File
@@ -18,14 +18,14 @@ SetBankFuncToLinkOpponentBufferRunCommand: @ 8064394
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
ldr r1, =sub_80643B0
ldr r1, =LinkOpponentBufferRunCommand
str r1, [r0]
bx lr
.pool
thumb_func_end SetBankFuncToLinkOpponentBufferRunCommand
thumb_func_start sub_80643B0
sub_80643B0: @ 80643B0
thumb_func_start LinkOpponentBufferRunCommand
LinkOpponentBufferRunCommand: @ 80643B0
push {lr}
ldr r2, =gBattleExecBuffer
ldr r1, =gBitTable
@@ -44,7 +44,7 @@ sub_80643B0: @ 80643B0
ldrb r0, [r1]
cmp r0, 0x38
bhi _080643F8
ldr r0, =gUnknown_0831C7B4
ldr r0, =gLinkOpponentBufferCommands
ldrb r1, [r1]
lsls r1, 2
adds r1, r0
@@ -53,11 +53,11 @@ sub_80643B0: @ 80643B0
b _080643FC
.pool
_080643F8:
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_080643FC:
pop {r0}
bx r0
thumb_func_end sub_80643B0
thumb_func_end LinkOpponentBufferRunCommand
thumb_func_start sub_8064400
sub_8064400: @ 8064400
@@ -77,7 +77,7 @@ sub_8064400: @ 8064400
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08064424
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_08064424:
pop {r0}
bx r0
@@ -102,7 +102,7 @@ sub_8064438: @ 8064438
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0806445C
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_0806445C:
pop {r0}
bx r0
@@ -147,7 +147,7 @@ sub_8064470: @ 8064470
lsls r0, 2
adds r0, r5
bl DestroySprite
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_080644C2:
pop {r4-r6}
pop {r0}
@@ -183,7 +183,7 @@ sub_80644D8: @ 80644D8
adds r0, r2
movs r1, 0
strb r1, [r0, 0x9]
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_08064510:
pop {r4}
pop {r0}
@@ -215,7 +215,7 @@ sub_8064520: @ 8064520
beq _08064584
_0806454C:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r3, =gActiveBank
ldrb r0, [r3]
adds r0, r1
@@ -234,7 +234,7 @@ _0806454C:
.pool
_08064584:
ldr r3, =gSprites
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
ldr r2, =gActiveBank
ldrb r4, [r2]
adds r0, r4, r6
@@ -541,7 +541,7 @@ _080647B4:
ands r0, r1
cmp r0, 0
bne _0806484A
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
mov r1, r9
ldrb r0, [r1]
adds r1, r7, 0
@@ -569,7 +569,7 @@ _080647B4:
ldrb r0, [r0]
bl sub_80729D0
_0806484A:
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5
@@ -949,7 +949,7 @@ _08064B7C:
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_08064BB6:
pop {r4-r7}
pop {r0}
@@ -962,7 +962,7 @@ sub_8064BC0: @ 8064BC0
push {r4-r6,lr}
ldr r6, =gActiveBank
ldrb r0, [r6]
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
adds r1, r0, r5
ldrb r1, [r1]
movs r2, 0
@@ -989,7 +989,7 @@ sub_8064BC0: @ 8064BC0
b _08064C0C
.pool
_08064C08:
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_08064C0C:
pop {r4-r6}
pop {r0}
@@ -1014,11 +1014,11 @@ sub_8064C14: @ 8064C14
lsls r0, 31
cmp r0, 0
bne _08064C42
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r3, r0
ldrb r0, [r0]
bl sub_8072984
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_08064C42:
pop {r0}
bx r0
@@ -1061,12 +1061,12 @@ sub_8064C58: @ 8064C58
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
bl sub_8072984
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_08064CB2:
pop {r4-r6}
pop {r0}
@@ -1082,7 +1082,7 @@ sub_8064CCC: @ 8064CCC
lsls r0, 16
cmp r0, 0
bne _08064CDE
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_08064CDE:
pop {r0}
bx r0
@@ -1116,7 +1116,7 @@ sub_8064CE4: @ 8064CE4
strb r0, [r2]
ldr r0, =gDoingBattleAnim
strb r3, [r0]
bl sub_8065068
bl LinkOpponentBufferExecCompleted
b _08064D5A
.pool
_08064D30:
@@ -1152,7 +1152,7 @@ _08064D5A:
sub_8064D60: @ 8064D60
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@@ -1239,7 +1239,7 @@ _08064E1A:
movs r2, 0x80
lsls r2, 1
bl m4aMPlayVolumeControl
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_08064E2A:
pop {r4}
pop {r0}
@@ -1308,7 +1308,7 @@ sub_8064E50: @ 8064E50
adds r0, r7
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@@ -1444,7 +1444,7 @@ sub_8065008: @ 8065008
ands r0, r1
cmp r0, 0
bne _0806502A
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_0806502A:
pop {r0}
bx r0
@@ -1468,15 +1468,15 @@ sub_8065038: @ 8065038
ands r0, r1
cmp r0, 0
bne _0806505A
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_0806505A:
pop {r0}
bx r0
.pool
thumb_func_end sub_8065038
thumb_func_start sub_8065068
sub_8065068: @ 8065068
thumb_func_start LinkOpponentBufferExecCompleted
LinkOpponentBufferExecCompleted: @ 8065068
push {r4,lr}
sub sp, 0x4
ldr r1, =gBattleBankFunc
@@ -1484,7 +1484,7 @@ sub_8065068: @ 8065068
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
ldr r1, =sub_80643B0
ldr r1, =LinkOpponentBufferRunCommand
str r1, [r0]
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@@ -1492,7 +1492,7 @@ sub_8065068: @ 8065068
ands r0, r1
cmp r0, 0
beq _080650BC
bl link_get_multiplayer_id
bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -1523,7 +1523,7 @@ _080650CE:
pop {r0}
bx r0
.pool
thumb_func_end sub_8065068
thumb_func_end LinkOpponentBufferExecCompleted
thumb_func_start dp01t_00_2_getattr
dp01t_00_2_getattr: @ 80650E0
@@ -1573,7 +1573,7 @@ _0806513A:
movs r0, 0x1
mov r2, sp
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
bl sub_8065068
bl LinkOpponentBufferExecCompleted
add sp, 0x100
pop {r4-r6}
pop {r0}
@@ -2461,7 +2461,7 @@ _080658EA:
thumb_func_start sub_8065900
sub_8065900: @ 8065900
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8065900
@@ -2503,7 +2503,7 @@ _0806594E:
cmp r5, 0x5
bls _08065940
_0806595A:
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r4,r5}
pop {r0}
bx r0
@@ -2522,7 +2522,7 @@ sub_8065964: @ 8065964
ldr r3, =gActiveBank
ldrb r0, [r3]
lsls r0, 9
ldr r2, =gUnknown_02023067
ldr r2, =gBattleBufferA + 3
adds r4, r0, r2
adds r7, r4, 0
subs r1, r2, 0x2
@@ -3542,7 +3542,7 @@ _080662BA:
cmp r3, r0
bcc _080662BA
_080662DC:
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r4-r7}
pop {r0}
bx r0
@@ -3943,12 +3943,12 @@ _0806666C:
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
bl sub_8072984
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_080666A8:
pop {r4-r6}
pop {r0}
@@ -4057,11 +4057,11 @@ _08066770:
ldrb r0, [r5]
cmp r0, 0x1
bne _08066794
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
b _08066796
.pool
_08066794:
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
_08066796:
ldrh r0, [r0]
bl sub_8162AA0
@@ -4072,7 +4072,7 @@ _08066796:
_080667A8:
ldrb r0, [r5]
bl sub_806D864
ldr r6, =gUnknown_020229E8
ldr r6, =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -4143,7 +4143,7 @@ _08066838:
b _0806693A
_08066840:
movs r7, 0xB0
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
@@ -4153,8 +4153,8 @@ _08066840:
b _08066948
.pool
_08066858:
bl link_get_multiplayer_id
ldr r6, =gUnknown_020229E8
bl GetMultiplayerId
ldr r6, =gLinkPlayers
movs r5, 0x1
eors r0, r5
lsls r0, 24
@@ -4167,7 +4167,7 @@ _08066858:
ldrb r0, [r1]
cmp r0, 0x4
beq _08066892
bl link_get_multiplayer_id
bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -4181,7 +4181,7 @@ _08066858:
cmp r0, 0x5
bne _080668C8
_08066892:
bl link_get_multiplayer_id
bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -4205,7 +4205,7 @@ _080668BC:
b _0806694C
.pool
_080668C8:
bl link_get_multiplayer_id
bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -4218,7 +4218,7 @@ _080668C8:
ands r0, r1
cmp r0, 0x2
beq _080668FE
bl link_get_multiplayer_id
bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -4231,7 +4231,7 @@ _080668C8:
cmp r4, 0x1
bne _08066930
_080668FE:
bl link_get_multiplayer_id
bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -4255,7 +4255,7 @@ _08066924:
b _0806694C
.pool
_08066930:
bl link_get_multiplayer_id
bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -4389,11 +4389,11 @@ sub_8066A58: @ 8066A58
ldrb r0, [r0]
cmp r0, 0x1
bne _08066A74
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
b _08066A76
.pool
_08066A74:
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
_08066A76:
ldrh r0, [r0]
bl sub_8162AA0
@@ -4503,7 +4503,7 @@ _08066A76:
adds r0, r1
ldr r1, =sub_8064438
str r1, [r0]
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -4573,7 +4573,7 @@ sub_8066B94: @ 8066B94
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -4666,7 +4666,7 @@ _08066CD0:
thumb_func_start sub_8066CEC
sub_8066CEC: @ 8066CEC
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8066CEC
@@ -4674,7 +4674,7 @@ sub_8066CEC: @ 8066CEC
thumb_func_start sub_8066CF8
sub_8066CF8: @ 8066CF8
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8066CF8
@@ -4682,7 +4682,7 @@ sub_8066CF8: @ 8066CF8
thumb_func_start sub_8066D04
sub_8066D04: @ 8066D04
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8066D04
@@ -4690,7 +4690,7 @@ sub_8066D04: @ 8066D04
thumb_func_start sub_8066D10
sub_8066D10: @ 8066D10
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8066D10
@@ -4812,7 +4812,7 @@ _08066D32:
lsrs r3, r0, 24
cmp r3, 0
beq _08066E30
bl sub_8065068
bl LinkOpponentBufferExecCompleted
b _08066E58
.pool
_08066E30:
@@ -5017,7 +5017,7 @@ _08066FA8:
lsls r0, 2
adds r0, r2
strb r4, [r0, 0x4]
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_08066FE4:
pop {r3-r5}
mov r8, r3
@@ -5039,11 +5039,11 @@ sub_8066FF4: @ 8066FF4
ldr r5, =gActiveBank
ldrb r4, [r5]
lsls r4, 9
ldr r0, =gUnknown_02023066
ldr r0, =gBattleBufferA + 2
adds r4, r0
ldrh r0, [r4]
bl battle_pick_message
ldr r0, =gUnknown_02022E2C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gBattleBankFunc
@@ -5063,7 +5063,7 @@ sub_8066FF4: @ 8066FF4
thumb_func_start sub_806704C
sub_806704C: @ 806704C
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_806704C
@@ -5071,7 +5071,7 @@ sub_806704C: @ 806704C
thumb_func_start sub_8067058
sub_8067058: @ 8067058
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8067058
@@ -5079,7 +5079,7 @@ sub_8067058: @ 8067058
thumb_func_start sub_8067064
sub_8067064: @ 8067064
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8067064
@@ -5087,7 +5087,7 @@ sub_8067064: @ 8067064
thumb_func_start sub_8067070
sub_8067070: @ 8067070
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8067070
@@ -5095,7 +5095,7 @@ sub_8067070: @ 8067070
thumb_func_start sub_806707C
sub_806707C: @ 806707C
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_806707C
@@ -5103,7 +5103,7 @@ sub_806707C: @ 806707C
thumb_func_start sub_8067088
sub_8067088: @ 8067088
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8067088
@@ -5111,7 +5111,7 @@ sub_8067088: @ 8067088
thumb_func_start sub_8067094
sub_8067094: @ 8067094
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8067094
@@ -5166,7 +5166,7 @@ sub_80670A0: @ 80670A0
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -5188,7 +5188,7 @@ _08067130:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -5215,7 +5215,7 @@ _0806715A:
thumb_func_start sub_8067190
sub_8067190: @ 8067190
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8067190
@@ -5229,7 +5229,7 @@ sub_806719C: @ 806719C
lsls r0, 24
cmp r0, 0
bne _080671F0
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -5319,7 +5319,7 @@ _08067264:
thumb_func_start sub_806727C
sub_806727C: @ 806727C
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_806727C
@@ -5327,7 +5327,7 @@ sub_806727C: @ 806727C
thumb_func_start sub_8067288
sub_8067288: @ 8067288
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8067288
@@ -5335,7 +5335,7 @@ sub_8067288: @ 8067288
thumb_func_start sub_8067294
sub_8067294: @ 8067294
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8067294
@@ -5343,7 +5343,7 @@ sub_8067294: @ 8067294
thumb_func_start sub_80672A0
sub_80672A0: @ 80672A0
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80672A0
@@ -5351,7 +5351,7 @@ sub_80672A0: @ 80672A0
thumb_func_start sub_80672AC
sub_80672AC: @ 80672AC
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80672AC
@@ -5359,7 +5359,7 @@ sub_80672AC: @ 80672AC
thumb_func_start sub_80672B8
sub_80672B8: @ 80672B8
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80672B8
@@ -5367,7 +5367,7 @@ sub_80672B8: @ 80672B8
thumb_func_start sub_80672C4
sub_80672C4: @ 80672C4
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80672C4
@@ -5375,7 +5375,7 @@ sub_80672C4: @ 80672C4
thumb_func_start sub_80672D0
sub_80672D0: @ 80672D0
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80672D0
@@ -5383,7 +5383,7 @@ sub_80672D0: @ 80672D0
thumb_func_start sub_80672DC
sub_80672DC: @ 80672DC
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80672DC
@@ -5397,7 +5397,7 @@ sub_80672E8: @ 80672E8
negs r0, r0
ands r0, r1
strb r0, [r2]
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
.pool
@@ -5422,7 +5422,7 @@ sub_8067304: @ 8067304
ands r0, r2
orrs r0, r1
strb r0, [r3]
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
.pool
@@ -5436,7 +5436,7 @@ sub_806733C: @ 806733C
movs r0, 0x7F
ands r0, r1
strb r0, [r2]
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
.pool
@@ -5457,7 +5457,7 @@ sub_8067354: @ 8067354
ands r0, r2
orrs r0, r1
strb r0, [r3]
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
.pool
@@ -5481,7 +5481,7 @@ sub_806737C: @ 806737C
lsls r0, 29
cmp r0, 0
bge _080673B0
bl sub_8065068
bl LinkOpponentBufferExecCompleted
b _080673DA
.pool
_080673B0:
@@ -5515,7 +5515,7 @@ _080673DA:
thumb_func_start sub_80673EC
sub_80673EC: @ 80673EC
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80673EC
@@ -5546,7 +5546,7 @@ _0806740C:
lsls r1, r3, 24
asrs r1, 24
bl PlaySE12WithPanning
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -5590,7 +5590,7 @@ _08067478:
orrs r0, r1
bl PlayFanfare
_0806748C:
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r4,r5}
pop {r0}
bx r0
@@ -5616,7 +5616,7 @@ sub_8067498: @ 8067498
movs r1, 0x19
movs r2, 0x5
bl PlayCry3
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
.pool
@@ -5638,7 +5638,7 @@ sub_80674D4: @ 80674D4
movs r1, 0x1
orrs r0, r1
strh r0, [r2]
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
.pool
@@ -5705,7 +5705,7 @@ sub_8067508: @ 8067508
lsls r0, 2
adds r0, r4
ldr r1, =sub_80676FC
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =c3_08038DC4
movs r1, 0x5
bl CreateTask
@@ -5889,7 +5889,7 @@ sub_8067718: @ 8067718
lsls r0, 24
cmp r0, 0
bne _08067748
bl sub_8065068
bl LinkOpponentBufferExecCompleted
b _08067812
.pool
_08067748:
@@ -5946,7 +5946,7 @@ _080677B4:
adds r5, r7, 0
ldrb r0, [r5]
lsls r3, r0, 9
ldr r4, =gUnknown_02023068
ldr r4, =gBattleBufferA + 4
adds r1, r3, r4
subs r2, r4, 0x3
adds r2, r3, r2
@@ -6025,7 +6025,7 @@ sub_806782C: @ 806782C
adds r0, r2
movs r1, 0
strb r1, [r0, 0x5]
bl sub_8065068
bl LinkOpponentBufferExecCompleted
_08067864:
pop {r4}
pop {r0}
@@ -6061,7 +6061,7 @@ sub_8067874: @ 8067874
ldr r1, =sub_8073C30
str r1, [r0]
_080678A6:
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
.pool
@@ -6070,7 +6070,7 @@ _080678A6:
thumb_func_start sub_80678C4
sub_80678C4: @ 80678C4
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80678C4
@@ -6111,7 +6111,7 @@ sub_80678D0: @ 80678D0
ldrb r0, [r4]
bl sub_805E408
_08067916:
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -6150,7 +6150,7 @@ sub_8067930: @ 8067930
lsls r0, 24
cmp r0, 0
beq _08067980
bl sub_8065068
bl LinkOpponentBufferExecCompleted
b _0806798C
.pool
_08067980:
@@ -6177,10 +6177,10 @@ sub_80679A4: @ 80679A4
ldr r0, =gActiveBank
ldrb r0, [r0]
lsls r0, 9
ldr r1, =gUnknown_02023066
ldr r1, =gBattleBufferA + 2
adds r0, r1
bl sub_81851A8
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
.pool
@@ -6189,7 +6189,7 @@ sub_80679A4: @ 80679A4
thumb_func_start sub_80679C4
sub_80679C4: @ 80679C4
push {lr}
bl sub_8065068
bl LinkOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80679C4
@@ -6200,7 +6200,7 @@ sub_80679D0: @ 80679D0
ldr r5, =gActiveBank
ldrb r0, [r5]
lsls r0, 9
ldr r4, =gUnknown_02023068
ldr r4, =gBattleBufferA + 4
adds r0, r4
bl sub_81851A8
ldrb r0, [r5]
@@ -6244,7 +6244,7 @@ _08067A08:
bl FadeOutMapMusic
movs r0, 0x3
bl BeginFastPaletteFade
bl sub_8065068
bl LinkOpponentBufferExecCompleted
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
asm/battle_controller_linkpartner.s
+25 -25
View File
@@ -184,7 +184,7 @@ sub_814B004: @ 814B004
beq _0814B05C
_0814B028:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r0, [r0]
adds r0, r1
@@ -202,7 +202,7 @@ _0814B028:
.pool
_0814B05C:
ldr r2, =gSprites
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r3, [r0]
adds r0, r3, r5
@@ -368,7 +368,7 @@ _0814B136:
lsls r0, 2
add r0, r10
bl DestroySprite
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r0, [r7]
mov r1, r8
eors r1, r0
@@ -406,7 +406,7 @@ _0814B1F0:
ldr r1, =gSprites
adds r0, r1
bl DestroySprite
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r5
ldrb r0, [r0]
@@ -486,7 +486,7 @@ bx_t4_healthbar_update: @ 814B2D0
push {r4-r6,lr}
ldr r5, =gActiveBank
ldrb r0, [r5]
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
@@ -583,7 +583,7 @@ sub_814B340: @ 814B340
lsls r0, 2
adds r0, r6
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@@ -630,7 +630,7 @@ sub_814B3DC: @ 814B3DC
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -721,7 +721,7 @@ _0814B4DA:
sub_814B4E0: @ 814B4E0
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@@ -868,7 +868,7 @@ sub_814B5A8: @ 814B5A8
adds r0, r1
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r7]
adds r0, r1, r4
ldrb r0, [r0]
@@ -985,7 +985,7 @@ LinkPartnerBufferExecCompleted: @ 814B740
ands r0, r1
cmp r0, 0
beq _0814B794
bl link_get_multiplayer_id
bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -2063,7 +2063,7 @@ sub_814C09C: @ 814C09C
ldr r0, =gActiveBank
ldrb r0, [r0]
lsls r0, 9
ldr r2, =gUnknown_02023067
ldr r2, =gBattleBufferA + 3
adds r3, r0, r2
adds r6, r3, 0
subs r1, r2, 0x2
@@ -3510,7 +3510,7 @@ _0814CE5C:
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -3621,7 +3621,7 @@ _0814CF62:
ldr r5, =gActiveBank
ldrb r0, [r5]
bl sub_806D864
ldr r6, =gUnknown_020229E8
ldr r6, =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -3854,7 +3854,7 @@ sub_814D0F0: @ 814D0F0
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -4348,11 +4348,11 @@ sub_814D590: @ 814D590
ldr r5, =gActiveBank
ldrb r4, [r5]
lsls r4, 9
ldr r0, =gUnknown_02023066
ldr r0, =gBattleBufferA + 2
adds r4, r0
ldrh r0, [r4]
bl battle_pick_message
ldr r0, =gUnknown_02022E2C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gBattleBankFunc
@@ -4475,7 +4475,7 @@ sub_814D63C: @ 814D63C
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -4497,7 +4497,7 @@ _0814D6CC:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -4538,7 +4538,7 @@ sub_814D738: @ 814D738
lsls r0, 24
cmp r0, 0
bne _0814D78C
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -5022,7 +5022,7 @@ sub_814DAA8: @ 814DAA8
lsls r0, 2
adds r0, r4
ldr r1, =sub_805CC00
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -5038,7 +5038,7 @@ sub_814DAA8: @ 814DAA8
lsrs r7, r0, 24
ldrb r0, [r6]
bl sub_806D864
ldr r4, =gUnknown_020229E8
ldr r4, =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -5341,7 +5341,7 @@ _0814DE08:
strb r1, [r0]
ldrb r0, [r5]
lsls r3, r0, 9
ldr r4, =gUnknown_02023068
ldr r4, =gBattleBufferA + 4
adds r1, r3, r4
subs r2, r4, 0x3
adds r2, r3, r2
@@ -5571,7 +5571,7 @@ sub_814E014: @ 814E014
ldr r0, =gActiveBank
ldrb r0, [r0]
lsls r0, 9
ldr r1, =gUnknown_02023066
ldr r1, =gBattleBufferA + 2
adds r0, r1
bl sub_81851A8
bl LinkPartnerBufferExecCompleted
@@ -5594,7 +5594,7 @@ sub_814E040: @ 814E040
ldr r5, =gActiveBank
ldrb r0, [r5]
lsls r0, 9
ldr r4, =gUnknown_02023068
ldr r4, =gBattleBufferA + 4
adds r0, r4
bl sub_81851A8
ldr r2, =gBattleOutcome
asm/battle_controller_opponent.s
+33 -33
View File
@@ -224,7 +224,7 @@ _0805F31E:
beq _0805F368
_0805F32C:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r3, =gActiveBank
ldrb r0, [r3]
adds r0, r1
@@ -246,7 +246,7 @@ _0805F34E:
.pool
_0805F368:
ldr r3, =gSprites
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
ldr r2, =gActiveBank
ldrb r4, [r2]
adds r0, r4, r6
@@ -593,7 +593,7 @@ _0805F5EE:
ands r0, r1
cmp r0, 0
bne _0805F684
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
mov r1, r8
ldrb r0, [r1]
adds r1, r7, 0
@@ -621,7 +621,7 @@ _0805F5EE:
ldrb r0, [r0]
bl sub_80729D0
_0805F684:
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5
@@ -1056,7 +1056,7 @@ sub_805FA70: @ 805FA70
push {r4-r6,lr}
ldr r6, =gActiveBank
ldrb r0, [r6]
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
adds r1, r0, r5
ldrb r1, [r1]
movs r2, 0
@@ -1108,7 +1108,7 @@ sub_805FAC4: @ 805FAC4
lsls r0, 31
cmp r0, 0
bne _0805FAF2
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r3, r0
ldrb r0, [r0]
bl sub_8072984
@@ -1155,7 +1155,7 @@ sub_805FB08: @ 805FB08
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -1246,7 +1246,7 @@ _0805FC0A:
sub_805FC10: @ 805FC10
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@@ -1402,7 +1402,7 @@ sub_805FD00: @ 805FD00
adds r0, r7
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@@ -1586,7 +1586,7 @@ OpponentBufferExecCompleted: @ 805FF18
ands r0, r1
cmp r0, 0
beq _0805FF6C
bl link_get_multiplayer_id
bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -2672,7 +2672,7 @@ sub_8060890: @ 8060890
ldr r3, =gActiveBank
ldrb r0, [r3]
lsls r0, 9
ldr r2, =gUnknown_02023067
ldr r2, =gBattleBufferA + 3
adds r4, r0, r2
adds r7, r4, 0
subs r1, r2, 0x2
@@ -4105,7 +4105,7 @@ _080615B4:
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -4201,11 +4201,11 @@ sub_8061690: @ 8061690
ands r0, r2
cmp r0, 0
beq _080616B0
bl sub_806B830
bl GetSecretBaseTrainerPicIndex
b _0806175A
.pool
_080616B0:
ldr r3, =gUnknown_02038BCA
ldr r3, =gTrainerBattleOpponent_A
ldrh r1, [r3]
ldr r0, =0x000003fe
cmp r1, r0
@@ -4233,7 +4233,7 @@ _080616C8:
b _0806175A
.pool
_080616F0:
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r0, [r0]
bl sub_81D5588
b _0806175A
@@ -4260,7 +4260,7 @@ _08061708:
b _0806175A
.pool
_08061734:
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r0, [r0]
bl sub_8162AA0
b _0806175A
@@ -4291,7 +4291,7 @@ _08061760:
cmp r0, 0x1
beq _08061788
ldr r2, =gTrainers
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r1, [r0]
b _0806178C
.pool
@@ -4448,11 +4448,11 @@ sub_80618D8: @ 80618D8
ands r0, r2
cmp r0, 0
beq _080618F8
bl sub_806B830
bl GetSecretBaseTrainerPicIndex
b _080619A2
.pool
_080618F8:
ldr r3, =gUnknown_02038BCA
ldr r3, =gTrainerBattleOpponent_A
ldrh r1, [r3]
ldr r0, =0x000003fe
cmp r1, r0
@@ -4480,7 +4480,7 @@ _08061910:
b _080619A2
.pool
_08061938:
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r0, [r0]
bl sub_81D5588
b _080619A2
@@ -4507,7 +4507,7 @@ _08061950:
b _080619A2
.pool
_0806197C:
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r0, [r0]
bl sub_8162AA0
b _080619A2
@@ -4538,7 +4538,7 @@ _080619A8:
cmp r0, 0x1
beq _080619D0
ldr r2, =gTrainers
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r1, [r0]
b _080619D4
.pool
@@ -4725,7 +4725,7 @@ sub_8061AF0: @ 8061AF0
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -5179,11 +5179,11 @@ sub_8061F34: @ 8061F34
ldr r5, =gActiveBank
ldrb r4, [r5]
lsls r4, 9
ldr r0, =gUnknown_02023066
ldr r0, =gBattleBufferA + 2
adds r4, r0
ldrh r0, [r4]
bl battle_pick_message
ldr r0, =gUnknown_02022E2C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gBattleBankFunc
@@ -5252,7 +5252,7 @@ _08061FE4:
ldr r0, =gActiveBank
ldrb r0, [r0]
lsls r0, 9
ldr r1, =gUnknown_02023068
ldr r1, =gBattleBufferA + 4
adds r5, r0, r1
movs r0, 0x93
lsls r0, 3
@@ -5261,7 +5261,7 @@ _08061FE4:
beq _080620C4
movs r0, 0xF
bl BattleAI_SetupAIData
bl sub_8130BA4
bl BattleAI_ChooseMoveOrAction
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x5
@@ -5616,7 +5616,7 @@ sub_8062294: @ 8062294
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -5638,7 +5638,7 @@ _08062324:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -5679,7 +5679,7 @@ sub_8062390: @ 8062390
lsls r0, 24
cmp r0, 0
bne _080623E4
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -6155,7 +6155,7 @@ sub_80626FC: @ 80626FC
lsls r0, 2
adds r0, r4
ldr r1, =sub_806280C
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =sub_8062828
movs r1, 0x5
bl CreateTask
@@ -6401,7 +6401,7 @@ _080629B4:
adds r5, r7, 0
ldrb r0, [r5]
lsls r3, r0, 9
ldr r4, =gUnknown_02023068
ldr r4, =gBattleBufferA + 4
adds r1, r3, r4
subs r2, r4, 0x3
adds r2, r3, r2
asm/battle_controller_player.s
+56 -56
View File
@@ -45,7 +45,7 @@ PlayerBufferExecCompleted: @ 805748C
ands r0, r1
cmp r0, 0
beq _080574E0
bl link_get_multiplayer_id
bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -856,7 +856,7 @@ sub_8057BFC: @ 8057BFC
ldr r3, =gActiveBank
ldrb r0, [r3]
lsls r0, 9
ldr r1, =gUnknown_02023068
ldr r1, =gBattleBufferA + 4
adds r6, r0, r1
ldr r2, =gMain
ldrh r1, [r2, 0x2C]
@@ -991,7 +991,7 @@ _08057D24:
cmp r0, 0
bne _08057D5A
movs r0, 0
bl sub_8069DEC
bl CountAliveMonsInBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1471,7 +1471,7 @@ _08058152:
b _080584A8
_08058170:
lsls r1, 9
ldr r0, =gUnknown_02023068
ldr r0, =gBattleBufferA + 4
adds r1, r0
mov r9, r1
ldrb r1, [r2]
@@ -2401,7 +2401,7 @@ sub_805896C: @ 805896C
beq _080589D0
_08058998:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r3, =gActiveBank
ldrb r0, [r3]
adds r0, r1
@@ -2420,7 +2420,7 @@ _08058998:
.pool
_080589D0:
ldr r3, =gSprites
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
ldr r2, =gActiveBank
ldrb r4, [r2]
adds r0, r4, r6
@@ -2682,7 +2682,7 @@ _08058BB2:
ands r0, r1
cmp r0, 0
bne _08058C38
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r0, [r7]
adds r1, r6, 0
eors r1, r0
@@ -2707,7 +2707,7 @@ _08058BB2:
ldrb r0, [r0]
bl sub_80729D0
_08058C38:
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5
@@ -3001,7 +3001,7 @@ _08058EAA:
sub_8058EDC: @ 8058EDC
push {r4-r6,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r6, =gActiveBank
ldrb r3, [r6]
adds r0, r3, r0
@@ -3194,7 +3194,7 @@ _0805905E:
bne _080590D2
adds r0, r3, r4
bl DestroySprite
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@@ -3255,7 +3255,7 @@ bx_t1_healthbar_update: @ 8059130
push {r4-r6,lr}
ldr r5, =gActiveBank
ldrb r0, [r5]
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
@@ -3399,7 +3399,7 @@ _080591FE:
mov r2, sp
bl SetMonData
adds r0, r6, 0
bl pokemon_calc_effective_stats
bl CalculateMonStats
ldr r2, [sp]
add r0, sp, 0x4
ldrh r0, [r0]
@@ -3550,7 +3550,7 @@ sub_8059330: @ 8059330
adds r4, r6
ldr r2, [r4]
subs r2, r1
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
add r0, r10
ldrb r1, [r0]
mov r0, r9
@@ -3605,7 +3605,7 @@ _08059430:
ldrh r2, [r6, 0xA]
mov r10, r2
ldrb r7, [r6, 0xC]
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
adds r5, r7, r5
ldrb r1, [r5]
adds r0, r7, 0
@@ -3673,7 +3673,7 @@ _08059430:
mov r2, sp
bl SetMonData
adds r0, r5, 0
bl pokemon_calc_effective_stats
bl CalculateMonStats
ldr r2, [sp]
add r0, sp, 0x4
ldrh r0, [r0]
@@ -3809,7 +3809,7 @@ sub_80595A4: @ 80595A4
ldrh r0, [r0]
cmp r4, r0
bne _08059624
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r2, r0
ldrb r0, [r0]
adds r1, r7, 0
@@ -3818,7 +3818,7 @@ sub_80595A4: @ 80595A4
b _08059638
.pool
_08059624:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0x64
@@ -3926,7 +3926,7 @@ sub_80596A8: @ 80596A8
lsls r0, 2
adds r0, r6
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@@ -3973,7 +3973,7 @@ sub_8059744: @ 8059744
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -4332,12 +4332,12 @@ sub_8059AAC: @ 8059AAC
ldr r0, =gActiveBank
ldrb r1, [r0]
lsls r1, 9
ldr r3, =gUnknown_02023068
ldr r3, =gBattleBufferA + 4
ldr r2, =gUnknown_03005D78
movs r0, 0
strb r0, [r2]
movs r5, 0
ldr r7, =gUnknown_02022E2C
ldr r7, =gDisplayedStringBattle
adds r4, r1, r3
adds r6, r2, 0
_08059AC4:
@@ -4376,7 +4376,7 @@ _08059AF4:
thumb_func_start sub_8059B18
sub_8059B18: @ 8059B18
push {r4,lr}
ldr r4, =gUnknown_02022E2C
ldr r4, =gDisplayedStringBattle
ldr r1, =gUnknown_085CCA6F
adds r0, r4, 0
bl StringCopy
@@ -4406,7 +4406,7 @@ sub_8059B3C: @ 8059B3C
lsls r4, r1, 9
adds r0, r5, 0x4
adds r4, r0
ldr r6, =gUnknown_02022E2C
ldr r6, =gDisplayedStringBattle
ldr r5, =gUnknown_020244B0
adds r1, r5
adds r0, r4, 0
@@ -4446,9 +4446,9 @@ sub_8059BB0: @ 8059BB0
ldr r5, =gActiveBank
ldrb r4, [r5]
lsls r4, 9
ldr r0, =gUnknown_02023068
ldr r0, =gBattleBufferA + 4
adds r4, r0
ldr r6, =gUnknown_02022E2C
ldr r6, =gDisplayedStringBattle
ldr r1, =gUnknown_085CCA73
adds r0, r6, 0
bl StringCopy
@@ -5778,7 +5778,7 @@ dp01_setattr_by_ch1_for_player_pokemon: @ 805A6F4
ldr r0, =gActiveBank
ldrb r0, [r0]
lsls r0, 9
ldr r2, =gUnknown_02023067
ldr r2, =gBattleBufferA + 3
adds r3, r0, r2
adds r6, r3, 0
subs r1, r2, 0x2
@@ -7158,7 +7158,7 @@ _0805B41C:
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -7253,8 +7253,8 @@ sub_805B4F0: @ 805B4F0
ands r0, r1
cmp r0, 0
beq _0805B5B4
bl link_get_multiplayer_id
ldr r5, =gUnknown_020229E8
bl GetMultiplayerId
ldr r5, =gLinkPlayers
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7265,7 +7265,7 @@ sub_805B4F0: @ 805B4F0
ldrb r0, [r1]
cmp r0, 0x4
beq _0805B538
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7278,7 +7278,7 @@ sub_805B4F0: @ 805B4F0
cmp r0, 0x5
bne _0805B558
_0805B538:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7290,7 +7290,7 @@ _0805B538:
b _0805B5BA
.pool
_0805B558:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7302,7 +7302,7 @@ _0805B558:
ands r0, r1
cmp r0, 0x2
beq _0805B58A
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7314,7 +7314,7 @@ _0805B558:
cmp r4, 0x1
bne _0805B5A0
_0805B58A:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7325,7 +7325,7 @@ _0805B58A:
adds r4, r0, 0x4
b _0805B5BA
_0805B5A0:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7635,8 +7635,8 @@ dp01t_08_1_8032428: @ 805B864
ands r0, r1
cmp r0, 0
beq _0805B920
bl link_get_multiplayer_id
ldr r5, =gUnknown_020229E8
bl GetMultiplayerId
ldr r5, =gLinkPlayers
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7647,7 +7647,7 @@ dp01t_08_1_8032428: @ 805B864
ldrb r0, [r1]
cmp r0, 0x4
beq _0805B8A6
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7660,7 +7660,7 @@ dp01t_08_1_8032428: @ 805B864
cmp r0, 0x5
bne _0805B8C4
_0805B8A6:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7672,7 +7672,7 @@ _0805B8A6:
b _0805B926
.pool
_0805B8C4:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7684,7 +7684,7 @@ _0805B8C4:
ands r0, r1
cmp r0, 0x2
beq _0805B8F6
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7696,7 +7696,7 @@ _0805B8C4:
cmp r4, 0x1
bne _0805B90C
_0805B8F6:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7707,7 +7707,7 @@ _0805B8F6:
adds r4, r0, 0x4
b _0805B926
_0805B90C:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7865,7 +7865,7 @@ sub_805B9F8: @ 805B9F8
lsls r0, 2
adds r0, r4
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -8452,11 +8452,11 @@ sub_805BF80: @ 805BF80
ldr r5, =gActiveBank
ldrb r4, [r5]
lsls r4, 9
ldr r0, =gUnknown_02023066
ldr r0, =gBattleBufferA + 2
adds r4, r0
ldrh r0, [r4]
bl battle_pick_message
ldr r0, =gUnknown_02022E2C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gBattleBankFunc
@@ -8551,8 +8551,8 @@ _0805C062:
movs r1, 0
bl sub_8059CB4
ldr r0, =gUnknown_085CC9F3
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl battle_show_message_maybe
pop {r4}
@@ -8987,7 +8987,7 @@ _0805C44A:
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -9011,7 +9011,7 @@ _0805C4B4:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
adds r1, r0, r4
ldrb r1, [r1]
str r7, [sp]
@@ -9117,7 +9117,7 @@ sub_805C5C4: @ 805C5C4
lsls r0, 24
cmp r0, 0
bne _0805C618
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -9743,7 +9743,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80
lsls r0, 2
adds r0, r5
ldr r1, =sub_805CC00
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -10030,7 +10030,7 @@ _0805CDA4:
strb r1, [r0]
ldrb r0, [r5]
lsls r3, r0, 9
ldr r4, =gUnknown_02023068
ldr r4, =gBattleBufferA + 4
adds r1, r3, r4
subs r2, r4, 0x3
adds r2, r3, r2
@@ -10269,7 +10269,7 @@ dp01t_35_1_link_standby_message_and_free_vram: @ 805CFC8
ldr r5, =gActiveBank
ldrb r0, [r5]
lsls r0, 9
ldr r4, =gUnknown_02023066
ldr r4, =gBattleBufferA + 2
adds r0, r4
bl sub_81851A8
ldrb r0, [r5]
@@ -10366,7 +10366,7 @@ sub_805D094: @ 805D094
ldr r5, =gActiveBank
ldrb r0, [r5]
lsls r0, 9
ldr r4, =gUnknown_02023068
ldr r4, =gBattleBufferA + 4
adds r0, r4
bl sub_81851A8
ldr r2, =gBattleOutcome
asm/battle_controller_player_partner.s
+29 -29
View File
@@ -185,7 +185,7 @@ sub_81BAF48: @ 81BAF48
beq _081BAFA0
_081BAF6C:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r0, [r0]
adds r0, r1
@@ -203,7 +203,7 @@ _081BAF6C:
.pool
_081BAFA0:
ldr r2, =gSprites
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r3, [r0]
adds r0, r3, r5
@@ -369,7 +369,7 @@ _081BB07A:
lsls r0, 2
add r0, r10
bl DestroySprite
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r0, [r7]
mov r1, r8
eors r1, r0
@@ -407,7 +407,7 @@ _081BB134:
ldr r1, =gSprites
adds r0, r1
bl DestroySprite
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r5
ldrb r0, [r0]
@@ -487,7 +487,7 @@ bx_t3_healthbar_update: @ 81BB214
push {r4-r6,lr}
ldr r5, =gActiveBank
ldrb r0, [r5]
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
@@ -631,7 +631,7 @@ _081BB2E2:
mov r2, sp
bl SetMonData
adds r0, r6, 0
bl pokemon_calc_effective_stats
bl CalculateMonStats
ldr r2, [sp]
add r0, sp, 0x4
ldrh r0, [r0]
@@ -782,7 +782,7 @@ sub_81BB414: @ 81BB414
adds r4, r6
ldr r2, [r4]
subs r2, r1
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
add r0, r10
ldrb r1, [r0]
mov r0, r9
@@ -837,7 +837,7 @@ _081BB514:
ldrh r2, [r6, 0xA]
mov r10, r2
ldrb r7, [r6, 0xC]
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
adds r5, r7, r5
ldrb r1, [r5]
adds r0, r7, 0
@@ -905,7 +905,7 @@ _081BB514:
mov r2, sp
bl SetMonData
adds r0, r5, 0
bl pokemon_calc_effective_stats
bl CalculateMonStats
ldr r2, [sp]
add r0, sp, 0x4
ldrh r0, [r0]
@@ -1041,7 +1041,7 @@ sub_81BB688: @ 81BB688
ldrh r0, [r0]
cmp r4, r0
bne _081BB708
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r2, r0
ldrb r0, [r0]
adds r1, r7, 0
@@ -1050,7 +1050,7 @@ sub_81BB688: @ 81BB688
b _081BB71C
.pool
_081BB708:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0x64
@@ -1158,7 +1158,7 @@ sub_81BB78C: @ 81BB78C
lsls r0, 2
adds r0, r6
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@@ -1205,7 +1205,7 @@ sub_81BB828: @ 81BB828
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -1296,7 +1296,7 @@ _081BB926:
sub_81BB92C: @ 81BB92C
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@@ -1443,7 +1443,7 @@ sub_81BB9F4: @ 81BB9F4
adds r0, r1
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r7]
adds r0, r1, r4
ldrb r0, [r0]
@@ -1560,7 +1560,7 @@ PlayerPartnerBufferExecCompleted: @ 81BBB8C
ands r0, r1
cmp r0, 0
beq _081BBBE0
bl link_get_multiplayer_id
bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -2638,7 +2638,7 @@ sub_81BC4E8: @ 81BC4E8
ldr r0, =gActiveBank
ldrb r0, [r0]
lsls r0, 9
ldr r2, =gUnknown_02023067
ldr r2, =gBattleBufferA + 3
adds r3, r0, r2
adds r6, r3, 0
subs r1, r2, 0x2
@@ -4085,7 +4085,7 @@ _081BD2A8:
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -4478,7 +4478,7 @@ sub_81BD5C8: @ 81BD5C8
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -4960,11 +4960,11 @@ sub_81BDA4C: @ 81BDA4C
ldr r4, =gActiveBank
ldrb r0, [r4]
lsls r0, 9
ldr r1, =gUnknown_02023066
ldr r1, =gBattleBufferA + 2
adds r0, r1
ldrh r0, [r0]
bl battle_pick_message
ldr r0, =gUnknown_02022E2C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gBattleBankFunc
@@ -5010,11 +5010,11 @@ sub_81BDAC8: @ 81BDAC8
ldr r6, =gActiveBank
ldrb r4, [r6]
lsls r4, 9
ldr r0, =gUnknown_02023068
ldr r0, =gBattleBufferA + 4
adds r4, r0
movs r0, 0xF
bl BattleAI_SetupAIData
bl sub_8130BA4
bl BattleAI_ChooseMoveOrAction
lsls r0, 24
lsrs r5, r0, 24
ldr r2, =gBattleMoves
@@ -5204,7 +5204,7 @@ sub_81BDC10: @ 81BDC10
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -5226,7 +5226,7 @@ _081BDCA0:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -5325,7 +5325,7 @@ sub_81BDD9C: @ 81BDD9C
lsls r0, 24
cmp r0, 0
bne _081BDDF0
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -5809,7 +5809,7 @@ sub_81BE10C: @ 81BE10C
lsls r0, 2
adds r0, r4
ldr r1, =sub_805CC00
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r5]
adds r0, r6
ldrb r1, [r0]
@@ -6074,7 +6074,7 @@ _081BE404:
strb r1, [r0]
ldrb r0, [r5]
lsls r3, r0, 9
ldr r4, =gUnknown_02023068
ldr r4, =gBattleBufferA + 4
adds r1, r3, r4
subs r2, r4, 0x3
adds r2, r3, r2
asm/battle_controller_recorded_opponent.s
+25 -25
View File
@@ -214,7 +214,7 @@ sub_8186678: @ 8186678
beq _081866F8
_081866A4:
ldr r4, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r2, =gActiveBank
ldrb r3, [r2]
adds r0, r3, r0
@@ -246,7 +246,7 @@ _081866A4:
.pool
_081866F8:
ldr r6, =gSprites
ldr r7, =gUnknown_03005D70
ldr r7, =gHealthBoxesIds
ldr r2, =gActiveBank
ldrb r3, [r2]
adds r0, r3, r7
@@ -514,7 +514,7 @@ _081868DE:
ands r0, r1
cmp r0, 0
bne _08186964
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r0, [r7]
adds r1, r6, 0
eors r1, r0
@@ -539,7 +539,7 @@ _081868DE:
ldrb r0, [r0]
bl sub_80729D0
_08186964:
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5
@@ -943,7 +943,7 @@ sub_8186D04: @ 8186D04
push {r4-r6,lr}
ldr r6, =gActiveBank
ldrb r0, [r6]
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
adds r1, r0, r5
ldrb r1, [r1]
movs r2, 0
@@ -995,7 +995,7 @@ sub_8186D58: @ 8186D58
lsls r0, 31
cmp r0, 0
bne _08186D86
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r3, r0
ldrb r0, [r0]
bl sub_8072984
@@ -1042,7 +1042,7 @@ sub_8186D9C: @ 8186D9C
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -1133,7 +1133,7 @@ _08186E9E:
sub_8186EA4: @ 8186EA4
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@@ -1289,7 +1289,7 @@ sub_8186F94: @ 8186F94
adds r0, r7
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@@ -1473,7 +1473,7 @@ RecordedOpponentBufferExecCompleted: @ 81871AC
ands r0, r1
cmp r0, 0
beq _08187200
bl link_get_multiplayer_id
bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -2503,7 +2503,7 @@ dp01_setattr_for_opponent_pokemon: @ 8187AA8
ldr r3, =gActiveBank
ldrb r0, [r3]
lsls r0, 9
ldr r2, =gUnknown_02023067
ldr r2, =gBattleBufferA + 3
adds r4, r0, r2
adds r7, r4, 0
subs r1, r2, 0x2
@@ -3924,7 +3924,7 @@ _081887B0:
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -4038,11 +4038,11 @@ _081888B4:
ldrb r0, [r4]
cmp r0, 0x1
bne _081888D8
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
b _081888DA
.pool
_081888D8:
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
_081888DA:
ldrh r0, [r0]
bl sub_8162AA0
@@ -4057,7 +4057,7 @@ _081888EC:
b _08188924
_081888F6:
movs r7, 0xB0
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
@@ -4067,7 +4067,7 @@ _081888F6:
b _08188928
.pool
_08188910:
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
ldr r0, =gUnknown_0203C7B4
ldrb r0, [r0]
movs r1, 0x1
@@ -4262,7 +4262,7 @@ sub_8188A4C: @ 8188A4C
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -4716,11 +4716,11 @@ sub_8188E90: @ 8188E90
ldr r4, =gActiveBank
ldrb r0, [r4]
lsls r0, 9
ldr r1, =gUnknown_02023066
ldr r1, =gBattleBufferA + 2
adds r0, r1
ldrh r0, [r0]
bl battle_pick_message
ldr r0, =gUnknown_02022E2C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gBattleBankFunc
@@ -4905,7 +4905,7 @@ sub_8188FD0: @ 8188FD0
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -4927,7 +4927,7 @@ _08189060:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -4968,7 +4968,7 @@ sub_81890CC: @ 81890CC
lsls r0, 24
cmp r0, 0
bne _08189120
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -5444,7 +5444,7 @@ sub_8189438: @ 8189438
lsls r0, 2
adds r0, r4
ldr r1, =sub_818962C
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =c3_0803D564
movs r1, 0x5
bl CreateTask
@@ -5685,7 +5685,7 @@ _081896E4:
adds r5, r7, 0
ldrb r0, [r5]
lsls r3, r0, 9
ldr r4, =gUnknown_02023068
ldr r4, =gBattleBufferA + 4
adds r1, r3, r4
subs r2, r4, 0x3
adds r2, r3, r2
asm/battle_controller_recorded_player.s
+26 -26
View File
@@ -196,7 +196,7 @@ _08189ABA:
beq _08189B0C
_08189ADA:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r1, [r0]
@@ -213,7 +213,7 @@ _08189ADA:
.pool
_08189B0C:
ldr r2, =gSprites
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r3, [r0]
adds r0, r3, r5
@@ -382,7 +382,7 @@ _08189C60:
beq _08189CB0
_08189C80:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r1, [r0]
@@ -399,7 +399,7 @@ _08189C80:
.pool
_08189CB0:
ldr r2, =gSprites
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r3, [r0]
adds r0, r3, r5
@@ -571,7 +571,7 @@ _08189DBE:
ands r0, r1
cmp r0, 0
bne _08189E54
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
mov r1, r9
ldrb r0, [r1]
adds r1, r7, 0
@@ -599,7 +599,7 @@ _08189DBE:
ldrb r0, [r0]
bl sub_80729D0
_08189E54:
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5
@@ -862,7 +862,7 @@ sub_818A0A4: @ 818A0A4
push {r4-r6,lr}
ldr r5, =gActiveBank
ldrb r0, [r5]
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
@@ -959,7 +959,7 @@ sub_818A114: @ 818A114
lsls r0, 2
adds r0, r6
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@@ -1006,7 +1006,7 @@ sub_818A1B0: @ 818A1B0
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -1097,7 +1097,7 @@ _0818A2AE:
sub_818A2B4: @ 818A2B4
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@@ -1244,7 +1244,7 @@ sub_818A37C: @ 818A37C
adds r0, r1
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r7]
adds r0, r1, r4
ldrb r0, [r0]
@@ -1361,7 +1361,7 @@ RecordedPlayerBufferExecCompleted: @ 818A514
ands r0, r1
cmp r0, 0
beq _0818A568
bl link_get_multiplayer_id
bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -2439,7 +2439,7 @@ sub_818AE70: @ 818AE70
ldr r0, =gActiveBank
ldrb r0, [r0]
lsls r0, 9
ldr r2, =gUnknown_02023067
ldr r2, =gBattleBufferA + 3
adds r3, r0, r2
adds r6, r3, 0
subs r1, r2, 0x2
@@ -3886,7 +3886,7 @@ _0818BC30:
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -3992,7 +3992,7 @@ sub_818BD04: @ 818BD04
b _0818BD4C
.pool
_0818BD30:
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
ldr r0, =gUnknown_0203C7B4
ldrb r1, [r0]
lsls r0, r1, 3
@@ -4002,7 +4002,7 @@ _0818BD30:
b _0818BD4A
.pool
_0818BD48:
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
_0818BD4A:
ldrb r4, [r0, 0x13]
_0818BD4C:
@@ -4334,7 +4334,7 @@ sub_818BFB8: @ 818BFB8
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -4816,11 +4816,11 @@ sub_818C43C: @ 818C43C
ldr r4, =gActiveBank
ldrb r0, [r4]
lsls r0, 9
ldr r1, =gUnknown_02023066
ldr r1, =gBattleBufferA + 2
adds r0, r1
ldrh r0, [r0]
bl battle_pick_message
ldr r0, =gUnknown_02022E2C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gBattleBankFunc
@@ -5049,7 +5049,7 @@ sub_818C5E8: @ 818C5E8
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -5071,7 +5071,7 @@ _0818C678:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
adds r1, r0, r4
ldrb r1, [r1]
str r7, [sp]
@@ -5119,7 +5119,7 @@ sub_818C6F4: @ 818C6F4
lsls r0, 24
cmp r0, 0
bne _0818C748
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@@ -5603,7 +5603,7 @@ sub_818CA64: @ 818CA64
lsls r0, 2
adds r0, r4
ldr r1, =sub_805CC00
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -5624,7 +5624,7 @@ sub_818CA64: @ 818CA64
ands r0, r1
cmp r0, 0
beq _0818CB54
ldr r4, =gUnknown_020229E8
ldr r4, =gLinkPlayers
ldrb r0, [r6]
bl sub_806D864
lsls r1, r0, 3
@@ -5870,7 +5870,7 @@ _0818CD60:
strb r1, [r0]
ldrb r0, [r5]
lsls r3, r0, 9
ldr r4, =gUnknown_02023068
ldr r4, =gBattleBufferA + 4
adds r1, r3, r4
subs r2, r4, 0x3
adds r2, r3, r2
asm/battle_controller_safari.s
+1412
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_wally.s
+17 -17
View File
@@ -444,7 +444,7 @@ _081686D2:
lsls r0, 2
add r0, r8
bl DestroySprite
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r0, [r5]
adds r1, r6, 0
eors r1, r0
@@ -480,7 +480,7 @@ _0816877A:
ldr r1, =gSprites
adds r0, r1
bl DestroySprite
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r5
ldrb r0, [r0]
@@ -530,7 +530,7 @@ sub_8168818: @ 8168818
push {r7}
movs r4, 0
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r1, =gActiveBank
mov r8, r1
ldrb r3, [r1]
@@ -653,7 +653,7 @@ sub_8168934: @ 8168934
push {r4-r6,lr}
ldr r5, =gActiveBank
ldrb r0, [r5]
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
@@ -792,7 +792,7 @@ sub_8168A20: @ 8168A20
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -871,7 +871,7 @@ WallyBufferExecCompleted: @ 8168AF8
ands r0, r1
cmp r0, 0
beq _08168B4C
bl link_get_multiplayer_id
bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -1925,7 +1925,7 @@ sub_8169424: @ 8169424
ldr r0, =gActiveBank
ldrb r0, [r0]
lsls r0, 9
ldr r2, =gUnknown_02023067
ldr r2, =gBattleBufferA + 3
adds r3, r0, r2
adds r6, r3, 0
subs r1, r2, 0x2
@@ -3011,7 +3011,7 @@ _08169E80:
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@@ -3600,11 +3600,11 @@ sub_816A3B8: @ 816A3B8
ldr r4, =gActiveBank
ldrb r0, [r4]
lsls r0, 9
ldr r1, =gUnknown_02023066
ldr r1, =gBattleBufferA + 2
adds r0, r1
ldrh r0, [r0]
bl battle_pick_message
ldr r0, =gUnknown_02022E2C
bl BufferStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gBattleBankFunc
@@ -3693,8 +3693,8 @@ _0816A48A:
movs r1, 0
bl sub_8059CB4
ldr r0, =gUnknown_085CCA15
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl battle_show_message_maybe
pop {r4}
@@ -3878,7 +3878,7 @@ sub_816A5D4: @ 816A5D4
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@@ -3900,7 +3900,7 @@ _0816A664:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
adds r1, r0, r4
ldrb r1, [r1]
str r7, [sp]
@@ -4296,7 +4296,7 @@ sub_816A90C: @ 816A90C
lsls r0, 2
adds r0, r5
ldr r1, =sub_805CC00
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -4637,7 +4637,7 @@ _0816ACA8:
strb r1, [r0]
ldrb r0, [r5]
lsls r4, r0, 9
ldr r3, =gUnknown_02023068
ldr r3, =gBattleBufferA + 4
adds r1, r4, r3
subs r2, r3, 0x3
adds r2, r4, r2
asm/battle_message.s
+75 -75
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start battle_pick_message
battle_pick_message: @ 814E0C4
thumb_func_start BufferStringBattle
BufferStringBattle: @ 814E0C4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -15,15 +15,15 @@ battle_pick_message: @ 814E0C4
lsls r0, 16
lsrs r6, r0, 16
movs r7, 0
ldr r4, =gUnknown_0203ABA8
ldr r4, =gStringInfo
ldr r0, =gActiveBank
mov r8, r0
ldrb r1, [r0]
lsls r1, 9
ldr r0, =gUnknown_02023068
ldr r0, =gBattleBufferA + 4
adds r1, r0
str r1, [r4]
ldr r2, =gUnknown_02024208
ldr r2, =gLastUsedItem
ldrh r0, [r1, 0x4]
strh r0, [r2]
ldr r2, =gLastUsedAbility
@@ -55,7 +55,7 @@ battle_pick_message: @ 814E0C4
mov r9, r5
ldr r1, =gBattleTextBuff1
mov r10, r1
ldr r3, =gUnknown_0203ABA4
ldr r3, =gAbilitiesPerBank
_0814E126:
adds r0, r2, r3
ldr r1, [r4]
@@ -69,9 +69,9 @@ _0814E126:
movs r2, 0
ldr r0, =gBattleTextBuff1
mov r8, r0
ldr r3, =gUnknown_0203ABA8
ldr r3, =gStringInfo
ldr r5, =gBattleTextBuff2
ldr r4, =gUnknown_02022F78
ldr r4, =gBattleTextBuff3
_0814E144:
mov r0, r8
adds r1, r2, r0
@@ -145,7 +145,7 @@ _0814E200:
b _0814E6D8
.pool
_0814E214:
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
@@ -302,7 +302,7 @@ _0814E368:
ands r1, r0
cmp r1, 0
beq _0814E380
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
@@ -353,7 +353,7 @@ _0814E3E0:
b _0814E6D8
.pool
_0814E3EC:
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 4
@@ -444,7 +444,7 @@ _0814E4AC:
b _0814E6D8
.pool
_0814E4BC:
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
@@ -475,7 +475,7 @@ _0814E4F2:
_0814E4F8:
mov r0, r10
bl sub_814F8F8
ldr r0, =gUnknown_0203ABA8
ldr r0, =gStringInfo
ldr r2, [r0]
ldrh r1, [r2]
movs r0, 0xB1
@@ -609,7 +609,7 @@ _0814E630:
b _0814E6D8
.pool
_0814E638:
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0xC0
lsls r0, 4
@@ -673,7 +673,7 @@ _0814E6B8:
lsls r0, 1
cmp r6, r0
bls _0814E6CC
ldr r1, =gUnknown_02022E2C
ldr r1, =gDisplayedStringBattle
movs r0, 0xFF
strb r0, [r1]
b _0814E6DE
@@ -687,7 +687,7 @@ _0814E6CC:
ldr r7, [r0]
_0814E6D8:
adds r0, r7, 0
bl get_battle_strings_
bl StrCpyDecodeToDisplayedStringBattle
_0814E6DE:
pop {r3-r5}
mov r8, r3
@@ -697,20 +697,20 @@ _0814E6DE:
pop {r0}
bx r0
.pool
thumb_func_end battle_pick_message
thumb_func_end BufferStringBattle
thumb_func_start get_battle_strings_
get_battle_strings_: @ 814E6F0
thumb_func_start StrCpyDecodeToDisplayedStringBattle
StrCpyDecodeToDisplayedStringBattle: @ 814E6F0
push {lr}
ldr r1, =gUnknown_02022E2C
bl get_battle_strings
ldr r1, =gDisplayedStringBattle
bl StrCpyDecodeBattle
pop {r1}
bx r1
.pool
thumb_func_end get_battle_strings_
thumb_func_end StrCpyDecodeToDisplayedStringBattle
thumb_func_start sub_814E700
sub_814E700: @ 814E700
thumb_func_start AppendStatusString
AppendStatusString: @ 814E700
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -761,10 +761,10 @@ _0814E75A:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_814E700
thumb_func_end AppendStatusString
thumb_func_start get_battle_strings
get_battle_strings: @ 814E764
thumb_func_start StrCpyDecodeBattle
StrCpyDecodeBattle: @ 814E764
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -786,7 +786,7 @@ get_battle_strings: @ 814E764
b _0814E79C
.pool
_0814E794:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r7, r0, 24
_0814E79C:
@@ -878,7 +878,7 @@ _0814E8A0:
.pool
_0814E8B8:
adds r0, r5, 0
bl sub_814E700
bl AppendStatusString
adds r4, r0, 0
cmp r4, 0
beq _0814E8C8
@@ -895,7 +895,7 @@ _0814E8CE:
b _0814E8EE
.pool
_0814E8E4:
ldr r1, =gUnknown_02022F78
ldr r1, =gBattleTextBuff3
ldrb r0, [r1]
cmp r0, 0xFD
bne _0814E904
@@ -904,7 +904,7 @@ _0814E8EE:
adds r0, r1, 0
_0814E8F0:
adds r1, r4, 0
bl sub_814F648
bl StrCpyDecodeBattleTextBuff
bl _0814F5C0
.pool
_0814E904:
@@ -1000,7 +1000,7 @@ _0814E9C8:
.pool
_0814E9FC:
ldr r2, =gBattlePartyID
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1022,7 +1022,7 @@ _0814E9FC:
.pool
_0814EA38:
ldr r2, =gBattlePartyID
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1046,7 +1046,7 @@ _0814EA38:
.pool
_0814EA78:
ldr r2, =gBattlePartyID
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1070,7 +1070,7 @@ _0814EA78:
.pool
_0814EAB8:
ldr r2, =gBattlePartyID
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1544,7 +1544,7 @@ _0814EF32:
b _0814F5BE
.pool
_0814EF44:
ldr r0, =gUnknown_0203ABA8
ldr r0, =gStringInfo
ldr r2, [r0]
ldrh r1, [r2]
movs r0, 0xB1
@@ -1555,7 +1555,7 @@ _0814EF44:
b _0814EF8A
.pool
_0814EF5C:
ldr r0, =gUnknown_0203ABA8
ldr r0, =gStringInfo
ldr r2, [r0]
ldrh r1, [r2, 0x2]
movs r0, 0xB1
@@ -1589,7 +1589,7 @@ _0814EF98:
ands r0, r1
cmp r0, 0
beq _0814F06E
ldr r2, =gUnknown_02024208
ldr r2, =gLastUsedItem
ldrh r0, [r2]
cmp r0, 0xAF
bne _0814F064
@@ -1632,7 +1632,7 @@ _0814EFEC:
b _0814F5BE
.pool
_0814F014:
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
ldr r0, =gBattleScripting
adds r0, 0x25
ldrb r1, [r0]
@@ -1667,7 +1667,7 @@ _0814F064:
bl CopyItemName
b _0814F5BE
_0814F06E:
ldr r0, =gUnknown_02024208
ldr r0, =gLastUsedItem
ldrh r0, [r0]
mov r1, sp
bl CopyItemName
@@ -1678,23 +1678,23 @@ _0814F080:
b _0814F0C0
.pool
_0814F088:
ldr r1, =gUnknown_0203ABA4
ldr r1, =gAbilitiesPerBank
ldr r0, =gBankAttacker
b _0814F0BC
.pool
_0814F098:
ldr r1, =gUnknown_0203ABA4
ldr r1, =gAbilitiesPerBank
ldr r0, =gBankTarget
b _0814F0BC
.pool
_0814F0A8:
ldr r1, =gUnknown_0203ABA4
ldr r1, =gAbilitiesPerBank
ldr r0, =gBattleScripting
ldrb r0, [r0, 0x17]
b _0814F0BE
.pool
_0814F0B8:
ldr r1, =gUnknown_0203ABA4
ldr r1, =gAbilitiesPerBank
ldr r0, =gUnknown_0202420E
_0814F0BC:
ldrb r0, [r0]
@@ -1716,11 +1716,11 @@ _0814F0D8:
ands r0, r1
cmp r0, 0
beq _0814F0F0
bl sub_806B870
bl GetSecretBaseTrainerNameIndex
b _0814F59C
.pool
_0814F0F0:
ldr r3, =gUnknown_02038BCA
ldr r3, =gTrainerBattleOpponent_A
ldrh r2, [r3]
movs r0, 0xC0
lsls r0, 4
@@ -1808,7 +1808,7 @@ _0814F178:
b _0814F5BE
.pool
_0814F1AC:
ldr r3, =gUnknown_02038BCA
ldr r3, =gTrainerBattleOpponent_A
ldrh r2, [r3]
movs r0, 0xC0
lsls r0, 4
@@ -1867,12 +1867,12 @@ _0814F220:
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
ldr r1, =gUnknown_020229F0
ldr r1, =gLinkPlayers + 8
adds r4, r0, r1
b _0814F5C0
.pool
_0814F230:
ldr r4, =gUnknown_020229E8
ldr r4, =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1882,7 +1882,7 @@ _0814F230:
b _0814F266
.pool
_0814F244:
ldr r4, =gUnknown_020229E8
ldr r4, =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1892,7 +1892,7 @@ _0814F244:
b _0814F266
.pool
_0814F258:
ldr r4, =gUnknown_020229E8
ldr r4, =gLinkPlayers
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
@@ -1917,7 +1917,7 @@ _0814F284:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r0, =gUnknown_020229F0
ldr r0, =gLinkPlayers + 8
adds r4, r1, r0
b _0814F5C0
.pool
@@ -1929,7 +1929,7 @@ _0814F298:
ands r0, r1
cmp r0, 0
beq _0814F2B4
ldr r4, =gUnknown_020229F0
ldr r4, =gLinkPlayers + 8
b _0814F5C0
.pool
_0814F2B4:
@@ -1944,7 +1944,7 @@ _0814F2C0:
ands r0, r1
cmp r0, 0
beq _0814F2E0
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0x2
b _0814F55A
@@ -1955,7 +1955,7 @@ _0814F2E0:
ands r1, r0
cmp r1, 0
beq _0814F2F8
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0x4
b _0814F584
@@ -1971,7 +1971,7 @@ _0814F300:
ands r0, r1
cmp r0, 0
beq _0814F31C
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
b _0814F556
.pool
_0814F31C:
@@ -1982,7 +1982,7 @@ _0814F31C:
bne _0814F328
b _0814F5C0
_0814F328:
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
b _0814F580
.pool
_0814F330:
@@ -2120,7 +2120,7 @@ _0814F468:
ands r0, r1
cmp r0, 0
beq _0814F484
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
b _0814F596
.pool
_0814F484:
@@ -2129,14 +2129,14 @@ _0814F484:
ands r1, r0
cmp r1, 0
beq _0814F49C
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r0, [r0]
bl sub_81D5530
b _0814F59C
.pool
_0814F49C:
ldr r2, =gTrainers
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r1, [r0]
lsls r0, r1, 2
adds r0, r1
@@ -2153,7 +2153,7 @@ _0814F4B8:
ands r0, r1
cmp r0, 0
beq _0814F4D4
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
b _0814F5B6
.pool
_0814F4D4:
@@ -2162,14 +2162,14 @@ _0814F4D4:
ands r1, r0
cmp r1, 0
beq _0814F4F0
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r1, [r0]
mov r0, sp
bl sub_81D5554
b _0814F5BE
.pool
_0814F4F0:
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r1, [r0]
lsls r0, r1, 2
adds r0, r1
@@ -2185,7 +2185,7 @@ _0814F508:
ands r0, r1
cmp r0, 0
beq _0814F528
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r1, [r0]
movs r0, 0x2
b _0814F55A
@@ -2196,7 +2196,7 @@ _0814F528:
ands r1, r0
cmp r1, 0
beq _0814F540
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r1, [r0]
movs r0, 0x4
b _0814F584
@@ -2212,7 +2212,7 @@ _0814F548:
ands r0, r1
cmp r0, 0
beq _0814F574
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
_0814F556:
ldrh r1, [r0]
movs r0, 0x1
@@ -2227,7 +2227,7 @@ _0814F574:
ands r1, r0
cmp r1, 0
beq _0814F5C0
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
_0814F580:
ldrh r1, [r0]
movs r0, 0x3
@@ -2335,10 +2335,10 @@ _0814F62A:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end get_battle_strings
thumb_func_end StrCpyDecodeBattle
thumb_func_start sub_814F648
sub_814F648: @ 814F648
thumb_func_start StrCpyDecodeBattleTextBuff
StrCpyDecodeBattleTextBuff: @ 814F648
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2598,7 +2598,7 @@ _0814F858:
beq _0814F8D6
cmp r2, 0xAF
bne _0814F8CC
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
ldr r0, =gBattleScripting
adds r0, 0x25
ldrb r1, [r0]
@@ -2652,14 +2652,14 @@ _0814F8EA:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_814F648
thumb_func_end StrCpyDecodeBattleTextBuff
thumb_func_start sub_814F8F8
sub_814F8F8: @ 814F8F8
push {r4,r5,lr}
adds r4, r0, 0
movs r2, 0
ldr r5, =gUnknown_0203ABA8
ldr r5, =gStringInfo
ldr r3, =gUnknown_085CD336
_0814F902:
cmp r2, 0x4
@@ -2710,7 +2710,7 @@ _0814F95A:
cmp r0, 0xFF
bne _0814F958
ldr r1, =gUnknown_085CD336
ldr r5, =gUnknown_0203ABA8
ldr r5, =gStringInfo
movs r0, 0
lsls r0, 1
adds r2, r0, r1
@@ -2995,7 +2995,7 @@ sub_814FBAC: @ 814FBAC
ldr r0, =gActiveBank
ldrb r2, [r0]
lsls r1, r2, 9
ldr r0, =gUnknown_02023068
ldr r0, =gBattleBufferA + 4
adds r1, r0
ldr r4, =gUnknown_08D85620
ldr r0, =gUnknown_020244B0
asm/battle_records.s
+12 -12
View File
@@ -311,7 +311,7 @@ sub_813C170: @ 813C170
strh r7, [r4, 0x8]
adds r2, r6, 0
adds r2, 0x54
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
mov r3, r9
lsls r0, r3, 3
subs r0, r3
@@ -507,7 +507,7 @@ sub_813C2F4: @ 813C2F4
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r4, 0
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r4}
pop {r0}
@@ -544,7 +544,7 @@ sub_813C384: @ 813C384
str r7, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
mov r1, r8
ldrb r0, [r1]
ldr r5, =gUnknown_085B3D8C
@@ -554,7 +554,7 @@ sub_813C384: @ 813C384
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x50
bl Print
bl PrintTextOnWindow
mov r1, r8
ldrb r0, [r1]
str r4, [sp]
@@ -563,7 +563,7 @@ sub_813C384: @ 813C384
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x80
bl Print
bl PrintTextOnWindow
mov r1, r8
ldrb r0, [r1]
str r4, [sp]
@@ -572,7 +572,7 @@ sub_813C384: @ 813C384
movs r1, 0x1
adds r2, r5, 0
movs r3, 0xB0
bl Print
bl PrintTextOnWindow
b _0813C4A8
.pool
_0813C40C:
@@ -601,7 +601,7 @@ _0813C40C:
movs r1, 0x1
ldr r2, =gStringVar1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
ldrh r1, [r6, 0xA]
ldr r0, =gStringVar1
movs r2, 0x1
@@ -615,7 +615,7 @@ _0813C40C:
movs r1, 0x1
ldr r2, =gStringVar1
movs r3, 0x50
bl Print
bl PrintTextOnWindow
ldrh r1, [r6, 0xC]
ldr r0, =gStringVar1
movs r2, 0x1
@@ -629,7 +629,7 @@ _0813C40C:
movs r1, 0x1
ldr r2, =gStringVar1
movs r3, 0x80
bl Print
bl PrintTextOnWindow
ldrh r1, [r6, 0xE]
ldr r0, =gStringVar1
movs r2, 0x1
@@ -643,7 +643,7 @@ _0813C40C:
movs r1, 0x1
ldr r2, =gStringVar1
movs r3, 0xB0
bl Print
bl PrintTextOnWindow
_0813C4A8:
add sp, 0xC
pop {r3}
@@ -689,7 +689,7 @@ sub_813C4BC: @ 813C4BC
str r4, [sp, 0x4]
str r4, [sp, 0x8]
adds r2, r5, 0
bl Print
bl PrintTextOnWindow
ldr r0, =gSaveBlock1Ptr
mov r8, r0
ldr r0, [r0]
@@ -708,7 +708,7 @@ sub_813C4BC: @ 813C4BC
movs r1, 0x1
adds r2, r5, 0
movs r3, 0
bl Print
bl PrintTextOnWindow
mov r7, r8
movs r6, 0xE0
lsls r6, 19
asm/battle_setup.s
+35 -35
View File
@@ -35,7 +35,7 @@ _080B0614:
strh r0, [r4]
b _080B0652
_080B062E:
bl sub_8145F20
bl IsBattleTransitionDone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -282,7 +282,7 @@ sub_80B086C: @ 80B086C
movs r1, 0xC4
lsls r1, 1
movs r2, 0x5
bl sub_8067FF8
bl CreateMaleMon
bl script_env_2_enable
ldr r1, =gMain
ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
@@ -678,7 +678,7 @@ _080B0C16:
lsls r0, 24
cmp r0, 0
bne _080B0D18
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
subs r0, 0x1
cmp r0, 0x8
@@ -830,7 +830,7 @@ _080B0D54:
lsls r0, 24
cmp r0, 0
bne _080B0D7C
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x4
beq _080B0D78
@@ -1082,7 +1082,7 @@ _080B0F2E:
thumb_func_start reads_trainer_data_byte1_byte0x18
reads_trainer_data_byte1_byte0x18: @ 80B0F34
push {r4-r6,lr}
ldr r4, =gUnknown_02038BCA
ldr r4, =gTrainerBattleOpponent_A
ldrh r1, [r4]
movs r0, 0x80
lsls r0, 3
@@ -1375,7 +1375,7 @@ sub_80B11A8: @ 80B11A8
push {lr}
bl UpdatePaletteFade
bl RunTasks
bl sub_8145F20
bl IsBattleTransitionDone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1481,7 +1481,7 @@ TrainerBattleLoadArg8: @ 80B1274
thumb_func_start trainerflag_opponent
trainerflag_opponent: @ 80B1278
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
movs r2, 0xA0
lsls r2, 3
adds r0, r2, 0
@@ -1495,7 +1495,7 @@ trainerflag_opponent: @ 80B1278
thumb_func_start sub_80B1290
sub_80B1290: @ 80B1290
ldr r1, =gUnknown_02038BCC
ldr r1, =gTrainerBattleOpponent_B
movs r2, 0xA0
lsls r2, 3
adds r0, r2, 0
@@ -1540,10 +1540,10 @@ _080B12E2:
thumb_func_start ResetTrainerOpponentIds
ResetTrainerOpponentIds: @ 80B12E8
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
strh r1, [r0]
bx lr
.pool
@@ -1765,7 +1765,7 @@ _080B14EC:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r4, =gUnknown_02038BCA
ldr r4, =gTrainerBattleOpponent_A
ldrh r0, [r4]
bl sub_80B2234
strh r0, [r4]
@@ -1777,7 +1777,7 @@ _080B1514:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r4, =gUnknown_02038BCA
ldr r4, =gTrainerBattleOpponent_A
ldrh r0, [r4]
bl sub_80B2234
strh r0, [r4]
@@ -1796,7 +1796,7 @@ _080B153C:
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
bl sub_81A9AA8
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
b _080B157E
.pool
_080B156C:
@@ -1807,7 +1807,7 @@ _080B156C:
ldrb r0, [r0]
bl sub_81A9AA8
_080B157C:
ldr r1, =gUnknown_02038BCC
ldr r1, =gTrainerBattleOpponent_B
_080B157E:
strh r0, [r1]
b _080B161C
@@ -1836,7 +1836,7 @@ _080B15A8:
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
bl battle_init
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
b _080B157E
.pool
_080B15D8:
@@ -1894,7 +1894,7 @@ SingleTrainerWantsBattle: @ 80B162C
adds r0, r1, 0
bl TrainerBattleConfigure
ldr r0, =gUnknown_08271354
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r4}
pop {r0}
@@ -1932,7 +1932,7 @@ TwoTrainersWantBattle: @ 80B1670
TwoTrainersWantBattleExecuteScript: @ 80B16A4
push {lr}
ldr r0, =gUnknown_08271354
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r0}
bx r0
@@ -2027,7 +2027,7 @@ _080B1752:
thumb_func_start rom_npc_set_flag_for_script_id
rom_npc_set_flag_for_script_id: @ 80B1760
push {lr}
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r0, [r0]
cmp r0, 0
beq _080B1776
@@ -2132,31 +2132,31 @@ _080B1800:
bne _080B1864
movs r0, 0x1
bl sub_816306C
ldr r4, =gUnknown_020247A8
ldr r4, =gEnemyParty + 100
adds r0, r4, 0
bl zero_pokemon_struct
bl ZeroMonData
adds r0, r4, 0
adds r0, 0x64
bl zero_pokemon_struct
bl ZeroMonData
movs r1, 0x96
lsls r1, 1
adds r0, r4, r1
bl zero_pokemon_struct
bl ZeroMonData
movs r1, 0xC8
lsls r1, 1
adds r0, r4, r1
bl zero_pokemon_struct
bl ZeroMonData
b _080B187A
.pool
_080B1864:
movs r0, 0x1
bl sub_8163048
ldr r4, =gUnknown_020247A8
ldr r4, =gEnemyParty + 100
adds r0, r4, 0
bl zero_pokemon_struct
bl ZeroMonData
adds r4, 0x64
adds r0, r4, 0
bl zero_pokemon_struct
bl ZeroMonData
_080B187A:
bl sub_81A9B04
b _080B18B8
@@ -2222,7 +2222,7 @@ _080B190C:
thumb_func_start sub_80B1918
sub_80B1918: @ 80B1918
push {lr}
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 3
@@ -2273,7 +2273,7 @@ _080B198A:
thumb_func_start sub_80B1994
sub_80B1994: @ 80B1994
push {lr}
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 3
@@ -2481,11 +2481,11 @@ SetUpTrainerEncounterMusic: @ 80B1B70
ldrb r0, [r0]
cmp r0, 0
bne _080B1B88
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
b _080B1B8A
.pool
_080B1B88:
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
_080B1B8A:
ldrh r1, [r0]
ldr r0, =gUnknown_02038BC8
@@ -2620,7 +2620,7 @@ _080B1C96:
thumb_func_start sub_80B1CA4
sub_80B1CA4: @ 80B1CA4
push {r4,lr}
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 3
@@ -3202,7 +3202,7 @@ sub_80B20BC: @ 80B20BC
lsls r0, 24
cmp r0, 0
beq _080B20E2
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r0, [r0]
bl sub_80B208C
adds r1, r0, 0
@@ -3423,7 +3423,7 @@ sub_80B2250: @ 80B2250
sub_80B226C: @ 80B226C
push {r4,r5,lr}
ldr r5, =gUnknown_085500A4
ldr r4, =gUnknown_02038BCA
ldr r4, =gTrainerBattleOpponent_A
ldrh r1, [r4]
adds r0, r5, 0
bl sub_80B1F38
@@ -3449,7 +3449,7 @@ _080B229A:
sub_80B22A0: @ 80B22A0
push {lr}
ldr r0, =gUnknown_085500A4
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
ldrh r1, [r1]
bl sub_80B1F74
lsls r0, 24
@@ -3463,7 +3463,7 @@ sub_80B22A0: @ 80B22A0
sub_80B22BC: @ 80B22BC
push {lr}
ldr r0, =gUnknown_085500A4
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
ldrh r1, [r1]
bl sub_80B205C
bl rom_npc_set_flag_for_script_id
asm/battle_transition.s
+159 -107
View File
@@ -5,6 +5,58 @@
.text
thumb_func_start CB2_TestBattleTransition
CB2_TestBattleTransition: @ 8145E84
push {r4,lr}
ldr r4, =sTestingTransitionState
ldrb r0, [r4]
cmp r0, 0
beq _08145E98
cmp r0, 0x1
beq _08145EAC
b _08145EC0
.pool
_08145E98:
ldr r0, =sTestingTransitionId
ldrb r0, [r0]
bl LaunchBattleTransitionTask
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
b _08145EC0
.pool
_08145EAC:
bl IsBattleTransitionDone
lsls r0, 24
cmp r0, 0
beq _08145EC0
movs r0, 0
strb r0, [r4]
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
_08145EC0:
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end CB2_TestBattleTransition
thumb_func_start TestBattleTransition
TestBattleTransition: @ 8145EDC
push {lr}
ldr r1, =sTestingTransitionId
strb r0, [r1]
ldr r0, =CB2_TestBattleTransition
bl SetMainCallback2
pop {r0}
bx r0
.pool
thumb_func_end TestBattleTransition
thumb_func_start sub_8145EF4
sub_8145EF4: @ 8145EF4
push {lr}
@@ -13,7 +65,7 @@ sub_8145EF4: @ 8145EF4
ldr r2, =gMain
ldr r1, =sub_8085E50
str r1, [r2, 0x4]
bl sub_8145F6C
bl LaunchBattleTransitionTask
pop {r0}
bx r0
.pool
@@ -24,15 +76,15 @@ sub_8145F10: @ 8145F10
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8145F6C
bl LaunchBattleTransitionTask
pop {r0}
bx r0
thumb_func_end sub_8145F10
thumb_func_start sub_8145F20
sub_8145F20: @ 8145F20
thumb_func_start IsBattleTransitionDone
IsBattleTransitionDone: @ 8145F20
push {r4,lr}
ldr r0, =sub_8145FA8
ldr r0, =Task_BattleTransitionMain
bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
@@ -51,7 +103,7 @@ sub_8145F20: @ 8145F20
_08145F4C:
adds r0, r2, 0
bl DestroyTask
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r0, [r4]
bl Free
movs r0, 0
@@ -62,15 +114,15 @@ _08145F60:
pop {r1}
bx r1
.pool
thumb_func_end sub_8145F20
thumb_func_end IsBattleTransitionDone
thumb_func_start sub_8145F6C
sub_8145F6C: @ 8145F6C
thumb_func_start LaunchBattleTransitionTask
LaunchBattleTransitionTask: @ 8145F6C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =sub_8145FA8
ldr r0, =Task_BattleTransitionMain
movs r1, 0x2
bl CreateTask
lsls r0, 24
@@ -81,7 +133,7 @@ sub_8145F6C: @ 8145F6C
lsls r1, 3
adds r1, r2
strh r4, [r1, 0xA]
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
movs r0, 0x3C
bl AllocZeroed
str r0, [r4]
@@ -89,10 +141,10 @@ sub_8145F6C: @ 8145F6C
pop {r0}
bx r0
.pool
thumb_func_end sub_8145F6C
thumb_func_end LaunchBattleTransitionTask
thumb_func_start sub_8145FA8
sub_8145FA8: @ 8145FA8
thumb_func_start Task_BattleTransitionMain
Task_BattleTransitionMain: @ 8145FA8
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -117,7 +169,7 @@ _08145FBA:
pop {r0}
bx r0
.pool
thumb_func_end sub_8145FA8
thumb_func_end Task_BattleTransitionMain
thumb_func_start sub_8145FE0
sub_8145FE0: @ 8145FE0
@@ -445,7 +497,7 @@ sub_814623C: @ 814623C
movs r3, 0x10
bl BeginNormalPaletteFade
ldr r0, =gUnknown_020393A8
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r1, [r1]
movs r2, 0x14
ldrsh r1, [r1, r2]
@@ -476,7 +528,7 @@ sub_814623C: @ 814623C
sub_81462A8: @ 81462A8
push {r4,r5,lr}
sub sp, 0x8
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r2, [r4]
ldrb r1, [r2]
movs r1, 0
@@ -530,7 +582,7 @@ _081462FA:
sub_8146320: @ 8146320
push {lr}
bl sub_8149F2C
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrb r0, [r0]
cmp r0, 0
@@ -615,7 +667,7 @@ sub_81463BC: @ 81463BC
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldr r0, =gUnknown_020393A8
movs r2, 0x16
@@ -643,7 +695,7 @@ sub_81463BC: @ 81463BC
thumb_func_start sub_8146420
sub_8146420: @ 8146420
push {r4-r7,lr}
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r2, [r1]
ldrb r1, [r2]
movs r1, 0
@@ -669,7 +721,7 @@ _08146448:
ldr r1, =gUnknown_02038C28
lsls r2, r5, 1
adds r2, r1
ldr r6, =gUnknown_0203ABA0
ldr r6, =sTransitionStructPtr
ldr r1, [r6]
ldrh r1, [r1, 0x16]
adds r0, r1
@@ -712,7 +764,7 @@ _0814648E:
sub_81464B0: @ 81464B0
push {lr}
bl sub_8149F2C
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrb r0, [r0]
cmp r0, 0
@@ -964,7 +1016,7 @@ sub_814669C: @ 814669C
movs r0, 0x80
lsls r0, 7
strh r0, [r4, 0x12]
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r2, [r0]
movs r0, 0x3F
strh r0, [r2, 0x2]
@@ -1583,7 +1635,7 @@ sub_8146BF8: @ 8146BF8
push {r4,r5,lr}
sub sp, 0x8
adds r3, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@@ -1657,7 +1709,7 @@ sub_8146C8C: @ 8146C8C
push {r4,r5,lr}
sub sp, 0x8
adds r3, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@@ -1731,7 +1783,7 @@ sub_8146D20: @ 8146D20
push {r4-r7,lr}
sub sp, 0x8
adds r4, r0, 0
ldr r7, =gUnknown_0203ABA0
ldr r7, =sTransitionStructPtr
ldr r0, [r7]
ldrb r1, [r0]
movs r6, 0
@@ -1847,7 +1899,7 @@ _08146DEE:
sub_8146DF8: @ 8146DF8
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrb r1, [r0]
movs r3, 0
@@ -1918,7 +1970,7 @@ _08146E90:
ldr r0, =sub_8146F68
bl SetVBlankCallback
_08146EA4:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@@ -1946,7 +1998,7 @@ sub_8146EC0: @ 8146EC0
strh r0, [r1, 0xA]
ldrh r0, [r1, 0xA]
bl sub_8149F2C
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r0, [r2]
ldrb r0, [r0]
cmp r0, 0
@@ -2347,7 +2399,7 @@ sub_814723C: @ 814723C
adds r4, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0
strh r0, [r1, 0x2]
@@ -2371,7 +2423,7 @@ _08147262:
bls _08147262
ldr r0, =sub_8147688
bl SetVBlankCallback
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0x78
strh r0, [r1, 0x2C]
@@ -2390,7 +2442,7 @@ sub_81472A4: @ 81472A4
push {r4-r7,lr}
sub sp, 0xC
adds r6, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@@ -2411,7 +2463,7 @@ sub_81472A4: @ 81472A4
bl sub_814A1AC
ldr r5, =gUnknown_02038C28
_081472D4:
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r0, [r4]
movs r7, 0x2A
ldrsh r3, [r0, r7]
@@ -2469,7 +2521,7 @@ sub_8147334: @ 8147334
add r1, sp, 0xC
movs r0, 0
strb r0, [r1]
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r1, [r4]
ldrb r0, [r1]
movs r0, 0
@@ -2548,7 +2600,7 @@ _081473DE:
cmp r0, r2
bge _08147406
adds r3, r4, 0
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
_081473EA:
ldr r2, [r5]
ldrh r0, [r2, 0x2A]
@@ -2587,7 +2639,7 @@ sub_8147428: @ 8147428
push {r4-r6,lr}
sub sp, 0xC
adds r6, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@@ -2607,7 +2659,7 @@ sub_8147428: @ 8147428
bl sub_814A1AC
ldr r5, =gUnknown_02038C28
_08147456:
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r0, [r4]
movs r1, 0x2A
ldrsh r3, [r0, r1]
@@ -2663,7 +2715,7 @@ sub_81474B0: @ 81474B0
add r1, sp, 0xC
movs r0, 0
strb r0, [r1]
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r1, [r4]
ldrb r0, [r1]
movs r0, 0
@@ -2683,7 +2735,7 @@ sub_81474B0: @ 81474B0
bl sub_814A1AC
ldr r7, =gUnknown_02038C28
mov r10, r7
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
mov r8, r0
add r6, sp, 0xC
_081474F4:
@@ -2745,7 +2797,7 @@ _0814755E:
ble _08147588
ldr r6, =gUnknown_02038C28
adds r3, r1, 0
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
_0814756C:
ldr r2, [r5]
ldrh r0, [r2, 0x2A]
@@ -2762,7 +2814,7 @@ _0814756C:
cmp r1, r0
bgt _0814756C
_08147588:
ldr r7, =gUnknown_0203ABA0
ldr r7, =sTransitionStructPtr
ldr r0, [r7]
ldrb r1, [r0]
adds r1, 0x1
@@ -2785,7 +2837,7 @@ sub_81475B0: @ 81475B0
push {r4-r7,lr}
sub sp, 0xC
adds r7, r0, 0
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r0, [r1]
ldrb r2, [r0]
movs r2, 0
@@ -2805,7 +2857,7 @@ sub_81475B0: @ 81475B0
ldr r6, =gUnknown_02038C28
_081475DC:
movs r2, 0x78
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
ldr r3, [r5]
ldrh r4, [r3, 0x28]
movs r1, 0x28
@@ -2896,7 +2948,7 @@ sub_8147688: @ 8147688
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
ldr r0, [r3]
ldrb r0, [r0]
cmp r0, 0
@@ -2976,7 +3028,7 @@ sub_8147750: @ 8147750
bl dp12_8087EA4
movs r2, 0
ldr r4, =gUnknown_020393A8
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
_08147762:
lsls r1, r2, 1
adds r1, r4
@@ -3011,7 +3063,7 @@ sub_81477A8: @ 81477A8
push {r7}
sub sp, 0x4
adds r6, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0
@@ -3046,7 +3098,7 @@ _081477E8:
ldr r1, =gUnknown_02038C28
lsls r2, r5, 1
adds r2, r1
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r1, [r1]
ldrh r1, [r1, 0x16]
adds r0, r1
@@ -3095,7 +3147,7 @@ _08147838:
lsrs r0, 24
bl DestroyTask
_0814785A:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@@ -3115,7 +3167,7 @@ _0814785A:
sub_8147888: @ 8147888
push {lr}
bl sub_8149F2C
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrb r0, [r0]
cmp r0, 0
@@ -3191,7 +3243,7 @@ sub_8147924: @ 8147924
adds r4, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r2, 0
movs r0, 0x3F
@@ -3231,7 +3283,7 @@ sub_814797C: @ 814797C
mov r7, r8
push {r7}
adds r4, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0
@@ -3292,7 +3344,7 @@ _081479D8:
adds r0, 0x1
strh r0, [r4, 0x8]
_081479F6:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@@ -3346,7 +3398,7 @@ sub_8147A58: @ 8147A58
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
ldr r0, [r3]
ldrb r0, [r0]
cmp r0, 0
@@ -3517,7 +3569,7 @@ sub_8147BBC: @ 8147BBC
strh r0, [r4, 0xC]
movs r0, 0xEF
strh r0, [r4, 0xE]
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0x3F
strh r0, [r1, 0x2]
@@ -3638,7 +3690,7 @@ _08147C7E:
sub_8147CE4: @ 8147CE4
push {r4-r7,lr}
adds r4, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0
@@ -3741,7 +3793,7 @@ _08147D9A:
adds r0, 0x1
strh r0, [r4, 0x8]
_08147DA6:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0x18]
subs r0, 0x8
@@ -3764,7 +3816,7 @@ _08147DA6:
sub_8147DD0: @ 8147DD0
push {r4,r5,lr}
adds r4, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@@ -3823,7 +3875,7 @@ _08147DE4:
sub_8147E4C: @ 8147E4C
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0x18]
subs r0, 0x8
@@ -3857,7 +3909,7 @@ sub_8147E88: @ 8147E88
mov r7, r8
push {r7}
adds r6, r0, 0
ldr r7, =gUnknown_0203ABA0
ldr r7, =sTransitionStructPtr
ldr r1, [r7]
ldrh r0, [r1, 0x18]
subs r0, 0x8
@@ -3934,7 +3986,7 @@ _08147F1C:
sub_8147F40: @ 8147F40
push {r4-r7,lr}
adds r4, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@@ -4041,7 +4093,7 @@ _08147FEA:
sub_8148008: @ 8148008
push {r4-r6,lr}
adds r4, r0, 0
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
ldr r0, [r5]
ldrb r1, [r0]
movs r6, 0
@@ -4069,7 +4121,7 @@ sub_8148008: @ 8148008
sub_8148040: @ 8148040
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
ldr r1, [r5]
ldrb r0, [r1]
movs r0, 0
@@ -4144,7 +4196,7 @@ sub_81480CC: @ 81480CC
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
ldr r0, [r3]
ldrb r0, [r0]
cmp r0, 0
@@ -4200,7 +4252,7 @@ sub_8148160: @ 8148160
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r0, [r2]
ldrb r0, [r0]
cmp r0, 0
@@ -4241,14 +4293,14 @@ sub_81481E0: @ 81481E0
cmp r0, 0x4F
bhi _08148200
ldr r1, =0x04000010
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrh r0, [r0, 0x18]
b _08148208
.pool
_08148200:
ldr r1, =0x04000010
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrh r0, [r0, 0x1A]
_08148208:
@@ -4653,7 +4705,7 @@ sub_8148508: @ 8148508
strh r0, [r5, 0xC]
movs r0, 0x1
strh r0, [r5, 0xE]
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
movs r0, 0x3F
strh r0, [r1, 0x2]
@@ -4706,7 +4758,7 @@ sub_8148590: @ 8148590
mov r7, r8
push {r7}
adds r3, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@@ -4847,7 +4899,7 @@ sub_814869C: @ 814869C
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r2, =0x04000048
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0x2]
strh r0, [r2]
@@ -4948,7 +5000,7 @@ sub_8148798: @ 8148798
adds r6, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r2, 0
movs r0, 0x3F
@@ -4969,7 +5021,7 @@ _081487CC:
lsls r2, r4, 1
mov r7, r12
adds r1, r2, r7
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r3, [r0]
ldrh r0, [r3, 0x14]
strh r0, [r1]
@@ -5052,7 +5104,7 @@ sub_8148864: @ 8148864
adds r0, r4, 0
movs r2, 0x4
bl memcpy
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@@ -5147,7 +5199,7 @@ _08148940:
adds r2, r0, r1
ldr r1, =gUnknown_02038D68
adds r3, r0, r1
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r4]
ldrh r1, [r1, 0x14]
@@ -5251,7 +5303,7 @@ _08148A18:
adds r2, r0, r1
ldr r1, =gUnknown_02038D68
adds r3, r0, r1
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r0, [r1]
ldrh r1, [r0, 0x14]
ldrh r0, [r4]
@@ -5322,7 +5374,7 @@ _08148A98:
adds r0, 0x1
strh r0, [r3, 0x8]
_08148AA6:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@@ -5463,7 +5515,7 @@ sub_8148BC4: @ 8148BC4
adds r5, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0
strh r0, [r1, 0x2]
@@ -5530,7 +5582,7 @@ sub_8148C28: @ 8148C28
b _08148CDE
.pool
_08148C6C:
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
ldr r1, [r5]
ldrb r0, [r1]
movs r0, 0
@@ -5595,7 +5647,7 @@ _08148CDE:
sub_8148CE8: @ 8148CE8
push {r4-r6,lr}
adds r4, r0, 0
ldr r6, =gUnknown_0203ABA0
ldr r6, =sTransitionStructPtr
ldr r0, [r6]
ldrb r1, [r0]
movs r5, 0
@@ -5660,7 +5712,7 @@ _08148D4C:
sub_8148D6C: @ 8148D6C
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0
@@ -5754,7 +5806,7 @@ _08148E28:
adds r0, 0x1
strh r0, [r4, 0x14]
_08148E3C:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@@ -6342,7 +6394,7 @@ sub_81492B4: @ 81492B4
movs r2, 0x80
lsls r2, 5
bl CpuSet
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0
strh r0, [r1, 0x20]
@@ -6491,7 +6543,7 @@ sub_8149410: @ 8149410
ands r0, r1
cmp r0, 0
bne _0814942E
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0x1
strh r0, [r1, 0x20]
@@ -6557,7 +6609,7 @@ _0814949A:
asrs r0, 16
cmp r0, 0x27
ble _081494F0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0
strh r0, [r1, 0x2]
@@ -6614,7 +6666,7 @@ sub_8149508: @ 8149508
strh r0, [r1, 0xA]
ldrh r0, [r1, 0xA]
bl sub_8149F2C
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
movs r1, 0x20
ldrsh r0, [r0, r1]
@@ -6677,7 +6729,7 @@ sub_81495B0: @ 81495B0
adds r5, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r2, 0
movs r0, 0xBF
@@ -6782,7 +6834,7 @@ _0814963C:
sub_814969C: @ 814969C
push {r4,lr}
adds r4, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@@ -6812,7 +6864,7 @@ _081496C6:
sub_81496D8: @ 81496D8
push {r4-r6,lr}
adds r6, r0, 0
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r0, [r4]
ldrb r1, [r0]
movs r5, 0
@@ -6854,7 +6906,7 @@ sub_81496D8: @ 81496D8
thumb_func_start sub_8149740
sub_8149740: @ 8149740
push {lr}
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0x12]
adds r0, 0x1
@@ -6891,7 +6943,7 @@ sub_8149774: @ 8149774
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r2, =0x04000050
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0xE]
strh r0, [r2]
@@ -6936,7 +6988,7 @@ sub_8149804: @ 8149804
push {lr}
bl sub_8149F2C
ldr r1, =0x04000054
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r2, [r0]
ldrh r0, [r2, 0x12]
strh r0, [r1]
@@ -6992,7 +7044,7 @@ sub_8149864: @ 8149864
ldrsh r0, [r3, r1]
cmp r0, 0
beq _0814994C
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0x1
@@ -7065,7 +7117,7 @@ _08149902:
ldrsh r0, [r3, r2]
cmp r0, 0
beq _08149914
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0x1
@@ -7077,7 +7129,7 @@ _08149914:
beq _0814994C
movs r2, 0x3A
ldrsh r0, [r3, r2]
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
cmp r0, 0
beq _0814993E
ldr r0, [r2]
@@ -7271,7 +7323,7 @@ sub_8149AA4: @ 8149AA4
adds r5, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r2, 0
movs r0, 0x3F
@@ -7317,7 +7369,7 @@ sub_8149B08: @ 8149B08
push {r6}
sub sp, 0xC
mov r8, r0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
adds r0, 0x24
ldr r6, =gUnknown_085C8DD0
@@ -7378,7 +7430,7 @@ sub_8149B84: @ 8149B84
mov r6, r8
push {r6,r7}
adds r6, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0
@@ -7389,7 +7441,7 @@ sub_8149B84: @ 8149B84
mov r9, r0
_08149BA0:
ldr r1, =gUnknown_02038C28
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r2, [r0]
movs r3, 0x2A
ldrsh r0, [r2, r3]
@@ -7431,7 +7483,7 @@ _08149BEA:
bgt _08149BF4
lsrs r5, r1, 16
_08149BF4:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r4, [r0]
movs r0, 0x2A
ldrsh r2, [r4, r0]
@@ -7469,7 +7521,7 @@ _08149C1C:
cmp r0, 0xF
ble _08149BA0
_08149C40:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@@ -7568,7 +7620,7 @@ sub_8149CE8: @ 8149CE8
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
ldr r0, [r3]
ldrb r0, [r0]
cmp r0, 0
@@ -7824,7 +7876,7 @@ _08149EFE:
thumb_func_start sub_8149F08
sub_8149F08: @ 8149F08
push {r4,lr}
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r0, [r4]
movs r1, 0
movs r2, 0x3C
@@ -8538,7 +8590,7 @@ sub_814A42C: @ 814A42C
movs r0, 0xA0
lsls r0, 4
strh r0, [r4, 0x16]
ldr r6, =gUnknown_0203ABA0
ldr r6, =sTransitionStructPtr
ldr r2, [r6]
ldr r3, =0x00003f41
strh r3, [r2, 0xE]
@@ -8609,7 +8661,7 @@ sub_814A500: @ 814A500
movs r2, 0
ldr r6, =sub_814A684
ldr r4, =gUnknown_020393A8
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
_0814A50C:
lsls r1, r2, 1
adds r1, r4
@@ -8644,7 +8696,7 @@ sub_814A550: @ 814A550
push {r7}
sub sp, 0x4
adds r4, r0, 0
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r0, [r1]
ldrb r2, [r0]
movs r3, 0
@@ -8721,7 +8773,7 @@ _0814A5E4:
ldr r1, =gUnknown_02038C28
lsls r2, r5, 1
adds r2, r1
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r1, [r1]
ldrh r1, [r1, 0x16]
adds r0, r1
@@ -8772,7 +8824,7 @@ _0814A654:
ldrh r0, [r4, 0x16]
subs r0, 0x11
strh r0, [r4, 0x16]
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@@ -8793,7 +8845,7 @@ sub_814A684: @ 814A684
push {lr}
bl sub_8149F2C
ldr r2, =0x04000050
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0xE]
strh r0, [r2]
asm/berry_blender.s
+24 -24
View File
@@ -820,7 +820,7 @@ _0807FE7C:
adds r0, 0x7C
movs r1, 0x2
strb r1, [r0]
ldr r4, =gUnknown_020229F0
ldr r4, =gLinkPlayers + 8
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
adds r0, r4, 0
@@ -845,7 +845,7 @@ _0807FEC8:
ldr r1, [r1]
bl StringCopy
_0807FED4:
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
movs r0, 0x2
strh r0, [r1, 0x1A]
strh r0, [r1, 0x36]
@@ -859,7 +859,7 @@ _0807FEE8:
adds r0, 0x7C
movs r1, 0x3
strb r1, [r0]
ldr r6, =gUnknown_020229F0
ldr r6, =gLinkPlayers + 8
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
adds r0, r6, 0
@@ -889,7 +889,7 @@ _0807FF3C:
adds r0, 0x7C
movs r1, 0x4
strb r1, [r0]
ldr r5, =gUnknown_020229F0
ldr r5, =gLinkPlayers + 8
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
adds r0, r5, 0
@@ -1214,7 +1214,7 @@ _08080248:
b _08080546
_08080254:
bl sub_800A5B4
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
beq _08080264
@@ -1880,7 +1880,7 @@ sub_80807BC: @ 80807BC
ldrb r0, [r0]
cmp r0, 0
beq _080807DE
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -1935,7 +1935,7 @@ _080807E4:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r0, =gUnknown_020229F0
ldr r0, =gLinkPlayers + 8
adds r1, r0
add r0, sp, 0x8
bl StringCopy
@@ -3637,7 +3637,7 @@ sub_8081744: @ 8081744
ldrb r0, [r0]
cmp r0, 0
beq _0808175A
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r6, r0, 24
_0808175A:
@@ -4737,7 +4737,7 @@ sub_8081FC8: @ 8081FC8
bhi _08081FDE
bl sub_8082D28
_08081FDE:
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r0, [r4]
adds r0, 0x63
ldrb r0, [r0]
@@ -4836,7 +4836,7 @@ _080820C6:
b _0808249E
.pool
_080820D4:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
beq _080820E0
@@ -5551,7 +5551,7 @@ _080826EC:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r0, =gUnknown_020229F0
ldr r0, =gLinkPlayers + 8
adds r1, r0
adds r0, r4, 0
bl StringCopy
@@ -5571,7 +5571,7 @@ _0808271C:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r0, =gUnknown_020229F0
ldr r0, =gLinkPlayers + 8
adds r1, r0
adds r0, r4, 0
bl StringCopy
@@ -6026,7 +6026,7 @@ _08082B58:
_08082B64:
strh r1, [r0]
_08082B66:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
beq _08082B72
@@ -6246,7 +6246,7 @@ sub_8082D28: @ 8082D28
ldrb r0, [r4]
cmp r0, 0
beq _08082D3C
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r1, r0, 24
_08082D3C:
@@ -7340,7 +7340,7 @@ _08083564:
lsls r4, r5, 3
subs r4, r5
lsls r4, 2
ldr r3, =gUnknown_020229F0
ldr r3, =gLinkPlayers + 8
adds r1, r4, r3
bl StringAppend
ldr r1, [r7]
@@ -7368,7 +7368,7 @@ _08083564:
bl StringCopy
ldr r0, [r7]
adds r0, 0x9F
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
adds r4, r2
ldrb r1, [r4, 0x1A]
bl ConvertInternationalString
@@ -7675,7 +7675,7 @@ sub_80838AC: @ 80838AC
adds r6, r1, 0
movs r0, 0xFF
strb r0, [r6]
ldr r1, =gUnknown_085B262C
ldr r1, =gPokeblockNames
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -7917,7 +7917,7 @@ _08083A9E:
b _08083ABC
.pool
_08083AB4:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r3, r0, 24
_08083ABC:
@@ -8172,7 +8172,7 @@ _08083C84:
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
ldr r2, =gUnknown_020229F0
ldr r2, =gLinkPlayers + 8
adds r1, r2
bl StringAppend
ldr r1, [r7]
@@ -8365,7 +8365,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24
str r4, [sp, 0x4]
str r4, [sp, 0x8]
adds r2, r6, 0
bl Print
bl PrintTextOnWindow
ldrb r0, [r5]
ldr r2, =gUnknown_085EE473
movs r1, 0x29
@@ -8374,7 +8374,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0x4
bl Print
bl PrintTextOnWindow
movs r6, 0
movs r7, 0xA4
lsls r7, 22
@@ -8425,7 +8425,7 @@ _08083E8A:
str r1, [sp, 0x8]
movs r1, 0x1
add r2, sp, 0xC
bl Print
bl PrintTextOnWindow
movs r0, 0x80
lsls r0, 21
adds r7, r0
@@ -8542,7 +8542,7 @@ sub_8083F94: @ 8083F94
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r5, =gUnknown_020229F0
ldr r5, =gLinkPlayers + 8
adds r1, r5
adds r0, r7, 0
bl StringCopy
@@ -8596,7 +8596,7 @@ _08084058:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r5, =gUnknown_020229F0
ldr r5, =gLinkPlayers + 8
adds r1, r5
adds r0, r7, 0
bl StringCopy
asm/berry_tag_screen.s
+8 -8
View File
@@ -612,7 +612,7 @@ sub_8178174: @ 8178174
movs r0, 0x1
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldrh r0, [r4, 0x8]
cmp r0, 0
beq _08178230
@@ -662,7 +662,7 @@ _081781C8:
movs r1, 0x1
adds r2, r4, 0
movs r3, 0x28
bl Print
bl PrintTextOnWindow
b _08178242
.pool
_08178230:
@@ -673,7 +673,7 @@ _08178230:
movs r0, 0x1
movs r1, 0x1
movs r3, 0x28
bl Print
bl PrintTextOnWindow
_08178242:
add sp, 0xC
pop {r4-r7}
@@ -704,7 +704,7 @@ itemid_copy_name: @ 8178250
movs r0, 0x1
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldrb r0, [r6, 0x7]
cmp r0, 0
beq _081782B0
@@ -720,7 +720,7 @@ itemid_copy_name: @ 8178250
movs r0, 0x1
movs r1, 0x1
movs r3, 0x28
bl Print
bl PrintTextOnWindow
b _081782C2
.pool
_081782B0:
@@ -731,7 +731,7 @@ _081782B0:
movs r0, 0x1
movs r1, 0x1
movs r3, 0x28
bl Print
bl PrintTextOnWindow
_081782C2:
add sp, 0xC
pop {r4-r6}
@@ -760,7 +760,7 @@ sub_81782D0: @ 81782D0
movs r0, 0x2
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r0}
bx r0
@@ -787,7 +787,7 @@ sub_8178304: @ 8178304
movs r0, 0x2
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r0}
bx r0
asm/big_shroomish_barboach.s
-489
View File
@@ -1,489 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80F97C8
sub_80F97C8: @ 80F97C8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
adds r5, r0, 0
movs r1, 0
bl GetMonData
lsls r0, 16
str r0, [sp, 0x4]
lsrs r0, 16
str r0, [sp]
adds r0, r5, 0
movs r1, 0x27
bl GetMonData
adds r7, r0, 0
movs r6, 0xF
ands r7, r6
adds r0, r5, 0
movs r1, 0x28
bl GetMonData
mov r8, r0
mov r1, r8
ands r1, r6
mov r8, r1
adds r0, r5, 0
movs r1, 0x29
bl GetMonData
mov r9, r0
mov r3, r9
ands r3, r6
mov r9, r3
adds r0, r5, 0
movs r1, 0x2A
bl GetMonData
mov r10, r0
ands r0, r6
mov r10, r0
adds r0, r5, 0
movs r1, 0x2B
bl GetMonData
adds r4, r0, 0
ands r4, r6
adds r0, r5, 0
movs r1, 0x2C
bl GetMonData
adds r2, r0, 0
ands r2, r6
mov r1, r8
mov r3, r9
eors r1, r3
mov r8, r1
mov r0, r8
muls r0, r7
movs r1, 0xFF
ldr r3, [sp]
ands r3, r1
eors r0, r3
eors r4, r2
mov r1, r10
muls r1, r4
ldr r3, [sp, 0x4]
lsrs r2, r3, 24
eors r1, r2
lsls r0, 8
adds r0, r1
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80F97C8
thumb_func_start sub_80F986C
sub_80F986C: @ 80F986C
push {lr}
lsls r0, 16
lsrs r2, r0, 16
movs r1, 0x1
ldr r3, =gUnknown_0858D8F0
_080F9876:
lsls r0, r1, 3
adds r0, r3
ldrh r0, [r0, 0x4]
cmp r2, r0
bcs _080F988C
subs r0, r1, 0x1
lsls r0, 24
lsrs r0, 24
b _080F9898
.pool
_080F988C:
adds r0, r1, 0x1
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xE
bls _080F9876
adds r0, r1, 0
_080F9898:
pop {r1}
bx r1
thumb_func_end sub_80F986C
thumb_func_start sub_80F989C
sub_80F989C: @ 80F989C
push {r4-r7,lr}
sub sp, 0x8
adds r6, r1, 0
lsls r0, 16
lsrs r0, 16
lsls r6, 16
lsrs r6, 16
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl sub_80C0630
lsls r0, 16
lsrs r7, r0, 16
adds r0, r6, 0
bl sub_80F986C
lsls r0, 24
ldr r1, =gUnknown_0858D8F0
lsrs r0, 21
adds r0, r1
ldrh r1, [r0]
str r1, [sp]
movs r2, 0
str r2, [sp, 0x4]
ldrb r2, [r0, 0x2]
movs r3, 0
ldrh r4, [r0, 0x4]
movs r5, 0
adds r0, r6, 0
movs r1, 0
subs r0, r4
sbcs r1, r5
bl __udivdi3
ldr r2, [sp]
ldr r3, [sp, 0x4]
adds r2, r0
adcs r3, r1
str r2, [sp]
str r3, [sp, 0x4]
adds r0, r7, 0
movs r1, 0
bl __muldi3
movs r2, 0xA
movs r3, 0
bl __udivdi3
add sp, 0x8
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_80F989C
thumb_func_start sub_80F9910
sub_80F9910: @ 80F9910
push {r4,r5,lr}
adds r5, r0, 0
lsls r4, r1, 2
adds r4, r1
lsls r4, 1
adds r0, r4, 0
bl __floatsidf
cmp r4, 0
bge _080F992C
ldr r3, _080F9974
ldr r2, _080F9970
bl __adddf3
_080F992C:
ldr r2, _080F9978
ldr r3, _080F997C
bl __divdf3
bl __fixunsdfsi
adds r4, r0, 0
movs r1, 0xA
bl __udivsi3
adds r1, r0, 0
adds r0, r5, 0
movs r2, 0
movs r3, 0x8
bl ConvertIntToDecimalStringN
adds r5, r0, 0
ldr r1, _080F9980
bl StringAppend
adds r5, r0, 0
adds r0, r4, 0
movs r1, 0xA
bl __umodsi3
adds r1, r0, 0
adds r0, r5, 0
movs r2, 0
movs r3, 0x1
bl ConvertIntToDecimalStringN
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080F9970: .4byte 0x41f00000
_080F9974: .4byte 0x00000000
_080F9978: .4byte 0x40396666
_080F997C: .4byte 0x66666666
_080F9980: .4byte gUnknown_085EED24
thumb_func_end sub_80F9910
thumb_func_start sub_80F9984
sub_80F9984: @ 80F9984
push {r4-r7,lr}
sub sp, 0x4
adds r7, r1, 0
lsls r0, 16
lsrs r6, r0, 16
ldr r1, =gScriptResult
ldrh r0, [r1]
cmp r0, 0xFF
bne _080F99A0
movs r0, 0
b _080F9A0A
.pool
_080F99A0:
ldrh r1, [r1]
movs r0, 0x64
muls r1, r0
ldr r0, =gPlayerParty
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x2D
bl GetMonData
cmp r0, 0x1
beq _080F99C2
adds r0, r5, 0
movs r1, 0xB
bl GetMonData
cmp r0, r6
beq _080F99CC
_080F99C2:
movs r0, 0x1
b _080F9A0A
.pool
_080F99CC:
mov r4, sp
adds r0, r5, 0
bl sub_80F97C8
strh r0, [r4]
mov r0, sp
ldrh r1, [r0]
adds r0, r6, 0
bl sub_80F989C
adds r5, r0, 0
ldrh r1, [r7]
adds r0, r6, 0
bl sub_80F989C
adds r4, r0, 0
ldr r0, =gStringVar2
adds r1, r5, 0
bl sub_80F9910
cmp r5, r4
bls _080F9A08
mov r0, sp
ldrh r0, [r0]
strh r0, [r7]
movs r0, 0x3
b _080F9A0A
.pool
_080F9A08:
movs r0, 0x2
_080F9A0A:
add sp, 0x4
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80F9984
thumb_func_start sub_80F9A14
sub_80F9A14: @ 80F9A14
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
lsls r4, 16
lsrs r4, 16
ldrh r1, [r5]
adds r0, r4, 0
bl sub_80F989C
adds r1, r0, 0
ldr r0, =gStringVar3
bl sub_80F9910
ldr r0, =gStringVar1
movs r1, 0xB
muls r1, r4
ldr r2, =gSpeciesNames
adds r1, r2
bl StringCopy
ldrh r1, [r5]
movs r0, 0x80
lsls r0, 8
cmp r1, r0
bne _080F9A64
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECF6B
bl StringCopy
b _080F9A6E
.pool
_080F9A64:
ldr r0, =gStringVar2
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
bl StringCopy
_080F9A6E:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_80F9A14
thumb_func_start InitSeedotSizeRecord
InitSeedotSizeRecord: @ 80F9A7C
push {lr}
ldr r0, =0x00004047
movs r1, 0x80
lsls r1, 8
bl VarSet
pop {r0}
bx r0
.pool
thumb_func_end InitSeedotSizeRecord
thumb_func_start sub_80F9A90
sub_80F9A90: @ 80F9A90
push {lr}
ldr r0, =0x00004047
bl GetVarPointer
adds r1, r0, 0
movs r0, 0x95
lsls r0, 1
bl sub_80F9A14
pop {r0}
bx r0
.pool
thumb_func_end sub_80F9A90
thumb_func_start sub_80F9AAC
sub_80F9AAC: @ 80F9AAC
push {r4,lr}
ldr r0, =0x00004047
bl GetVarPointer
adds r1, r0, 0
ldr r4, =gScriptResult
movs r0, 0x95
lsls r0, 1
bl sub_80F9984
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_80F9AAC
thumb_func_start InitLotadSizeRecord
InitLotadSizeRecord: @ 80F9AD4
push {lr}
ldr r0, =0x0000404f
movs r1, 0x80
lsls r1, 8
bl VarSet
pop {r0}
bx r0
.pool
thumb_func_end InitLotadSizeRecord
thumb_func_start sub_80F9AE8
sub_80F9AE8: @ 80F9AE8
push {lr}
ldr r0, =0x0000404f
bl GetVarPointer
adds r1, r0, 0
ldr r0, =0x00000127
bl sub_80F9A14
pop {r0}
bx r0
.pool
thumb_func_end sub_80F9AE8
thumb_func_start sub_80F9B04
sub_80F9B04: @ 80F9B04
push {r4,lr}
ldr r0, =0x0000404f
bl GetVarPointer
adds r1, r0, 0
ldr r4, =gScriptResult
ldr r0, =0x00000127
bl sub_80F9984
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_80F9B04
thumb_func_start sub_80F9B30
sub_80F9B30: @ 80F9B30
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0xC
lsls r0, 24
lsrs r6, r0, 24
lsls r1, 24
lsrs r5, r1, 24
movs r7, 0
add r4, sp, 0x8
movs r0, 0x1
strb r0, [r4]
ldr r1, =gUnknown_0858D970
mov r0, sp
movs r2, 0x7
bl memcpy
mov r8, r4
cmp r6, 0xA
bhi _080F9BAC
cmp r5, 0x40
bhi _080F9BAC
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000031a8
adds r0, r1
adds r0, r6
strb r5, [r0]
movs r5, 0
_080F9B6A:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl GetMonData
cmp r0, 0
beq _080F9B9C
adds r0, r4, 0
movs r1, 0x6
bl GetMonData
cmp r0, 0
bne _080F9B9C
mov r1, sp
adds r0, r1, r6
ldrb r1, [r0]
adds r0, r4, 0
mov r2, r8
bl SetMonData
movs r7, 0x1
_080F9B9C:
adds r5, 0x1
cmp r5, 0x5
ble _080F9B6A
cmp r7, 0
beq _080F9BAC
ldr r0, =0x0000089b
bl FlagSet
_080F9BAC:
add sp, 0xC
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_80F9B30
.align 2, 0 @ Don't pad with nop.
asm/bike.s
+2 -2
View File
@@ -1775,7 +1775,7 @@ sub_8119EF0: @ 8119EF0
lsls r0, 24
cmp r0, 0
bne _08119F08
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x8
bne _08119F10
@@ -2173,7 +2173,7 @@ IsRunningDisallowed: @ 811A1DC
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r1, [r0, 0x1A]
movs r0, 0x4
ands r0, r1
asm/braille_puzzles.s
+1 -1
View File
@@ -91,7 +91,7 @@ sub_81796AC: @ 81796AC
lsls r1, 1
cmp r0, r1
bne _081796F4
bl calc_player_party_count
bl CalculatePlayerPartyCount
ldr r0, =gPlayerPartyCount
ldrb r1, [r0]
movs r0, 0x64
asm/cable_club.s
+19 -19
View File
@@ -74,7 +74,7 @@ sub_80B23B0: @ 80B23B0
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
bl Print
bl PrintTextOnWindow
adds r0, r4, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -738,7 +738,7 @@ _080B2994:
bl sub_800ABAC
ldr r4, =gUnknown_03005DB8
strb r0, [r4]
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, =gUnknown_03005DB4
strb r0, [r1]
ldrb r0, [r4]
@@ -751,7 +751,7 @@ _080B2994:
ldrb r0, [r0]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_02024488
ldr r5, =gBattleScripting + 0x14
adds r0, r5
movs r1, 0xB
movs r2, 0
@@ -828,7 +828,7 @@ _080B2A6C:
bl sub_800ABAC
ldr r4, =gUnknown_03005DB8
strb r0, [r4]
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, =gUnknown_03005DB4
strb r0, [r1]
ldrb r0, [r4]
@@ -841,7 +841,7 @@ _080B2A6C:
ldrb r0, [r0]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_02024488
ldr r5, =gBattleScripting + 0x14
adds r0, r5
movs r1, 0xB
movs r2, 0
@@ -1038,7 +1038,7 @@ sub_80B2C30: @ 80B2C30
cmp r4, r0
bne _080B2C9C
movs r4, 0
ldr r6, =gUnknown_020229E8
ldr r6, =gLinkPlayers
b _080B2C7E
.pool
_080B2C5C:
@@ -1367,7 +1367,7 @@ _080B2F0C:
movs r4, 0
cmp r7, r5
bge _080B2F74
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
ldrb r2, [r0]
ldrh r3, [r0, 0x1A]
subs r1, r2, 0x1
@@ -1848,7 +1848,7 @@ _080B3346:
b _080B33A0
.pool
_080B3354:
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
ldr r0, [r0, 0x4]
movs r1, 0x1
ands r0, r1
@@ -1867,7 +1867,7 @@ _080B3378:
ldrh r0, [r0]
bl sub_80B3260
bl overworld_free_bg_tilemaps
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
movs r2, 0x80
lsls r2, 4
adds r0, r2, 0
@@ -1962,7 +1962,7 @@ _080B3458:
cmp r4, r0
bne _080B3532
movs r4, 0
ldr r5, =gUnknown_020229E8
ldr r5, =gLinkPlayers
b _080B349A
.pool
_080B3474:
@@ -2018,7 +2018,7 @@ _080B34CE:
strh r0, [r6]
b _080B3532
_080B34DE:
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
ldr r0, [r0, 0x4]
movs r1, 0x1
ands r0, r1
@@ -2033,14 +2033,14 @@ _080B34FC:
lsls r0, 1
bl PlayNewMapMusic__default_for_battle
_080B3504:
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
ldr r0, =0x00002211
str r0, [r1, 0x14]
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
bl sub_80B3260
bl overworld_free_bg_tilemaps
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
movs r3, 0x80
lsls r3, 4
adds r0, r3, 0
@@ -2087,7 +2087,7 @@ _080B357A:
movs r2, 0
cmp r4, r3
bge _080B35AC
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
ldrb r0, [r1]
subs r0, 0x4
cmp r0, 0x1
@@ -2185,8 +2185,8 @@ sub_80B360C: @ 80B360C
b _080B36B2
.pool
_080B3670:
ldr r4, =gUnknown_020229E8
bl link_get_multiplayer_id
ldr r4, =gLinkPlayers
bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -2201,8 +2201,8 @@ _080B3670:
b _080B36B2
.pool
_080B3694:
ldr r4, =gUnknown_020229E8
bl link_get_multiplayer_id
ldr r4, =gLinkPlayers
bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -2605,7 +2605,7 @@ sub_80B39D4: @ 80B39D4
lsls r1, r4, 3
subs r1, r4
lsls r1, 2
ldr r2, =gUnknown_020229F0
ldr r2, =gLinkPlayers + 8
adds r1, r2
bl StringCopy
adds r0, r4, 0
asm/calculate_base_damage.s
-1045
View File
File diff suppressed because it is too large Load Diff
asm/clear_save_data_screen.s
+2 -2
View File
@@ -41,7 +41,7 @@ sub_817ACE4: @ 817ACE4
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, =gUnknown_085F06D8
movs r1, 0x2
movs r2, 0xE
@@ -95,7 +95,7 @@ _0817AD68:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
asm/clock.s
+2 -2
View File
@@ -78,7 +78,7 @@ sub_809E7E8: @ 809E7E8
adds r0, r4, 0
bl sub_80AEFBC
adds r0, r4, 0
bl sub_806DE44
bl UpdatePartyPokerusTime
adds r0, r4, 0
bl sub_8137904
adds r0, r4, 0
@@ -90,7 +90,7 @@ sub_809E7E8: @ 809E7E8
adds r0, r4, 0
bl sub_813945C
adds r0, r4, 0
bl sub_8177584
bl SetRandomLotteryNumber
ldrh r0, [r5]
strh r0, [r6]
_0809E84E:
asm/coins.s
+2 -142
View File
@@ -5,148 +5,8 @@
.text
thumb_func_start PrintCoinsString
@ void PrintCoinsString(s32 coinAmount)
PrintCoinsString: @ 8145B54
push {r4,lr}
sub sp, 0xC
adds r1, r0, 0
ldr r0, =gStringVar1
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DAB
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x40
bl GetStringRightAlignXOffset
adds r3, r0, 0
ldr r0, =gUnknown_0203AB9C
ldrb r0, [r0]
lsls r3, 24
lsrs r3, 24
movs r1, 0x1
str r1, [sp]
movs r1, 0
str r1, [sp, 0x4]
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r4, 0
bl Print
add sp, 0xC
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end PrintCoinsString
thumb_func_start ShowCoinsWindow
@ void ShowCoinsWindow(s32 coinAmount, u8 x, u8 y)
ShowCoinsWindow: @ 8145BAC
push {r4,r5,lr}
sub sp, 0x18
adds r5, r0, 0
adds r4, r1, 0
adds r3, r2, 0
lsls r4, 24
lsrs r4, 24
lsls r3, 24
lsrs r3, 24
movs r0, 0x8
str r0, [sp]
movs r0, 0x2
str r0, [sp, 0x4]
movs r0, 0xF
str r0, [sp, 0x8]
ldr r0, =0x00000141
str r0, [sp, 0xC]
add r0, sp, 0x10
movs r1, 0
adds r2, r4, 0
bl rbox_template_set
ldr r4, =gUnknown_0203AB9C
add r0, sp, 0x10
bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl FillWindowPixelBuffer
ldrb r0, [r4]
bl PutWindowTilemap
ldrb r0, [r4]
movs r2, 0x85
lsls r2, 2
movs r1, 0
movs r3, 0xE
bl SetWindowBorderStyle
adds r0, r5, 0
bl PrintCoinsString
add sp, 0x18
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end ShowCoinsWindow
thumb_func_start HideCoinsWindow
@ void HideCoinsWindow()
HideCoinsWindow: @ 8145C14
push {r4,lr}
ldr r4, =gUnknown_0203AB9C
ldrb r0, [r4]
movs r1, 0x1
bl sub_819746C
ldrb r0, [r4]
bl RemoveWindow
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end HideCoinsWindow
thumb_func_start GetCoins
@ u16 GetCoins()
GetCoins: @ 8145C30
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, =0x00000494
adds r1, r0
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
adds r0, 0xAC
ldr r0, [r0]
ldrh r1, [r1]
eors r0, r1
lsls r0, 16
lsrs r0, 16
bx lr
.pool
thumb_func_end GetCoins
thumb_func_start SetCoins
@ void SetCoins(u16 amount)
SetCoins: @ 8145C58
lsls r0, 16
lsrs r0, 16
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
adds r1, 0xAC
ldr r1, [r1]
eors r0, r1
ldr r1, =0x00000494
adds r2, r1
strh r0, [r2]
bx lr
.pool
thumb_func_end SetCoins
thumb_func_start AddCoins
@ bool8 AddCoins(u16 amount)
@ bool8 AddCoins(u16 toAdd)
AddCoins: @ 8145C80
push {r4,lr}
lsls r0, 16
@@ -187,7 +47,7 @@ _08145CC0:
thumb_func_end AddCoins
thumb_func_start SubtractCoins
@ bool8 SubtractCoins(u16 amount)
@ bool8 SubtractCoins(u16 toSub)
SubtractCoins: @ 8145CCC
push {r4,lr}
lsls r0, 16
asm/contest.s
+10 -10
View File
@@ -837,7 +837,7 @@ sub_80D7DE8: @ 80D7DE8
lsls r1, 16
cmp r1, 0
bgt _080D7E2A
bl link_get_multiplayer_id
bl GetMultiplayerId
adds r0, r4, 0
bl DestroyTask
ldr r0, =gUnknown_02039F34
@@ -1415,19 +1415,19 @@ sub_80D833C: @ 80D833C
lsls r0, 24
cmp r0, 0
bne _080D83CC
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D507
bl StringCopy
b _080D83D4
.pool
_080D83CC:
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D531
bl StringCopy
_080D83D4:
bl sub_80DB89C
ldr r4, =gStringVar4
ldr r1, =gUnknown_02022E2C
ldr r1, =gDisplayedStringBattle
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@@ -1752,19 +1752,19 @@ _080D868E:
lsls r0, 24
cmp r0, 0
bne _080D86DC
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D507
bl StringCopy
b _080D86E4
.pool
_080D86DC:
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D531
bl StringCopy
_080D86E4:
bl sub_80DB89C
ldr r4, =gStringVar4
ldr r1, =gUnknown_02022E2C
ldr r1, =gDisplayedStringBattle
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@@ -6406,7 +6406,7 @@ sub_80DAED4: @ 80DAED4
adds r5, r0, 0
lsls r4, r1, 24
lsrs r4, 24
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_085ED1AB
bl StringCopy
adds r1, r0, 0
@@ -6458,7 +6458,7 @@ sub_80DAF1C: @ 80DAF1C
add r0, sp, 0x4
adds r1, r4, 0
bl sub_80DAED4
ldr r4, =gUnknown_02022E2C
ldr r4, =gDisplayedStringBattle
movs r0, 0x7
adds r1, r4, 0
movs r2, 0x60
@@ -6514,7 +6514,7 @@ sub_80DAFA0: @ 80DAFA0
ldr r0, =gUnknown_02039F26
adds r4, r0
ldrb r0, [r4]
ldr r1, =gUnknown_02022E2C
ldr r1, =gDisplayedStringBattle
movs r2, 0x7
str r2, [sp]
movs r2, 0x5
asm/contest_link_80F57C4.s
+2 -2
View File
@@ -278,7 +278,7 @@ sub_80F5A74: @ 80F5A74
lsls r1, r5, 6
ldr r0, =gUnknown_02039E00
adds r7, r1, r0
ldr r6, =gUnknown_02022E2C
ldr r6, =gDisplayedStringBattle
ldr r0, =gUnknown_02039F25
ldrb r0, [r0]
cmp r5, r0
@@ -291,7 +291,7 @@ _080F5A96:
adds r1, r7, 0x2
adds r0, r6, 0
bl StringCopy
ldr r4, =gUnknown_02022E2C
ldr r4, =gDisplayedStringBattle
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0
asm/contest_link_80FC4F4.s
+7 -7
View File
@@ -138,7 +138,7 @@ sub_80FC5DC: @ 80FC5DC
ldrb r0, [r0]
cmp r0, 0
beq _080FC650
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, =gUnknown_02039F25
strb r0, [r1]
bl sub_8009FCC
@@ -158,7 +158,7 @@ _080FC60C:
ldrb r2, [r4]
cmp r3, r2
bge _080FC64A
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
ldrb r0, [r1]
subs r0, 0x1
adds r6, r4, 0
@@ -276,7 +276,7 @@ _080FC6F8:
beq _080FC7C0
b _080FC7DC
_080FC6FE:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _080FC738
@@ -318,7 +318,7 @@ _080FC758:
ldrb r0, [r0]
cmp r5, r0
bge _080FC798
ldr r6, =gUnknown_020229E8
ldr r6, =gLinkPlayers
_080FC770:
lsls r4, r5, 6
ldr r0, =gUnknown_02039E00
@@ -408,7 +408,7 @@ sub_80FC804: @ 80FC804
b _080FC880
.pool
_080FC830:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _080FC87A
@@ -490,7 +490,7 @@ _080FC8DE:
ldr r1, =gUnknown_020228C4
ldrh r0, [r4, 0x1A]
strb r0, [r1]
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _080FC904
@@ -1145,7 +1145,7 @@ _080FCE92:
ldr r1, =gUnknown_020228C4
movs r0, 0x6E
strb r0, [r1]
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _080FCEB8
asm/contest_painting.s
+1 -1
View File
@@ -438,7 +438,7 @@ _081301A6:
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r4, 0
bl Print
bl PrintTextOnWindow
movs r0, 0x1
bl CopyBgTilemapBufferToVram
_081301D4:
asm/daycare.s
+67 -67
View File
@@ -29,7 +29,7 @@ pokemon_get_nick_: @ 806FA4C
adds r4, r1, 0
movs r1, 0x2
mov r2, sp
bl pokemon_getattr_encrypted
bl GetBoxMonData
adds r0, r4, 0
mov r1, sp
bl StringCopy10
@@ -50,7 +50,7 @@ _0806FA74:
muls r0, r4
adds r0, r6, r0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0
beq _0806FA8A
adds r0, r5, 0x1
@@ -90,7 +90,7 @@ _0806FAB6:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0
beq _0806FAE4
adds r0, r7, 0x1
@@ -98,7 +98,7 @@ _0806FAB6:
lsrs r7, r0, 24
adds r0, r4, 0
movs r1, 0xC
bl pokemon_getattr_encrypted
bl GetBoxMonData
adds r1, r0, 0
cmp r1, 0
bne _0806FAE4
@@ -138,7 +138,7 @@ _0806FB0E:
muls r0, r4
adds r0, r5, r0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0
bne _0806FB24
lsls r0, r4, 24
@@ -226,15 +226,15 @@ _0806FBBC:
movs r2, 0x50
bl memcpy
adds r0, r5, 0
bl pokemon_restore_pp
bl BoxMonRestorePP
adds r1, r5, 0
adds r1, 0x88
movs r0, 0
str r0, [r1]
adds r0, r6, 0
bl zero_pokemon_struct
bl ZeroMonData
bl party_compaction
bl calc_player_party_count
bl CalculatePlayerPartyCount
pop {r4-r6}
pop {r0}
bx r0
@@ -290,12 +290,12 @@ sub_806FC48: @ 806FC48
adds r4, 0x8C
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0
beq _0806FC9E
adds r0, r5, 0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
adds r6, r0, 0
cmp r6, 0
bne _0806FC9E
@@ -304,7 +304,7 @@ sub_806FC48: @ 806FC48
movs r2, 0x50
bl memcpy
adds r0, r4, 0
bl zero_pokemon_boxed_data
bl ZeroBoxMonData
adds r4, 0x50
adds r0, r5, 0
adds r0, 0x50
@@ -335,7 +335,7 @@ sub_806FCA4: @ 806FCA4
ldr r7, =0x0000ffff
_0806FCAC:
adds r0, r4, 0
bl sub_806DF74
bl TryIncrementMonLevel
lsls r0, 24
cmp r0, 0
beq _0806FCE8
@@ -347,14 +347,14 @@ _0806FCC4:
movs r6, 0
cmp r0, r7
bne _0806FCD4
ldr r0, =gUnknown_020244E2
ldr r0, =gMoveToLearn
ldrh r1, [r0]
adds r0, r4, 0
bl sub_8069424
bl DeleteFirstMoveAndGiveMoveToMon
_0806FCD4:
adds r0, r4, 0
adds r1, r6, 0
bl sub_8069318
bl MonTryLearningNewMove
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -363,7 +363,7 @@ _0806FCD4:
ble _0806FCAC
_0806FCE8:
adds r0, r4, 0
bl pokemon_calc_effective_stats
bl CalculateMonStats
pop {r4-r7}
pop {r0}
bx r0
@@ -379,7 +379,7 @@ sub_806FCF8: @ 806FCF8
bl pokemon_get_nick_
adds r0, r5, 0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
lsls r0, 16
lsrs r7, r0, 16
adds r0, r5, 0
@@ -427,13 +427,13 @@ _0806FD46:
bl sub_806FF80
_0806FD74:
adds r0, r5, 0
bl zero_pokemon_boxed_data
bl ZeroBoxMonData
adds r1, r5, 0
adds r1, 0x88
movs r0, 0
str r0, [r1]
bl party_compaction
bl calc_player_party_count
bl CalculatePlayerPartyCount
adds r0, r7, 0
add sp, 0x68
pop {r4-r7}
@@ -492,15 +492,15 @@ sub_806FDEC: @ 806FDEC
bl memcpy
adds r0, r4, 0
movs r1, 0x19
bl pokemon_getattr_encrypted
bl GetBoxMonData
adds r0, r5
str r0, [sp, 0x50]
add r2, sp, 0x50
mov r0, sp
movs r1, 0x19
bl SetMonData_encrypted
bl SetBoxMonData
mov r0, sp
bl sub_80690C0
bl GetLevelFromBoxMonExp
lsls r0, 24
lsrs r0, 24
add sp, 0x54
@@ -513,7 +513,7 @@ sub_806FDEC: @ 806FDEC
sub_806FE28: @ 806FE28
push {r4,r5,lr}
adds r5, r0, 0
bl sub_80690C0
bl GetLevelFromBoxMonExp
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -647,7 +647,7 @@ sub_806FF30: @ 806FF30
ldr r0, [r6]
adds r0, r1
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0
bne _0806FF60
movs r0, 0
@@ -703,7 +703,7 @@ _0806FF9E:
sub_806FFB0: @ 806FFB0
push {r4,lr}
adds r4, r0, 0
bl zero_pokemon_boxed_data
bl ZeroBoxMonData
adds r1, r4, 0
adds r1, 0x88
movs r0, 0
@@ -829,7 +829,7 @@ _08070090:
movs r0, 0x8C
muls r0, r4
adds r0, r6, r0
bl pokemon_roll_gender
bl GetBoxMonGender
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFE
@@ -846,7 +846,7 @@ _080700AE:
muls r0, r4
adds r0, r6, r0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
lsls r1, r4, 2
add r1, sp
str r0, [r1]
@@ -872,7 +872,7 @@ _080700E2:
muls r0, r7
adds r0, r6, r0
movs r1, 0xC
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0xC3
bne _080700FE
bl Random
@@ -931,7 +931,7 @@ _08070160:
adds r0, r5, r0
movs r1, 0
movs r2, 0
bl pokemon_getattr_encrypted
bl GetBoxMonData
bl GetNatureFromPersonality
lsls r0, 24
lsrs r7, r0, 24
@@ -1145,7 +1145,7 @@ _08070304:
muls r0, r1
add r0, r8
movs r1, 0x27
bl pokemon_getattr_encrypted
bl GetBoxMonData
add r2, sp, 0x10
strb r0, [r2]
mov r0, r9
@@ -1160,7 +1160,7 @@ _08070322:
muls r0, r1
add r0, r8
movs r1, 0x28
bl pokemon_getattr_encrypted
bl GetBoxMonData
strb r0, [r4]
mov r0, r9
movs r1, 0x28
@@ -1173,7 +1173,7 @@ _0807033C:
muls r0, r1
add r0, r8
movs r1, 0x29
bl pokemon_getattr_encrypted
bl GetBoxMonData
strb r0, [r4]
mov r0, r9
movs r1, 0x29
@@ -1186,7 +1186,7 @@ _08070356:
muls r0, r1
add r0, r8
movs r1, 0x2A
bl pokemon_getattr_encrypted
bl GetBoxMonData
strb r0, [r4]
mov r0, r9
movs r1, 0x2A
@@ -1199,7 +1199,7 @@ _08070370:
muls r0, r1
add r0, r8
movs r1, 0x2B
bl pokemon_getattr_encrypted
bl GetBoxMonData
strb r0, [r4]
mov r0, r9
movs r1, 0x2B
@@ -1215,7 +1215,7 @@ _08070390:
muls r0, r1
add r0, r8
movs r1, 0x2C
bl pokemon_getattr_encrypted
bl GetBoxMonData
strb r0, [r4]
mov r0, r9
movs r1, 0x2C
@@ -1380,7 +1380,7 @@ _080704C4:
lsls r0, 16
lsrs r0, 16
ldr r1, =gUnknown_020249C4
bl sub_806E204
bl GetLevelUpMovesBySpecies
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -1392,14 +1392,14 @@ _080704F2:
adds r5, 0xD
mov r0, r10
adds r1, r5, 0
bl pokemon_getattr_encrypted
bl GetBoxMonData
lsls r4, r6, 1
mov r2, r8
adds r1, r4, r2
strh r0, [r1]
mov r0, r9
adds r1, r5, 0
bl pokemon_getattr_encrypted
bl GetBoxMonData
ldr r1, =gUnknown_02024A4C
adds r4, r1
strh r0, [r4]
@@ -1439,7 +1439,7 @@ _08070546:
adds r1, r0, 0
adds r0, r7, 0
str r2, [sp, 0x8]
bl pokemon_moveset_pad_
bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
ldr r2, [sp, 0x8]
@@ -1447,7 +1447,7 @@ _08070546:
bne _08070596
ldrh r1, [r4]
adds r0, r7, 0
bl sub_8069424
bl DeleteFirstMoveAndGiveMoveToMon
b _08070596
.pool
_0807058C:
@@ -1495,19 +1495,19 @@ _080705C2:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r7, 0
bl sub_806E00C
bl CanMonLearnTMHM
cmp r0, 0
beq _080705FE
ldrh r1, [r4]
adds r0, r7, 0
bl pokemon_moveset_pad_
bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
cmp r0, r6
bne _080705FE
ldrh r1, [r4]
adds r0, r7, 0
bl sub_8069424
bl DeleteFirstMoveAndGiveMoveToMon
_080705FE:
adds r0, r5, 0x1
lsls r0, 16
@@ -1601,7 +1601,7 @@ _0807068A:
adds r1, r0, 0
adds r0, r7, 0
str r2, [sp, 0x8]
bl pokemon_moveset_pad_
bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
ldr r2, [sp, 0x8]
@@ -1609,7 +1609,7 @@ _0807068A:
bne _080706E4
ldrh r1, [r4]
adds r0, r7, 0
bl sub_8069424
bl DeleteFirstMoveAndGiveMoveToMon
b _080706E4
.pool
_080706D8:
@@ -1689,13 +1689,13 @@ incense_effects: @ 8070744
_0807075C:
adds r0, r5, 0
movs r1, 0xC
bl pokemon_getattr_encrypted
bl GetBoxMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r5, 0
adds r0, 0x8C
movs r1, 0xC
bl pokemon_getattr_encrypted
bl GetBoxMonData
lsls r0, 16
lsrs r2, r0, 16
ldrh r0, [r4]
@@ -1732,12 +1732,12 @@ sub_80707A4: @ 80707A4
adds r4, r1, 0
adds r0, r4, 0
movs r1, 0xC
bl pokemon_getattr_encrypted
bl GetBoxMonData
adds r5, r0, 0
adds r4, 0x8C
adds r0, r4, 0
movs r1, 0xC
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r5, 0xCA
beq _080707C6
cmp r0, 0xCA
@@ -1747,14 +1747,14 @@ _080707C6:
lsls r4, 1
adds r0, r6, 0
adds r1, r4, 0
bl pokemon_moveset_pad_
bl GiveMoveToMon
lsls r0, 16
ldr r1, =0xffff0000
cmp r0, r1
bne _080707E2
adds r0, r6, 0
adds r1, r4, 0
bl sub_8069424
bl DeleteFirstMoveAndGiveMoveToMon
_080707E2:
pop {r4-r6}
pop {r0}
@@ -1779,7 +1779,7 @@ _080707FE:
adds r5, r7, r0
adds r0, r5, 0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
lsls r1, r4, 1
add r1, sp
strh r0, [r1]
@@ -1795,7 +1795,7 @@ _080707FE:
b _0807083E
_08070826:
adds r0, r5, 0
bl pokemon_roll_gender
bl GetBoxMonGender
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFE
@@ -1856,7 +1856,7 @@ _0807088C:
movs r0, 0x8C
muls r0, r1
adds r0, r7, r0
bl pokemon_roll_gender
bl GetBoxMonGender
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFE
@@ -1928,7 +1928,7 @@ _08070918:
movs r2, 0x64
bl memcpy
bl party_compaction
bl calc_player_party_count
bl CalculatePlayerPartyCount
adds r0, r6, 0
bl sub_8070710
add sp, 0x6C
@@ -1960,7 +1960,7 @@ sub_8070954: @ 8070954
adds r1, r5, 0
movs r2, 0x5
movs r3, 0x20
bl create_pokemon_set_level
bl CreateMon
movs r0, 0x12
add r0, sp
mov r8, r0
@@ -2050,7 +2050,7 @@ sub_8070A0C: @ 8070A0C
adds r1, r5, 0
movs r2, 0x5
movs r3, 0x20
bl create_pokemon_set_level
bl CreateMon
movs r0, 0x12
add r0, sp
mov r9, r0
@@ -2122,7 +2122,7 @@ _08070ACE:
muls r4, r0
adds r0, r6, r4
movs r1, 0x5
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0
beq _08070AEE
adds r1, r6, 0
@@ -2275,7 +2275,7 @@ sub_8070C04: @ 8070C04
sub sp, 0xC
adds r4, r0, 0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0
beq _08070C2E
ldr r1, =gStringVar1
@@ -2284,7 +2284,7 @@ sub_8070C04: @ 8070C04
adds r0, r4, 0
movs r1, 0x7
mov r2, sp
bl pokemon_getattr_encrypted
bl GetBoxMonData
ldr r0, =gStringVar3
mov r1, sp
bl StringCopy
@@ -2292,7 +2292,7 @@ _08070C2E:
adds r4, 0x8C
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0
beq _08070C44
ldr r1, =gStringVar2
@@ -2324,7 +2324,7 @@ sub_8070C58: @ 8070C58
muls r0, r5
adds r0, r4
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
lsls r0, 16
lsrs r0, 16
pop {r4,r5}
@@ -2468,20 +2468,20 @@ _08070D7E:
adds r4, r0, r4
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr_encrypted
bl GetBoxMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0x1
bl pokemon_getattr_encrypted
bl GetBoxMonData
ldr r1, [sp, 0x2C]
stm r1!, {r0}
str r1, [sp, 0x2C]
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr_encrypted
bl GetBoxMonData
adds r1, r0, 0
ldrh r0, [r5]
bl pokemon_species_get_gender_info
bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
ldr r2, [sp, 0x28]
@@ -2751,7 +2751,7 @@ sub_8070F98: @ 8070F98
push {r4,lr}
adds r4, r0, 0
adds r0, r1, 0
bl pokemon_roll_gender
bl GetBoxMonGender
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
asm/decoration.s
+37 -37
View File
@@ -13,7 +13,7 @@ sub_8126968: @ 8126968
cmp r0, 0x7
bhi _0812697E
ldr r2, =gUnknown_0203A14C
ldr r1, =gUnknown_0203BC40
ldr r1, =gDecorationInventories
lsls r0, 3
adds r0, r1
ldr r0, [r0]
@@ -461,7 +461,7 @@ sub_8126D6C: @ 8126D6C
cmp r0, 0
bne _08126D98
ldr r0, =gUnknown_0823B4E8
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
b _08126D9E
@@ -669,7 +669,7 @@ _08126F2C:
adds r0, r5, 0
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0xC
@@ -742,7 +742,7 @@ _08126FA2:
movs r1, 0x1
adds r2, r4, 0
adds r3, r7, 0
bl Print
bl PrintTextOnWindow
mov r0, r8
bl sub_8161AD0
adds r1, r0, 0
@@ -756,7 +756,7 @@ _08126FA2:
movs r0, 0xBA
strb r0, [r6]
adds r6, 0x1
ldr r1, =gUnknown_0203BC40
ldr r1, =gDecorationInventories
mov r2, r8
lsls r0, r2, 3
adds r0, r1
@@ -780,7 +780,7 @@ _08126FA2:
movs r1, 0x1
adds r2, r4, 0
adds r3, r7, 0
bl Print
bl PrintTextOnWindow
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -883,7 +883,7 @@ sub_81270E8: @ 81270E8
ldrb r0, [r4]
bl sub_8161A38
ldr r2, =gUnknown_0203A14C
ldr r1, =gUnknown_0203BC40
ldr r1, =gDecorationInventories
ldrb r0, [r4]
lsls r0, 3
adds r0, r1
@@ -1614,7 +1614,7 @@ sub_8127744: @ 8127744
b _08127782
.pool
_08127770:
ldr r1, =gUnknown_085A5C08
ldr r1, =gDecorations
ldr r0, =gUnknown_0203A14C
ldr r0, [r0]
adds r0, r4
@@ -1632,7 +1632,7 @@ _08127782:
adds r0, r5, 0
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -1740,7 +1740,7 @@ _08127842:
mov r3, r8
ldrb r0, [r3]
lsls r0, 3
ldr r1, =gUnknown_0203BC40
ldr r1, =gDecorationInventories
adds r0, r1
ldrb r0, [r0, 0x4]
cmp r2, r0
@@ -1807,7 +1807,7 @@ _081278E2:
bls _08127842
movs r5, 0
movs r6, 0
ldr r3, =gUnknown_0203BC40
ldr r3, =gDecorationInventories
mov r8, r3
_081278F4:
ldr r0, =gSaveBlock1Ptr
@@ -2193,7 +2193,7 @@ _08127BF0:
ldr r0, =gUnknown_085A5C24
adds r0, r4, r0
str r0, [sp, 0x1C]
ldr r0, =gUnknown_085A5C08
ldr r0, =gDecorations
adds r0, r4, r0
str r0, [sp, 0x24]
ldr r3, [sp, 0x8]
@@ -2267,7 +2267,7 @@ _08127C8E:
movs r6, 0
_08127C90:
ldr r3, [sp, 0x18]
ldr r4, =gUnknown_085A5C08
ldr r4, =gDecorations
adds r0, r3, r4
ldrb r0, [r0]
ldr r4, [sp, 0x20]
@@ -2360,7 +2360,7 @@ sub_8127D38: @ 8127D38
lsrs r4, r1, 16
lsls r2, 16
lsrs r2, 16
ldr r1, =gUnknown_085A5C08
ldr r1, =gDecorations
lsls r0, r2, 5
adds r0, r1
ldrb r0, [r0, 0x12]
@@ -2472,7 +2472,7 @@ sub_8127E18: @ 8127E18
push {r5-r7}
sub sp, 0x4
movs r6, 0
ldr r7, =gUnknown_02037318
ldr r7, =gMapHeader
ldr r0, =gSpecialVar_0x8005
mov r8, r0
ldr r1, =gSpecialVar_0x8006
@@ -2500,7 +2500,7 @@ _08127E34:
ldrh r0, [r0, 0x14]
cmp r0, r5
beq _08127E82
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r3, [r0, 0x4]
ldrb r6, [r3]
adds r4, r5, 0
@@ -2954,7 +2954,7 @@ sub_812826C: @ 812826C
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =gUnknown_085A5C08
ldr r2, =gDecorations
ldr r0, =gUnknown_0203A172
ldrb r1, [r0]
ldr r0, =gUnknown_0203A14C
@@ -3826,7 +3826,7 @@ sub_8128950: @ 8128950
adds r0, r1
ldrb r1, [r0]
lsls r1, 5
ldr r0, =gUnknown_085A5C08
ldr r0, =gDecorations
adds r1, r0
adds r0, r5, 0
bl sub_812853C
@@ -3888,7 +3888,7 @@ sub_81289F0: @ 81289F0
bl sub_8197434
adds r0, r4, 0
bl sub_8128AAC
ldr r2, =gUnknown_085A5C08
ldr r2, =gDecorations
ldr r0, =gUnknown_0203A172
ldrb r1, [r0]
ldr r0, =gUnknown_0203A14C
@@ -3926,7 +3926,7 @@ _08128A44:
subs r0, 0x7
strh r0, [r2]
ldr r0, =gUnknown_08275D1F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
_08128A64:
ldr r2, =gSprites
ldr r0, =gUnknown_0203AA38
@@ -3938,7 +3938,7 @@ _08128A64:
ldrh r1, [r0, 0x22]
adds r1, 0x2
strh r1, [r0, 0x22]
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x14]
cmp r0, 0x56
bne _08128A84
@@ -4194,7 +4194,7 @@ _08128C96:
b _08128CAC
_08128C9C:
ldr r0, =gUnknown_08275D0C
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _08128CAC
.pool
_08128CA8:
@@ -4282,7 +4282,7 @@ _08128D48:
movs r0, 0x2
ldrsh r1, [r2, r0]
subs r1, 0x7
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r0, [r0, 0x4]
cmp r1, r0
@@ -4316,7 +4316,7 @@ _08128D82:
ldrsh r0, [r2, r4]
adds r1, r0
subs r1, 0x8
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r0, [r0]
cmp r1, r0
@@ -5071,7 +5071,7 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 8129334
lsrs r4, 24
bl sub_8129048
lsls r4, 5
ldr r0, =gUnknown_085A5C08
ldr r0, =gDecorations
adds r4, r0
str r4, [r5]
ldrb r0, [r4, 0x11]
@@ -5253,7 +5253,7 @@ AddDecorationIconObjectFromFieldObject: @ 81294C0
adds r0, r6, 0
bl sub_8129048
lsls r4, 5
ldr r0, =gUnknown_085A5C08
ldr r0, =gDecorations
adds r4, r0
str r4, [r6]
ldrb r0, [r4, 0x11]
@@ -5539,7 +5539,7 @@ _08129738:
b _08129796
.pool
_08129744:
ldr r3, =gUnknown_085A5C08
ldr r3, =gDecorations
ldr r2, =gUnknown_0203A17C
ldr r1, =gUnknown_0203AA44
ldrh r0, [r4]
@@ -5559,7 +5559,7 @@ _08129744:
ldrb r0, [r4]
bl sub_81296EC
movs r1, 0
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0, 0x4]
ldrb r2, [r0]
cmp r1, r2
@@ -5591,7 +5591,7 @@ _08129796:
sub_81297AC: @ 81297AC
push {r4-r6,lr}
movs r2, 0
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0, 0x4]
ldrb r1, [r0]
cmp r2, r1
@@ -5646,7 +5646,7 @@ _08129808:
adds r0, r1
ldrb r0, [r0]
lsls r0, 5
ldr r7, =gUnknown_085A5C08
ldr r7, =gDecorations
adds r0, r7
ldrb r2, [r0, 0x11]
ldr r7, =gUnknown_0203A17C
@@ -5684,7 +5684,7 @@ _08129846:
_0812985E:
adds r0, r4, 0x7
add r0, r8
ldr r1, =gUnknown_02037318
ldr r1, =gMapHeader
ldr r3, [r1]
ldr r1, [sp]
subs r2, r1, r6
@@ -5787,7 +5787,7 @@ _08129928:
bne _08129994
bl DrawWholeMapView
ldr r0, =gUnknown_08275D2E
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0
movs r1, 0x1
bl sub_8197434
@@ -5817,7 +5817,7 @@ _08129968:
adds r0, r5, 0
adds r1, r4, 0
bl DisplayItemMessageOnField
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x14]
cmp r0, 0x56
bne _08129994
@@ -6271,7 +6271,7 @@ sub_8129D8C: @ 8129D8C
push {lr}
adds r2, r1, 0
lsls r0, 24
ldr r1, =gUnknown_085A5C08
ldr r1, =gDecorations
lsrs r0, 19
adds r0, r1
ldrb r1, [r0, 0x12]
@@ -6568,7 +6568,7 @@ _08129FD2:
ldrb r0, [r1]
cmp r0, 0
beq _0812A024
ldr r0, =gUnknown_085A5C08
ldr r0, =gDecorations
ldrb r2, [r1]
lsls r1, r2, 5
adds r1, r0
@@ -6651,7 +6651,7 @@ _0812A072:
ands r2, r0
cmp r1, 0
beq _0812A0BA
ldr r0, =gUnknown_085A5C08
ldr r0, =gDecorations
lsls r1, 5
adds r1, r0
ldrb r0, [r1, 0x11]
@@ -6952,7 +6952,7 @@ _0812A2F6:
b _0812A30C
_0812A2FC:
ldr r0, =gUnknown_08275D0C
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0812A30C
.pool
_0812A308:
asm/decoration_inventory.s
+459
View File
@@ -0,0 +1,459 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start SetDecorationInventoriesPointers
SetDecorationInventoriesPointers: @ 81617F4
push {r4,lr}
ldr r0, =gDecorationInventories
mov r12, r0
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, =0x00002734
adds r0, r1, r2
mov r4, r12
str r0, [r4]
movs r3, 0xA
strb r3, [r4, 0x4]
adds r2, 0xA
adds r0, r1, r2
str r0, [r4, 0x8]
strb r3, [r4, 0xC]
ldr r4, =0x00002748
adds r0, r1, r4
mov r2, r12
str r0, [r2, 0x10]
strb r3, [r2, 0x14]
adds r4, 0xA
adds r0, r1, r4
str r0, [r2, 0x18]
movs r2, 0x1E
mov r0, r12
strb r2, [r0, 0x1C]
adds r4, 0x1E
adds r0, r1, r4
mov r4, r12
str r0, [r4, 0x20]
mov r0, r12
adds r0, 0x24
strb r2, [r0]
ldr r2, =0x0000278e
adds r0, r1, r2
str r0, [r4, 0x28]
mov r0, r12
adds r0, 0x2C
strb r3, [r0]
ldr r4, =0x00002798
adds r0, r1, r4
mov r2, r12
str r0, [r2, 0x30]
adds r2, 0x34
movs r0, 0x28
strb r0, [r2]
adds r4, 0x28
adds r1, r4
mov r0, r12
str r1, [r0, 0x38]
adds r0, 0x3C
strb r3, [r0]
bl sub_8126968
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end SetDecorationInventoriesPointers
thumb_func_start ClearDecorationInventory
ClearDecorationInventory: @ 8161880
push {r4,r5,lr}
lsls r0, 24
movs r3, 0
ldr r1, =gDecorationInventories
lsrs r2, r0, 21
adds r0, r2, r1
ldrb r0, [r0, 0x4]
cmp r3, r0
bcs _081618AA
adds r5, r1, 0
movs r4, 0
_08161896:
adds r0, r2, r5
ldr r1, [r0]
adds r1, r3
strb r4, [r1]
adds r1, r3, 0x1
lsls r1, 24
lsrs r3, r1, 24
ldrb r0, [r0, 0x4]
cmp r3, r0
bcc _08161896
_081618AA:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end ClearDecorationInventory
thumb_func_start ClearDecorationInventories
ClearDecorationInventories: @ 81618B4
push {r4,lr}
movs r4, 0
_081618B8:
adds r0, r4, 0
bl ClearDecorationInventory
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x7
bls _081618B8
pop {r4}
pop {r0}
bx r0
thumb_func_end ClearDecorationInventories
thumb_func_start sub_81618D0
sub_81618D0: @ 81618D0
push {r4,lr}
lsls r0, 24
movs r2, 0
ldr r1, =gDecorationInventories
lsrs r0, 21
adds r0, r1
movs r1, 0x4
ldrsb r1, [r0, r1]
cmp r2, r1
bge _0816190C
adds r4, r0, 0
adds r3, r1, 0
_081618E8:
lsls r0, r2, 24
asrs r1, r0, 24
ldr r0, [r4]
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _08161900
adds r0, r1, 0
b _08161910
.pool
_08161900:
adds r0, r1, 0x1
lsls r0, 24
lsrs r2, r0, 24
asrs r0, 24
cmp r0, r3
blt _081618E8
_0816190C:
movs r0, 0x1
negs r0, r0
_08161910:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81618D0
thumb_func_start sub_8161918
sub_8161918: @ 8161918
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r1, =gDecorations
lsls r0, r3, 5
adds r0, r1
ldrb r0, [r0, 0x13]
movs r2, 0
ldr r1, =gDecorationInventories
lsls r0, 3
adds r0, r1
ldrb r1, [r0, 0x4]
cmp r2, r1
bcs _08161956
ldr r4, [r0]
_08161936:
adds r0, r4, r2
ldrb r0, [r0]
cmp r0, r3
bne _0816194C
movs r0, 0x1
b _08161958
.pool
_0816194C:
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, r1
bcc _08161936
_08161956:
movs r0, 0
_08161958:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8161918
thumb_func_start DecorationAdd
DecorationAdd: @ 8161960
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
cmp r4, 0
beq _081619A0
ldr r1, =gDecorations
lsls r0, r4, 5
adds r0, r1
ldrb r5, [r0, 0x13]
adds r0, r5, 0
bl sub_81618D0
lsls r0, 24
asrs r2, r0, 24
movs r0, 0x1
negs r0, r0
cmp r2, r0
beq _081619A0
ldr r0, =gDecorationInventories
lsls r1, r5, 3
adds r1, r0
ldr r0, [r1]
adds r0, r2
strb r4, [r0]
movs r0, 0x1
b _081619A2
.pool
_081619A0:
movs r0, 0
_081619A2:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end DecorationAdd
thumb_func_start DecorationCheckSpace
DecorationCheckSpace: @ 81619A8
push {lr}
lsls r0, 24
lsrs r0, 24
cmp r0, 0
beq _081619D4
ldr r1, =gDecorations
lsls r0, 5
adds r0, r1
ldrb r0, [r0, 0x13]
bl sub_81618D0
lsls r0, 24
asrs r0, 24
movs r1, 0x1
negs r1, r1
cmp r0, r1
beq _081619D4
movs r0, 0x1
b _081619D6
.pool
_081619D4:
movs r0, 0
_081619D6:
pop {r1}
bx r1
thumb_func_end DecorationCheckSpace
thumb_func_start DecorationRemove
DecorationRemove: @ 81619DC
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
movs r3, 0
cmp r5, 0
bne _081619F8
b _08161A26
_081619EA:
movs r0, 0
strb r0, [r1]
adds r0, r6, 0
bl sub_8161A38
movs r0, 0x1
b _08161A28
_081619F8:
ldr r2, =gDecorationInventories
ldr r1, =gDecorations
lsls r0, r5, 5
adds r0, r1
ldrb r4, [r0, 0x13]
lsls r0, r4, 3
adds r0, r2
ldrb r1, [r0, 0x4]
cmp r3, r1
bcs _08161A26
adds r6, r4, 0
adds r4, r0, 0
adds r2, r1, 0
_08161A12:
ldr r0, [r4]
adds r1, r0, r3
ldrb r0, [r1]
cmp r0, r5
beq _081619EA
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r2
bcc _08161A12
_08161A26:
movs r0, 0
_08161A28:
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end DecorationRemove
thumb_func_start sub_8161A38
sub_8161A38: @ 8161A38
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
lsls r0, 24
movs r6, 0
ldr r2, =gDecorationInventories
lsrs r0, 21
adds r1, r0, r2
ldrb r3, [r1, 0x4]
cmp r6, r3
bcs _08161ABC
adds r7, r0, 0
mov r10, r1
mov r0, r10
str r0, [sp]
_08161A5C:
adds r1, r6, 0x1
lsls r0, r1, 24
lsrs r3, r0, 24
adds r2, r7, 0
mov r12, r1
mov r1, r10
ldrb r1, [r1, 0x4]
cmp r3, r1
bcs _08161AAE
ldr r0, =gDecorationInventories
mov r9, r0
adds r1, r0, 0
mov r8, r1
_08161A76:
mov r0, r9
adds r5, r2, r0
ldr r1, [r5]
adds r0, r1, r3
ldrb r4, [r0]
adds r2, r4, 0
cmp r2, 0
beq _08161A9C
adds r0, r1, r6
ldrb r1, [r0]
cmp r1, 0
beq _08161A92
cmp r1, r2
bls _08161A9C
_08161A92:
ldrb r1, [r0]
strb r4, [r0]
ldr r0, [r5]
adds r0, r3
strb r1, [r0]
_08161A9C:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
adds r2, r7, 0
mov r1, r8
adds r0, r2, r1
ldrb r0, [r0, 0x4]
cmp r3, r0
bcc _08161A76
_08161AAE:
mov r3, r12
lsls r0, r3, 24
lsrs r6, r0, 24
ldr r0, [sp]
ldrb r0, [r0, 0x4]
cmp r6, r0
bcc _08161A5C
_08161ABC:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8161A38
thumb_func_start sub_8161AD0
sub_8161AD0: @ 8161AD0
push {r4,r5,lr}
lsls r0, 24
movs r4, 0
movs r3, 0
ldr r2, =gDecorationInventories
lsrs r1, r0, 21
adds r0, r1, r2
ldrb r0, [r0, 0x4]
cmp r4, r0
bcs _08161B04
adds r5, r2, 0
_08161AE6:
adds r2, r1, r5
ldr r0, [r2]
adds r0, r3
ldrb r0, [r0]
cmp r0, 0
beq _08161AF8
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
_08161AF8:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
ldrb r2, [r2, 0x4]
cmp r3, r2
bcc _08161AE6
_08161B04:
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end sub_8161AD0
thumb_func_start sub_8161B10
sub_8161B10: @ 8161B10
push {r4,r5,lr}
movs r5, 0
movs r4, 0
_08161B16:
adds r0, r4, 0
bl sub_8161AD0
adds r0, r5, r0
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x7
bls _08161B16
adds r0, r5, 0
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8161B10
.align 2, 0 @ Don't pad with nop.
asm/easy_chat.s
+1 -1
View File
@@ -5910,7 +5910,7 @@ sub_811D028: @ 811D028
str r4, [sp]
str r5, [sp, 0x4]
str r6, [sp, 0x8]
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r4-r6}
pop {r0}
asm/egg_hatch.s
+5 -5
View File
@@ -104,7 +104,7 @@ _080713AE:
ldr r1, [sp, 0x3C]
movs r2, 0x5
movs r3, 0x20
bl create_pokemon_set_level
bl CreateMon
movs r4, 0
_0807141E:
adds r1, r4, 0
@@ -246,9 +246,9 @@ sub_80714B8: @ 80714B8
movs r1, 0x23
bl SetMonData
adds r0, r5, 0
bl sub_806E924
bl MonRestorePP
adds r0, r5, 0
bl pokemon_calc_effective_stats
bl CalculateMonStats
add sp, 0x14
pop {r4,r5}
pop {r0}
@@ -1104,7 +1104,7 @@ _08071D3C:
ldrb r0, [r0, 0x4]
muls r0, r6
adds r0, r5
bl pokemon_get_gender
bl GetMonGender
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1735,7 +1735,7 @@ sub_8072214: @ 8072214
thumb_func_start sub_807228C
sub_807228C: @ 807228C
push {r4-r6,lr}
bl calc_player_party_count
bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
asm/evolution_scene.s
+61 -61
View File
@@ -1044,7 +1044,7 @@ _0813E416:
mov r9, r0
ldr r1, [sp, 0x4]
movs r2, 0x64
bl memcpy_pokemon
bl CopyMon
ldrb r0, [r6]
muls r0, r5
adds r0, r4
@@ -1130,8 +1130,8 @@ _0813E4A0:
ldrb r0, [r4]
muls r0, r6
adds r0, r5
bl pokemon_calc_effective_stats
bl calc_player_party_count
bl CalculateMonStats
bl CalculatePlayerPartyCount
ldr r0, =gEvolutionTable
mov r4, r8
add r4, r10
@@ -1643,7 +1643,7 @@ _0813E99E:
movs r1, 0xB
bl SetMonData
mov r0, r9
bl pokemon_calc_effective_stats
bl CalculateMonStats
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0xC]
mov r0, r9
@@ -1679,7 +1679,7 @@ _0813EA2A:
adds r4, r0, r1
ldrb r1, [r4, 0x10]
mov r0, r9
bl sub_8069318
bl MonTryLearningNewMove
lsls r0, 16
lsrs r6, r0, 16
cmp r6, 0
@@ -1897,8 +1897,8 @@ _0813EC2A:
bl PlayFanfare
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0xC]
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r0, =gTasks
@@ -1994,8 +1994,8 @@ _0813ED16:
bl sub_804F574
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x10]
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r0, =gTasks
@@ -2023,8 +2023,8 @@ _0813ED56:
_0813ED62:
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x14]
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r0, =gTasks
@@ -2048,8 +2048,8 @@ _0813ED90:
bne _0813EDCE
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x18]
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r0, =gTasks
@@ -2237,7 +2237,7 @@ _0813EF3E:
lsls r2, 24
lsrs r2, 24
ldr r3, =sub_813DD7C
ldr r4, =gUnknown_020244E2
ldr r4, =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_81BFA38
@@ -2282,15 +2282,15 @@ _0813EFC8:
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl sub_806E804
bl IsHMMove2
cmp r0, 0
beq _0813F014
ldr r0, =gUnknown_085CC270
ldr r3, =0x000004cc
adds r0, r3
ldr r0, [r0]
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gTasks
@@ -2317,12 +2317,12 @@ _0813F014:
lsrs r4, 24
mov r0, r9
adds r1, r4, 0
bl sub_806B9A8
ldr r0, =gUnknown_020244E2
bl RemoveMonPPBonus
ldr r0, =gMoveToLearn
ldrh r1, [r0]
mov r0, r9
adds r2, r4, 0
bl sub_80691F4
bl SetMonMoveSlot
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2338,8 +2338,8 @@ _0813F05C:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r0, =gTasks
@@ -2367,8 +2367,8 @@ _0813F09E:
_0813F0AA:
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x1C]
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r0, =gTasks
@@ -2395,8 +2395,8 @@ _0813F0D8:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gTasks
@@ -2411,8 +2411,8 @@ _0813F0D8:
_0813F120:
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x20]
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gTasks
@@ -2431,8 +2431,8 @@ _0813F120:
_0813F154:
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x24]
bl get_battle_strings_
ldr r0, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gTasks
@@ -2827,7 +2827,7 @@ _0813F4F2:
movs r1, 0xB
bl SetMonData
mov r0, r9
bl pokemon_calc_effective_stats
bl CalculateMonStats
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0xC]
mov r0, r9
@@ -2870,7 +2870,7 @@ _0813F58C:
adds r5, r0, r1
ldrb r1, [r5, 0x10]
mov r0, r9
bl sub_8069318
bl MonTryLearningNewMove
lsls r0, 16
lsrs r6, r0, 16
mov r8, r4
@@ -3064,8 +3064,8 @@ _0813F762:
bl PlayFanfare
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0xC]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3163,8 +3163,8 @@ _0813F852:
bl sub_804F574
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x10]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3193,8 +3193,8 @@ _0813F892:
_0813F89E:
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x14]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3219,8 +3219,8 @@ _0813F8CC:
bne _0813F90C
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x18]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3299,8 +3299,8 @@ _0813F98C:
lsls r1, 3
adds r0, r1
ldr r0, [r0]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3336,8 +3336,8 @@ _0813F9E4:
lsls r1, 3
adds r0, r1
ldr r0, [r0]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3388,7 +3388,7 @@ _0813FA3E:
lsls r2, 24
lsrs r2, 24
ldr r3, =sub_813DF70
ldr r4, =gUnknown_020244E2
ldr r4, =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_81BFA38
@@ -3434,15 +3434,15 @@ _0813FAEC:
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
bl sub_806E804
bl IsHMMove2
cmp r0, 0
beq _0813FB3C
ldr r0, =gUnknown_085CC270
ldr r1, =0x000004cc
adds r0, r1
ldr r0, [r0]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3470,19 +3470,19 @@ _0813FB3C:
lsrs r4, 24
mov r0, r9
adds r1, r4, 0
bl sub_806B9A8
ldr r0, =gUnknown_020244E2
bl RemoveMonPPBonus
ldr r0, =gMoveToLearn
ldrh r1, [r0]
mov r0, r9
adds r2, r4, 0
bl sub_80691F4
bl SetMonMoveSlot
ldr r0, =gUnknown_085CC270
movs r1, 0xCF
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3511,8 +3511,8 @@ _0813FBB2:
_0813FBBE:
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x1C]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3540,8 +3540,8 @@ _0813FBEC:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3557,8 +3557,8 @@ _0813FBEC:
_0813FC38:
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x20]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
@@ -3578,8 +3578,8 @@ _0813FC38:
_0813FC70:
ldr r0, =gUnknown_085CC270
ldr r0, [r0, 0x24]
bl get_battle_strings_
ldr r1, =gUnknown_02022E2C
bl StrCpyDecodeToDisplayedStringBattle
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_807F1A8
asm/field_camera.s
+3 -3
View File
@@ -135,7 +135,7 @@ DrawWholeMapView: @ 8089C34
ldrsh r0, [r1, r2]
movs r2, 0x2
ldrsh r1, [r1, r2]
ldr r2, =gUnknown_02037318
ldr r2, =gMapHeader
ldr r2, [r2]
bl DrawWholeMapViewInternal
ldr r1, =gUnknown_03000E20
@@ -225,7 +225,7 @@ RedrawMapSlicesForCameraUpdate: @ 8089CE4
adds r5, r0, 0
adds r6, r1, 0
adds r7, r2, 0
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r4, [r0]
cmp r6, 0
ble _08089CFC
@@ -476,7 +476,7 @@ CurrentMapDrawMetatileAt: @ 8089EA0
adds r1, r0, 0
cmp r1, 0
blt _08089ECC
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
lsls r1, 16
lsrs r1, 16
asm/field_control_avatar.s
+36 -36
View File
@@ -456,7 +456,7 @@ _0809C214:
bl PlaySE
_0809C244:
adds r0, r4, 0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
_0809C24C:
pop {r4}
@@ -704,7 +704,7 @@ TryGetInvisibleMapObjectScript: @ 809C458
push {r4,r5,lr}
lsls r2, 24
lsrs r5, r2, 24
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
ldrh r1, [r0]
subs r1, 0x7
lsls r1, 16
@@ -1175,7 +1175,7 @@ sub_809C868: @ 809C868
cmp r0, 0x2
bne _0809C894
ldr r0, =gUnknown_08290B0F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C896
.pool
@@ -1194,7 +1194,7 @@ sub_809C89C: @ 809C89C
lsls r0, 24
cmp r0, 0
beq _0809C8D4
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x5
bne _0809C8D4
@@ -1204,7 +1204,7 @@ sub_809C89C: @ 809C89C
cmp r0, 0x1
bne _0809C8D4
ldr r0, =gUnknown_08290B5A
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C8D6
.pool
@@ -1264,7 +1264,7 @@ _0809C930:
thumb_func_start mapheader_trigger_activate_at__run_now
mapheader_trigger_activate_at__run_now: @ 809C938
push {r4,lr}
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
ldrh r1, [r0]
subs r1, 0x7
lsls r1, 16
@@ -1278,7 +1278,7 @@ mapheader_trigger_activate_at__run_now: @ 809C938
bl mapheader_trigger_activate_at
cmp r0, 0
beq _0809C964
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C966
.pool
@@ -1312,7 +1312,7 @@ _0809C988:
beq _0809C9A4
ldr r0, =gUnknown_08252BE8
_0809C996:
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C9EA
.pool
@@ -1366,7 +1366,7 @@ per_step_scripts: @ 809C9F4
b _0809CB24
_0809CA04:
bl sub_80B215C
bl happiness_algorithm_step
bl AdjustFriendship_step
bl sub_81D4998
ldr r0, =gUnknown_02037590
ldrb r1, [r0]
@@ -1386,7 +1386,7 @@ _0809CA04:
cmp r0, 0x1
bne _0809CA48
ldr r0, =gUnknown_082736BC
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CA48:
@@ -1397,7 +1397,7 @@ _0809CA48:
movs r0, 0xD
bl IncrementGameStat
ldr r0, =gUnknown_08291FC0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CA64:
@@ -1407,7 +1407,7 @@ _0809CA64:
cmp r0, 0x1
bne _0809CA7C
ldr r0, =gUnknown_08273D1F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CA7C:
@@ -1417,7 +1417,7 @@ _0809CA7C:
cmp r0, 0x1
bne _0809CA94
ldr r0, =gUnknown_08238EAF
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CA94:
@@ -1425,7 +1425,7 @@ _0809CA94:
cmp r0, 0x1
bne _0809CAA8
ldr r0, =gUnknown_081DF7BA
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CAA8:
@@ -1433,7 +1433,7 @@ _0809CAA8:
cmp r0, 0x1
bne _0809CABC
ldr r0, =gUnknown_081F49EC
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CABC:
@@ -1441,7 +1441,7 @@ _0809CABC:
cmp r0, 0x1
bne _0809CAD0
ldr r0, =gUnknown_081FA4D6
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CAD0:
@@ -1449,7 +1449,7 @@ _0809CAD0:
cmp r0, 0x1
bne _0809CAE4
ldr r0, =gUnknown_0821307B
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CAE4:
@@ -1457,11 +1457,11 @@ _0809CAE4:
cmp r0, 0x1
bne _0809CAF8
ldr r0, =gUnknown_08224175
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CAF8:
bl safari_step
bl SafariZoneTakeStep
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1471,7 +1471,7 @@ _0809CAF8:
cmp r0, 0x1
bne _0809CB1C
ldr r0, =gUnknown_0823C050
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CB1C:
@@ -1500,8 +1500,8 @@ sub_809CB30: @ 809CB30
.pool
thumb_func_end sub_809CB30
thumb_func_start happiness_algorithm_step
happiness_algorithm_step: @ 809CB44
thumb_func_start AdjustFriendship_step
AdjustFriendship_step: @ 809CB44
push {r4,r5,lr}
ldr r0, =0x0000402a
bl GetVarPointer
@@ -1519,7 +1519,7 @@ happiness_algorithm_step: @ 809CB44
_0809CB62:
adds r0, r5, 0
movs r1, 0x5
bl happiness_algorithm
bl AdjustFriendship
adds r5, 0x64
subs r4, 0x1
cmp r4, 0
@@ -1529,7 +1529,7 @@ _0809CB72:
pop {r0}
bx r0
.pool
thumb_func_end happiness_algorithm_step
thumb_func_end AdjustFriendship_step
thumb_func_start overworld_poison_timer_set
overworld_poison_timer_set: @ 809CB80
@@ -1545,7 +1545,7 @@ overworld_poison_timer_set: @ 809CB80
thumb_func_start overworld_poison_step
overworld_poison_step: @ 809CB94
push {lr}
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x9
beq _0809CBD4
@@ -1639,7 +1639,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38
lsrs r4, 16
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
mov r8, r0
adds r1, r7, 0
bl map_warp_check_packed
@@ -1683,7 +1683,7 @@ sub_809CC9C: @ 809CC9C
adds r6, r0, 0
lsls r1, 16
lsrs r5, r1, 16
ldr r7, =gUnknown_02037318
ldr r7, =gMapHeader
adds r0, r7, 0
adds r1, r6, 0
bl map_warp_check_packed
@@ -1765,7 +1765,7 @@ _0809CD50:
cmp r0, 0x1
bne _0809CD6C
ldr r0, =gUnknown_082A8350
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809CD8C
.pool
@@ -1958,7 +1958,7 @@ sub_809CEB0: @ 809CEB0
adds r4, r0, 0
cmp r4, 0
bne _0809CEE8
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0, 0x4]
ldr r5, [r0, 0x8]
b _0809CF0E
@@ -1976,7 +1976,7 @@ _0809CEF0:
adds r5, r0, 0
b _0809CF0E
_0809CF00:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0, 0x4]
lsls r2, r4, 24
asrs r1, r2, 21
@@ -2053,7 +2053,7 @@ map_warp_consider_2_to_inside: @ 809CF78
lsrs r0, 24
cmp r0, 0x1
bne _0809CFB0
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r1, [r0, 0x4]
adds r0, r5, 0
bl sub_80E9668
@@ -2067,7 +2067,7 @@ _0809CFB0:
lsrs r0, 24
cmp r0, 0x1
bne _0809CFFC
ldr r6, =gUnknown_02037318
ldr r6, =gMapHeader
adds r0, r6, 0
adds r1, r5, 0
bl map_warp_check_packed
@@ -2243,7 +2243,7 @@ _0809D0E4:
thumb_func_start sub_809D0F4
sub_809D0F4: @ 809D0F4
push {r4,lr}
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
ldrh r1, [r0]
subs r1, 0x7
lsls r1, 16
@@ -2316,7 +2316,7 @@ dive_warp: @ 809D16C
adds r4, r0, 0
lsls r1, 16
lsrs r5, r1, 16
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x5
bne _0809D1A4
@@ -2389,7 +2389,7 @@ sub_809D1E8: @ 809D1E8
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x5
bne _0809D244
@@ -2491,7 +2491,7 @@ sub_809D2BC: @ 809D2BC
movs r2, 0x2
ldrsh r1, [r4, r2]
bl MapGridGetMetatileBehaviorAt
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
adds r0, r4, 0
mov r1, sp
bl map_warp_check_packed
asm/field_effect.s
+2 -2
View File
@@ -897,7 +897,7 @@ sub_80B6128: @ 80B6128
thumb_func_start sub_80B61A0
sub_80B61A0: @ 80B61A0
push {r4,lr}
bl calc_player_party_count
bl CalculatePlayerPartyCount
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1071,7 +1071,7 @@ _080B62E6:
thumb_func_start sub_80B62F4
sub_80B62F4: @ 80B62F4
push {r4,lr}
bl calc_player_party_count
bl CalculatePlayerPartyCount
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
asm/field_map_obj.s
+3 -3
View File
@@ -500,7 +500,7 @@ sub_808D77C: @ 808D77C
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
ldr r0, [r4, 0x4]
cmp r0, 0
beq _0808D7FE
@@ -1553,7 +1553,7 @@ SpawnFieldObjectsInView: @ 808DF80
lsls r1, 16
lsrs r1, 16
str r1, [sp, 0x8]
ldr r5, =gUnknown_02037318
ldr r5, =gMapHeader
ldr r0, [r5, 0x4]
cmp r0, 0
beq _0808E078
@@ -3965,7 +3965,7 @@ GetFieldObjectTemplateByLocalIdAndMap: @ 808F128
movs r0, 0xC7
lsls r0, 4
adds r1, r0
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0, 0x4]
b _0808F16C
.pool
asm/field_player_avatar.s
+2 -2
View File
@@ -4294,7 +4294,7 @@ _0808CA94:
movs r0, 0
movs r1, 0x1
add r2, sp, 0xC
bl Print
bl PrintTextOnWindow
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@@ -4405,7 +4405,7 @@ fish6: @ 808CB6C
movs r0, 0
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
asm/field_poison.s
+1 -1
View File
@@ -73,7 +73,7 @@ sub_80F95C0: @ 80F95C0
str r0, [sp]
adds r0, r4, 0
movs r1, 0x7
bl happiness_algorithm
bl AdjustFriendship
adds r0, r4, 0
movs r1, 0x37
mov r2, sp
asm/field_region_map.s
+2 -2
View File
@@ -172,7 +172,7 @@ _08170300:
str r4, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl Print
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0
@@ -303,7 +303,7 @@ sub_8170428: @ 8170428
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
b _08170470
asm/field_tasks.s
+1 -1
View File
@@ -1201,7 +1201,7 @@ sub_809E1C8: @ 809E1C8
mov r7, r9
mov r6, r8
push {r6,r7}
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r1, [r0]
mov r9, r1
asm/fieldmap.s
+15 -15
View File
@@ -19,7 +19,7 @@ mapconnection_get_mapheader: @ 8087D44
thumb_func_start not_trainer_hill_battle_pyramid
not_trainer_hill_battle_pyramid: @ 8087D54
push {r4,lr}
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
adds r0, r4, 0
bl mapheader_copy_mapdata_with_padding
ldr r0, [r4, 0x4]
@@ -34,7 +34,7 @@ not_trainer_hill_battle_pyramid: @ 8087D54
thumb_func_start sub_8087D74
sub_8087D74: @ 8087D74
push {r4,lr}
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
adds r0, r4, 0
bl mapheader_copy_mapdata_with_padding
movs r0, 0
@@ -554,7 +554,7 @@ MapGridGetZCoordAt: @ 8088144
b _08088196
.pool
_08088174:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r3, [r0]
adds r1, r2, 0x1
movs r2, 0x1
@@ -613,7 +613,7 @@ MapGridIsImpassableAt: @ 80881B0
b _08088202
.pool
_080881E0:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r3, [r0]
adds r1, r2, 0x1
movs r2, 0x1
@@ -675,7 +675,7 @@ MapGridGetMetatileIdAt: @ 8088224
b _08088278
.pool
_08088254:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r3, [r0]
adds r1, r5, 0x1
movs r2, 0x1
@@ -702,7 +702,7 @@ _08088278:
b _080882B0
.pool
_0808828C:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r3, [r0]
adds r1, r5, 0x1
movs r2, 0x1
@@ -839,7 +839,7 @@ GetBehaviorByMetatileId: @ 8088370
ldr r0, =0x000001ff
cmp r2, r0
bhi _08088394
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r0, [r0, 0x10]
ldr r1, [r0, 0x10]
@@ -854,7 +854,7 @@ _08088394:
b _080883B6
.pool
_080883A4:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r0, [r0, 0x14]
ldr r1, [r0, 0x10]
@@ -1029,7 +1029,7 @@ _080884EC:
mov r9, r1
cmp r6, r0
bne _08088508
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r0, [r0, 0x4]
subs r0, 0x1
@@ -1104,7 +1104,7 @@ _08088574:
asrs r1, r2, 16
bl sub_80D423C
_08088584:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r0, [r0, 0x4]
subs r0, 0x1
@@ -1282,7 +1282,7 @@ GetMapBorderIdAt: @ 808869C
b _08088700
.pool
_080886D8:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r3, [r0]
adds r1, r4, 0x1
movs r2, 0x1
@@ -1607,7 +1607,7 @@ sub_8088950: @ 8088950
mov r8, r2
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0, 0xC]
ldr r7, [r0]
ldr r4, [r0, 0x4]
@@ -1664,7 +1664,7 @@ sub_80889A8: @ 80889A8
blt _08088A00
cmp r4, 0x2
bgt _080889E0
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r1, [r0]
ldr r0, [r2]
@@ -1676,7 +1676,7 @@ sub_80889A8: @ 80889A8
_080889E0:
cmp r6, 0x4
bgt _08088A00
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r1, [r0, 0x4]
ldr r0, [r2]
@@ -1792,7 +1792,7 @@ sub_8088A8C: @ 8088A8C
mov r8, r0
lsls r1, 16
lsrs r1, 16
ldr r2, =gUnknown_02037318
ldr r2, =gMapHeader
ldr r0, [r2, 0xC]
cmp r0, 0
bne _08088AB4
asm/fldeff_80F9BCC.s
+4 -4
View File
@@ -468,7 +468,7 @@ _080F9F54:
sub_80F9F5C: @ 80F9F5C
push {lr}
ldr r0, =gUnknown_0203AB40
ldr r1, =gUnknown_02037318
ldr r1, =gMapHeader
ldr r1, [r1, 0x4]
bl sub_80E9608
bl sub_80E8B6C
@@ -648,7 +648,7 @@ sub_80FA0DC: @ 80FA0DC
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275A86
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@@ -783,7 +783,7 @@ sub_80FA1E8: @ 80FA1E8
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275ADF
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@@ -956,7 +956,7 @@ sub_80FA34C: @ 80FA34C
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275B38
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
asm/fldeff_strength.s
+1 -1
View File
@@ -45,7 +45,7 @@ sub_8145E0C: @ 8145E0C
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_082908FD
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
asm/fldeff_sweetscent.s
+220
View File
@@ -0,0 +1,220 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start SetUpFieldMove_SweetScent
SetUpFieldMove_SweetScent: @ 8159EF0
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm2_sweet_scent
str r0, [r1]
movs r0, 0x1
bx lr
.pool
thumb_func_end SetUpFieldMove_SweetScent
thumb_func_start hm2_sweet_scent
hm2_sweet_scent: @ 8159F10
push {lr}
movs r0, 0x33
bl FieldEffectStart
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.pool
thumb_func_end hm2_sweet_scent
thumb_func_start FldEff_SweetScent
FldEff_SweetScent: @ 8159F2C
push {lr}
bl sub_80AC3D0
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, =sub_8159F5C
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end FldEff_SweetScent
thumb_func_start sub_8159F5C
sub_8159F5C: @ 8159F5C
push {r4,r5,lr}
sub sp, 0x4
movs r0, 0xEC
bl PlaySE
ldr r5, =gPlttBufferUnfaded
ldr r1, =gPaletteDecompressionBuffer
movs r4, 0x80
lsls r4, 1
adds r0, r5, 0
adds r2, r4, 0
bl CpuFastSet
ldr r0, =gPlttBufferFaded
adds r1, r5, 0
adds r2, r4, 0
bl CpuFastSet
bl GetPlayerAvatarObjectId
ldr r2, =gSprites
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r1, [r1, 0x5]
lsrs r1, 4
adds r1, 0x10
movs r0, 0x1
lsls r0, r1
mvns r0, r0
movs r1, 0x1F
str r1, [sp]
movs r1, 0x4
movs r2, 0
movs r3, 0x8
bl BeginNormalPaletteFade
ldr r0, =sub_8159FEC
movs r1, 0
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
movs r0, 0
strh r0, [r1, 0x8]
movs r0, 0x33
bl FieldEffectActiveListRemove
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8159F5C
thumb_func_start sub_8159FEC
sub_8159FEC: @ 8159FEC
push {r4-r6,lr}
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
bne _0815A088
bl sub_81BE72C
movs r0, 0x40
movs r1, 0x8
movs r2, 0x1F
bl BlendPalettes
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
adds r4, r1, r0
ldrh r1, [r4, 0x8]
movs r2, 0x8
ldrsh r0, [r4, r2]
cmp r0, 0x40
bne _0815A084
strh r6, [r4, 0x8]
bl SweetScentWildEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0815A044
adds r0, r5, 0
bl DestroyTask
b _0815A088
.pool
_0815A044:
ldr r0, =sub_815A090
str r0, [r4]
bl GetPlayerAvatarObjectId
ldr r2, =gSprites
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r1, [r1, 0x5]
lsrs r1, 4
adds r1, 0x10
movs r0, 0x1
lsls r0, r1
mvns r0, r0
movs r1, 0x1F
str r1, [sp]
movs r1, 0x4
movs r2, 0x8
movs r3, 0
bl BeginNormalPaletteFade
bl sub_81BE6B8
b _0815A088
.pool
_0815A084:
adds r0, r1, 0x1
strh r0, [r4, 0x8]
_0815A088:
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_8159FEC
thumb_func_start sub_815A090
sub_815A090: @ 815A090
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 _0815A0BE
ldr r0, =gPaletteDecompressionBuffer
ldr r1, =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 1
bl CpuFastSet
bl sub_80AC3E4
ldr r0, =gUnknown_08290CAE
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
_0815A0BE:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_815A090
.align 2, 0 @ Don't pad with nop.
asm/fldeff_teleport.s
+4 -4
View File
@@ -8,7 +8,7 @@
thumb_func_start SetUpFieldMove_Teleport
SetUpFieldMove_Teleport: @ 817C8BC
push {lr}
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
bl is_light_level_1_2_3_or_6
lsls r0, 24
@@ -48,8 +48,8 @@ hm_teleport_run_dp02scr: @ 817C8FC
.pool
thumb_func_end hm_teleport_run_dp02scr
thumb_func_start sub_817C91C
sub_817C91C: @ 817C91C
thumb_func_start FldEff_UseTeleport
FldEff_UseTeleport: @ 817C91C
push {lr}
bl oei_task_add
lsls r0, 24
@@ -69,7 +69,7 @@ sub_817C91C: @ 817C91C
pop {r1}
bx r1
.pool
thumb_func_end sub_817C91C
thumb_func_end FldEff_UseTeleport
thumb_func_start sub_817C94C
sub_817C94C: @ 817C94C
asm/hall_of_fame.s
+2 -2
View File
@@ -2441,7 +2441,7 @@ sub_8174A88: @ 8174A88
ldrh r0, [r7, 0x8]
lsls r0, 23
lsrs r0, 23
bl sub_806E3C0
bl SpeciesToPokedexNum
lsls r0, 16
lsrs r4, r0, 16
ldr r0, =0x0000ffff
@@ -2572,7 +2572,7 @@ _08174B8C:
lsls r0, r1, 23
lsrs r0, 23
ldr r1, [r7, 0x4]
bl pokemon_species_get_gender_info
bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, 0
asm/intro.s
+1 -1
View File
@@ -307,7 +307,7 @@ c2_copyright_1: @ 816CEAC
bl sub_815355C
lsls r0, 16
lsrs r0, 16
bl InitSaveBlockPointersWithRandomOffset
bl SetSaveBlocksPointers
bl sub_808447C
bl ResetSaveCounters
movs r0, 0
asm/item_use.s
+9 -9
View File
@@ -553,7 +553,7 @@ ItemUseOnFieldCB_Itemfinder: @ 80FD4B8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0, 0x4]
adds r1, r4, 0
bl ItemfinderCheckForHiddenItems
@@ -906,7 +906,7 @@ _080FD76C:
subs r0, r5, r0
lsls r0, 16
lsrs r1, r0, 16
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r0, [r0, 0x4]
b _080FD79E
@@ -918,7 +918,7 @@ _080FD784:
adds r0, r5
b _080FD798
_080FD78E:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r0, [r0]
adds r0, 0x7
@@ -964,7 +964,7 @@ sub_80FD7C8: @ 80FD7C8
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r1, [r0]
ldr r0, [r1]
adds r0, 0x7
@@ -1667,7 +1667,7 @@ sub_80FDD74: @ 80FDD74
bl RemoveBagItem
bl script_env_2_enable
ldr r0, =gUnknown_08274482
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
pop {r4}
@@ -1729,7 +1729,7 @@ sub_80FDE08: @ 80FDE08
lsrs r4, 24
bl script_env_2_enable
ldr r0, =gUnknown_082744C0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
pop {r4}
@@ -1788,7 +1788,7 @@ sub_80FDE7C: @ 80FDE7C
lsrs r4, 24
bl script_env_2_enable
ldr r0, =gUnknown_08242CFC
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
pop {r4}
@@ -2288,7 +2288,7 @@ re_escape_rope: @ 80FE2D8
thumb_func_start sub_80FE314
sub_80FE314: @ 80FE314
push {lr}
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r1, [r0, 0x1A]
movs r0, 0x2
ands r0, r1
@@ -2357,7 +2357,7 @@ ItemUseInBattle_PokeBall: @ 80FE394
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
bl sub_806B8B0
bl PlayerPartyAndPokemonStorageFull
lsls r0, 24
cmp r0, 0
bne _080FE3D0
asm/lilycove_lady.s
+1931
View File
File diff suppressed because it is too large Load Diff
asm/link.s
+131 -131
View File
@@ -1002,7 +1002,7 @@ _08009C70:
lsls r0, r6, 3
subs r0, r6
lsls r0, 2
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
adds r2, r0, r1
adds r1, r2, 0
mov r0, r8
@@ -1406,7 +1406,7 @@ sub_8009FF8: @ 8009FF8
cmp r2, r4
bge _0800A030
movs r7, 0xFF
ldr r3, =gUnknown_020229E8
ldr r3, =gLinkPlayers
_0800A010:
ldrh r0, [r3]
adds r1, r7, 0
@@ -1488,7 +1488,7 @@ sub_800A07C: @ 800A07C
adds r2, r0, 0
cmp r2, 0
blt _0800A0A4
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
@@ -1555,7 +1555,7 @@ _0800A0FC:
bl sub_80097E8
_0800A10E:
movs r6, 0
ldr r4, =gUnknown_020229E8
ldr r4, =gLinkPlayers
movs r5, 0
b _0800A134
.pool
@@ -1582,7 +1582,7 @@ _0800A134:
lsrs r0, 24
cmp r7, r0
bne _0800A1AC
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
ldr r1, [r0, 0x14]
ldr r0, =0x00001133
cmp r1, r0
@@ -1625,8 +1625,8 @@ _0800A1AC:
ldr r6, =gUnknown_03000D5C
movs r0, 0x3
str r0, [r6]
ldr r4, =gUnknown_020229E8
bl link_get_multiplayer_id
ldr r4, =gLinkPlayers
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -1635,7 +1635,7 @@ _0800A1AC:
adds r4, 0x14
adds r1, r4
ldr r5, [r1]
bl link_get_multiplayer_id
bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -1692,7 +1692,7 @@ sub_800A23C: @ 800A23C
push {r4-r6,lr}
movs r6, 0
movs r4, 0
ldr r5, =gUnknown_020229E8
ldr r5, =gLinkPlayers
b _0800A26C
.pool
_0800A24C:
@@ -1746,7 +1746,7 @@ _0800A298:
sub_800A2A4: @ 800A2A4
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -1760,7 +1760,7 @@ sub_800A2A4: @ 800A2A4
thumb_func_start sub_800A2BC
sub_800A2BC: @ 800A2BC
push {r4,r5,lr}
ldr r5, =gUnknown_020229E8
ldr r5, =gLinkPlayers
movs r4, 0x4
_0800A2C2:
adds r0, r5, 0
@@ -1802,7 +1802,7 @@ sub_800A2F4: @ 800A2F4
b _0800A34A
.pool
_0800A30C:
bl link_get_multiplayer_id
bl GetMultiplayerId
strb r0, [r4, 0x9]
movs r0, 0x1
strb r0, [r4, 0x8]
@@ -1916,7 +1916,7 @@ sub_800A3EC: @ 800A3EC
thumb_func_start sub_800A3F8
sub_800A3F8: @ 800A3F8
push {lr}
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r0, =0x00004444
bl sub_8009D90
ldr r1, =gUnknown_020223C0
@@ -1969,8 +1969,8 @@ sub_800A458: @ 800A458
.pool
thumb_func_end sub_800A458
thumb_func_start link_get_multiplayer_id
link_get_multiplayer_id: @ 800A468
thumb_func_start GetMultiplayerId
GetMultiplayerId: @ 800A468
push {lr}
ldr r0, =gLinkVSyncDisabled
ldrb r0, [r0]
@@ -1989,12 +1989,12 @@ _0800A484:
_0800A48C:
pop {r1}
bx r1
thumb_func_end link_get_multiplayer_id
thumb_func_end GetMultiplayerId
thumb_func_start bitmask_all_link_players_but_self
bitmask_all_link_players_but_self: @ 800A490
push {lr}
bl link_get_multiplayer_id
bl GetMultiplayerId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2554,7 +2554,7 @@ task00_link_test: @ 800A850
movs r2, 0xA
movs r3, 0x2
bl sub_800A6E8
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
movs r1, 0xF
@@ -2713,10 +2713,10 @@ sub_800AA04: @ 800AA04
push {r4-r7,lr}
ldr r1, =gUnknown_03003100
strb r0, [r1]
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, =gUnknown_03003120
strb r0, [r1]
ldr r4, =gUnknown_020229E8
ldr r4, =gLinkPlayers
ldr r3, =gUnknown_02022A74
movs r2, 0x4
_0800AA18:
@@ -2767,7 +2767,7 @@ sub_800AA60: @ 800AA60
mov r9, r0
cmp r3, r1
bge _0800AAB4
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
mov r12, r0
ldr r0, =gUnknown_02022A74
ldr r2, =0x00002288
@@ -2859,7 +2859,7 @@ sub_800AB18: @ 800AB18
cmp r4, r0
bcs _0800AB78
ldr r6, =gUnknown_02022A74
ldr r5, =gUnknown_020229E8
ldr r5, =gLinkPlayers
movs r0, 0x8
adds r0, r6
mov r8, r0
@@ -3150,7 +3150,7 @@ sub_800AD88: @ 800AD88
cmp r1, r3
bge _0800ADB6
ldr r5, =gUnknown_030030F0
ldr r4, =gUnknown_020229E8
ldr r4, =gLinkPlayers
_0800AD9E:
ldrh r0, [r4, 0x1A]
cmp r0, 0x1
@@ -3818,7 +3818,7 @@ sub_800B3A4: @ 800B3A4
lsls r2, r0, 3
subs r2, r0
lsls r2, 2
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
adds r2, r0
adds r1, r2, 0
adds r0, r4, 0
@@ -9927,7 +9927,7 @@ _0800E3D0:
subs r0, r4
lsls r0, 2
str r0, [sp, 0x1C]
ldr r7, =gUnknown_020229F0
ldr r7, =gLinkPlayers + 8
mov r10, r7
ldr r6, =0x00003b98
movs r4, 0
@@ -9979,12 +9979,12 @@ _0800E434:
b _0800E4AC
.pool
_0800E45C:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
cmp r4, r0
beq _0800E4A6
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
adds r0, r5, r2
ldrh r0, [r0, 0x1A]
cmp r0, 0x1
@@ -10258,7 +10258,7 @@ _0800E64A:
bl CpuSet
mov r0, r9
strh r5, [r0]
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
ldr r2, =0x01000046
bl CpuSet
add sp, 0x8
@@ -12301,7 +12301,7 @@ sub_800F820: @ 800F820
movs r0, 0x88
lsls r0, 7
bl sub_800FD14
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _0800F83C
@@ -13124,7 +13124,7 @@ _0800FEC8:
negs r4, r0
orrs r4, r0
lsrs r4, 31
bl link_get_multiplayer_id
bl GetMultiplayerId
adds r1, r5, 0
adds r1, 0x7D
strb r0, [r1]
@@ -13206,7 +13206,7 @@ rfufunc_80F9F44: @ 800FF4C
b _0800FF9C
.pool
_0800FF84:
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, =gUnknown_03003090
lsls r0, 24
lsrs r0, 20
@@ -13296,7 +13296,7 @@ rfufunc_80FA020: @ 8010028
ldr r5, =gUnknown_03005000
ldr r0, [r5, 0x70]
mov r8, r0
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r5, 0xC]
@@ -13606,7 +13606,7 @@ _080102AC:
thumb_func_start sub_80102B8
sub_80102B8: @ 80102B8
push {r4,r5,lr}
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
beq _080102E6
@@ -13713,7 +13713,7 @@ _0801037A:
thumb_func_start sub_8010390
sub_8010390: @ 8010390
push {r4,lr}
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
beq _080103CC
@@ -14563,7 +14563,7 @@ _08010A28:
cmp r4, 0x3
ble _08010A28
adds r6, r2, 0
ldr r5, =gUnknown_020229E8
ldr r5, =gLinkPlayers
movs r4, 0x4
_08010A3C:
adds r0, r5, 0
@@ -14717,7 +14717,7 @@ _08010B8C:
lsls r2, r4, 8
ldr r0, =gUnknown_020223C4
adds r2, r0
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
@@ -14759,7 +14759,7 @@ _08010BE2:
adds r2, 0x1
cmp r2, 0x3
ble _08010BE2
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
adds r0, r5, 0
adds r0, 0x14
movs r2, 0x8C
@@ -14777,7 +14777,7 @@ _08010C0A:
ldrb r0, [r1, 0xD]
strb r0, [r5, 0xF]
movs r2, 0
ldr r3, =gUnknown_020229E8
ldr r3, =gLinkPlayers
mov r12, r3
adds r4, r5, 0
adds r4, 0x10
@@ -15254,7 +15254,7 @@ sub_8010FCC: @ 8010FCC
sub_801100C: @ 801100C
push {r4,lr}
movs r4, 0x80
ldr r3, =gUnknown_020229E8
ldr r3, =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -15367,7 +15367,7 @@ sub_80110B8: @ 80110B8
mov r8, r1
movs r4, 0
movs r6, 0x1
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
mov r12, r2
ldr r0, =0x00000cde
adds r0, r3
@@ -20767,7 +20767,7 @@ sub_8013F90: @ 8013F90
lsrs r6, r0, 24
ldr r0, =gUnknown_02022C40
mov r8, r0
bl link_get_multiplayer_id
bl GetMultiplayerId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -20815,7 +20815,7 @@ _08013FFC:
lsrs r0, 24
cmp r0, 0x3
bne _080140BC
bl link_get_multiplayer_id
bl GetMultiplayerId
adds r1, r0, 0
ldr r0, =gEnemyParty
movs r2, 0x1
@@ -20860,7 +20860,7 @@ _08014070:
cmp r0, 0x3
bne _080140BC
ldr r4, =gUnknown_020321C0
bl link_get_multiplayer_id
bl GetMultiplayerId
adds r1, r0, 0
movs r0, 0x1
eors r1, r0
@@ -20913,7 +20913,7 @@ sub_80140E0: @ 80140E0
b _0801419E
.pool
_08014104:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _08014114
@@ -20933,7 +20933,7 @@ _0801411C:
cmp r4, r0
bne _0801419E
movs r4, 0
ldr r5, =gUnknown_020229E8
ldr r5, =gLinkPlayers
b _08014152
.pool
_08014138:
@@ -20960,7 +20960,7 @@ _08014152:
lsrs r0, 24
cmp r0, 0x2
bne _08014190
bl link_get_multiplayer_id
bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -21014,7 +21014,7 @@ _080141D4:
lsls r0, 24
cmp r0, 0
bne _080141F2
bl link_get_multiplayer_id
bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -21041,12 +21041,12 @@ sub_8014210: @ 8014210
bl sp000_heal_pokemon
bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks
ldr r5, =gUnknown_020229E8
ldr r5, =gLinkPlayers
ldr r0, =0x00002211
str r0, [r5, 0x14]
bl link_get_multiplayer_id
bl GetMultiplayerId
adds r4, r0, 0
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r4, 24
lsrs r4, 24
lsls r1, r4, 3
@@ -21056,9 +21056,9 @@ sub_8014210: @ 8014210
lsls r0, 24
lsrs r0, 24
strh r0, [r1, 0x18]
bl link_get_multiplayer_id
bl GetMultiplayerId
adds r4, r0, 0
bl link_get_multiplayer_id
bl GetMultiplayerId
movs r2, 0x1
eors r4, r2
lsls r4, 24
@@ -21162,7 +21162,7 @@ sub_8014304: @ 8014304
bl sub_8009FCC
ldr r1, =gUnknown_03005DB8
strb r0, [r1]
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, =gUnknown_03005DB4
strb r0, [r1]
bl sub_809D2BC
@@ -21487,7 +21487,7 @@ _080146C4:
b _08014764
.pool
_080146D8:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _080146E8
@@ -21632,7 +21632,7 @@ _08014818:
.4byte _080148B8
.4byte _08014854
_08014854:
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
ldr r0, =0x00002211
str r0, [r1, 0x14]
movs r2, 0
@@ -21645,7 +21645,7 @@ _08014854:
ldrb r0, [r6]
movs r5, 0x64
muls r0, r5
ldr r4, =gUnknown_02024488
ldr r4, =gBattleScripting + 0x14
adds r0, r4
movs r1, 0xB
bl GetMonData
@@ -23815,7 +23815,7 @@ _08015CB2:
bl sub_800FE50
ldr r0, =gStringVar4
ldr r2, =gUnknown_082EEB80
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
ldrb r1, [r1, 0x13]
lsls r1, 2
adds r1, r2
@@ -23963,7 +23963,7 @@ _08015E32:
ldrb r2, [r4]
movs r1, 0x40
orrs r1, r2
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
ldrb r2, [r2, 0x13]
bl sub_8017D9C
strb r5, [r4]
@@ -24020,12 +24020,12 @@ _08015EC4:
bne _08015ED2
bl _08016878
_08015ED2:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _08015F2C
ldr r5, =gStringVar1
bl link_get_multiplayer_id
bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -24033,7 +24033,7 @@ _08015ED2:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r4, =gUnknown_020229F0
ldr r4, =gLinkPlayers + 8
adds r1, r4
adds r0, r5, 0
bl StringCopy
@@ -25123,7 +25123,7 @@ sub_80168DC: @ 80168DC
cmp r0, 0
beq _0801692C
ldr r0, =gStringVar4
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
adds r1, 0x2F
ldrb r1, [r1]
adds r2, r5, 0
@@ -27828,10 +27828,10 @@ sub_8017E00: @ 8017E00
lsls r1, 24
lsrs r4, r1, 24
adds r6, r4, 0
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
movs r0, 0x1
adds r1, r3, 0
eors r1, r0
@@ -28369,7 +28369,7 @@ sub_8018220: @ 8018220
lsls r2, 24
lsrs r2, 24
str r2, [sp]
bl link_get_multiplayer_id
bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -30557,7 +30557,7 @@ _080194B4:
movs r0, 0xB
strb r0, [r5, 0x8]
ldr r0, =gStringVar1
ldr r1, =gUnknown_020229F0
ldr r1, =gLinkPlayers + 8
bl StringCopy
b _08019922
.pool
@@ -30670,7 +30670,7 @@ _0801959C:
cmp r0, 0x1
bne _080195AA
ldr r0, =gStringVar1
ldr r1, =gUnknown_020229F0
ldr r1, =gLinkPlayers + 8
bl StringCopy
_080195AA:
movs r0, 0xF
@@ -33391,7 +33391,7 @@ _0801AAE4:
adds r5, r4, r0
_0801AB0A:
adds r0, r4, 0
bl zero_pokemon_struct
bl ZeroMonData
adds r4, 0x64
cmp r4, r5
ble _0801AB0A
@@ -33411,8 +33411,8 @@ _0801AB1E:
ble _0801AB1E
movs r0, 0x32
bl IncrementGameStat
bl calc_player_party_count
ldr r0, =gUnknown_02038BCA
bl CalculatePlayerPartyCount
ldr r0, =gTrainerBattleOpponent_A
movs r2, 0xC0
lsls r2, 4
adds r1, r2, 0
@@ -33783,7 +33783,7 @@ _0801AEA6:
_0801AEE0:
bl sub_800AC34
ldr r4, =gUnknown_020223C4
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 16
adds r0, r4
@@ -39699,7 +39699,7 @@ sub_801DDD0: @ 801DDD0
strb r0, [r4, 0x1A]
bl sub_8009FCC
strb r0, [r4, 0xD]
bl link_get_multiplayer_id
bl GetMultiplayerId
strb r0, [r4, 0x13]
strb r5, [r4, 0x17]
strb r5, [r4, 0x18]
@@ -43761,7 +43761,7 @@ sub_801FDDC: @ 801FDDC
str r4, [sp, 0x4]
str r6, [sp, 0x8]
movs r3, 0x8
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x18]
ldr r2, =gUnknown_085EAE66
@@ -43771,7 +43771,7 @@ sub_801FDDC: @ 801FDDC
str r6, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x18]
movs r1, 0x1
@@ -45508,7 +45508,7 @@ _08020CAC:
lsls r0, 24
lsrs r0, 24
mov r8, r0
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r7, r0, 24
mov r0, r8
@@ -45893,7 +45893,7 @@ _08020FCC:
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
ldr r2, =gUnknown_020229F0
ldr r2, =gLinkPlayers + 8
adds r1, r2
bl StringCopy
adds r0, r5, 0x1
@@ -52672,8 +52672,8 @@ SetBerryPowder: @ 802467C
.pool
thumb_func_end SetBerryPowder
thumb_func_start sub_8024690
sub_8024690: @ 8024690
thumb_func_start ApplyNewEncyprtionKeyToBerryPowder
ApplyNewEncyprtionKeyToBerryPowder: @ 8024690
push {lr}
adds r1, r0, 0
ldr r0, =gSaveBlock2Ptr
@@ -52681,11 +52681,11 @@ sub_8024690: @ 8024690
movs r2, 0xFA
lsls r2, 1
adds r0, r2
bl apply_u32_xor_crypto
bl ApplyNewEncyprtionKeyToWord
pop {r0}
bx r0
.pool
thumb_func_end sub_8024690
thumb_func_end ApplyNewEncyprtionKeyToBerryPowder
thumb_func_start sub_80246AC
sub_80246AC: @ 80246AC
@@ -52875,7 +52875,7 @@ sub_80247D4: @ 80247D4
movs r1, 0x1
mov r2, r9
mov r3, r8
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -52917,7 +52917,7 @@ sub_802482C: @ 802482C
adds r0, r6, 0
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
str r4, [sp]
adds r0, r6, 0
mov r1, r8
@@ -52968,7 +52968,7 @@ sub_80248B0: @ 80248B0
movs r1, 0
movs r2, 0x1
movs r3, 0x1
bl rbox_template_set
bl SetWindowTemplateFields
ldr r4, =gUnknown_02022C94
add r0, sp, 0x10
bl AddWindow
@@ -53038,7 +53038,7 @@ sub_802493C: @ 802493C
bl sub_8024A30
ldr r0, [r4]
str r5, [r0]
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, [r4]
adds r1, 0x28
strb r0, [r1]
@@ -53262,7 +53262,7 @@ _08024B2C:
lsrs r5, r0, 24
cmp r5, 0xA
bls _08024B2C
bl link_get_multiplayer_id
bl GetMultiplayerId
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -53274,7 +53274,7 @@ _08024B6A:
bl sub_8009FCC
mov r1, r8
strb r0, [r1]
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r3, [sp, 0x18]
strb r0, [r3]
movs r5, 0x1
@@ -56002,7 +56002,7 @@ sub_80261F8: @ 80261F8
push {r4,lr}
adds r4, r0, 0
adds r0, r1, 0
bl sub_806EBA4
bl IsMonShiny
strb r0, [r4]
pop {r4}
pop {r0}
@@ -58660,7 +58660,7 @@ _0802768C:
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
ldr r1, =gUnknown_020229F0
ldr r1, =gLinkPlayers + 8
_08027694:
adds r0, r1
pop {r1}
@@ -59432,7 +59432,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0
movs r1, 0x1
adds r2, r4, 0
bl Print
bl PrintTextOnWindow
movs r6, 0
ldr r2, =gStringVar1
mov r8, r2
@@ -59474,7 +59474,7 @@ _08027C76:
adds r0, r7, 0
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r2, [sp, 0x18]
lsls r3, r2, 3
subs r3, r5
@@ -59491,7 +59491,7 @@ _08027C76:
adds r0, r7, 0
movs r1, 0x1
mov r2, r8
bl Print
bl PrintTextOnWindow
adds r6, 0x1
cmp r6, 0x2
ble _08027C76
@@ -59535,7 +59535,7 @@ _08027D48:
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
ldr r1, =gUnknown_020229F0
ldr r1, =gLinkPlayers + 8
adds r0, r1
lsls r1, r4, 2
adds r1, r5
@@ -60509,7 +60509,7 @@ _080284C6:
thumb_func_start sub_80284CC
sub_80284CC: @ 80284CC
push {lr}
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, =gUnknown_02022C9C
lsls r0, 24
lsrs r0, 22
@@ -60536,7 +60536,7 @@ sub_80284CC: @ 80284CC
thumb_func_start sub_8028504
sub_8028504: @ 8028504
push {lr}
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, =gUnknown_02022C9C
lsls r0, 24
lsrs r0, 22
@@ -60665,7 +60665,7 @@ _080285F0:
strh r0, [r5, 0x2E]
movs r4, 0
_080285FE:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -62582,7 +62582,7 @@ _080294DC:
ldrb r0, [r0]
movs r1, 0x11
bl FillWindowPixelBuffer
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -62870,8 +62870,8 @@ _08029774:
str r3, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl link_get_multiplayer_id
bl PrintTextOnWindow
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -62926,7 +62926,7 @@ _080297CC:
str r1, [sp, 0x8]
movs r1, 0x1
add r2, sp, 0xC
bl Print
bl PrintTextOnWindow
ldr r2, =gUnknown_02022CF8
ldr r0, [r2]
add r0, r10
@@ -62941,7 +62941,7 @@ _080297CC:
movs r1, 0x1
ldr r2, =gUnknown_085EDE5D
lsrs r3, 24
bl Print
bl PrintTextOnWindow
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -63080,7 +63080,7 @@ _0802996C:
movs r5, 0
str r5, [sp, 0x8]
mov r2, r8
bl Print
bl PrintTextOnWindow
ldr r0, [r4]
add r0, r9
ldrb r0, [r0]
@@ -63091,7 +63091,7 @@ _0802996C:
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0x44
bl Print
bl PrintTextOnWindow
mov r9, r5
ldr r0, [sp, 0xC]
cmp r9, r0
@@ -63099,7 +63099,7 @@ _0802996C:
b _08029B2A
_080299E2:
movs r4, 0
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
cmp r9, r0
@@ -63219,7 +63219,7 @@ _08029AE0:
str r1, [sp, 0x8]
movs r1, 0x1
ldr r2, =gStringVar4
bl Print
bl PrintTextOnWindow
_08029B10:
adds r0, r7, 0x1
lsls r0, 24
@@ -63347,7 +63347,7 @@ _08029BFC:
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r6, 0
bl Print
bl PrintTextOnWindow
b _08029F88
.pool
_08029C60:
@@ -63513,7 +63513,7 @@ _08029DA0:
str r6, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl Print
bl PrintTextOnWindow
bl sub_81AFBF0
bl sub_802762C
lsls r0, 16
@@ -63539,7 +63539,7 @@ _08029DA0:
movs r1, 0x1
adds r2, r7, 0
movs r3, 0
bl Print
bl PrintTextOnWindow
bl sub_80279C8
lsls r0, 24
lsrs r4, r0, 24
@@ -63585,7 +63585,7 @@ _08029EA8:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
_08029EC8:
ldr r4, =gUnknown_02022CF8
ldr r0, [r4]
@@ -63819,7 +63819,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
@@ -63831,7 +63831,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
@@ -63844,7 +63844,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
@@ -63856,7 +63856,7 @@ _0802A0CC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@@ -63923,7 +63923,7 @@ _0802A1DC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@@ -63936,7 +63936,7 @@ _0802A1DC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@@ -63953,7 +63953,7 @@ _0802A1DC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@@ -64243,7 +64243,7 @@ _0802A4AC:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -64403,7 +64403,7 @@ _0802A610:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
@@ -64840,7 +64840,7 @@ sub_802A9A8: @ 802A9A8
strh r1, [r0, 0x8]
str r6, [r0]
strb r4, [r0, 0x4]
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, [r5]
strb r0, [r1, 0x6]
ldr r0, [r5]
@@ -64928,7 +64928,7 @@ sub_802AA94: @ 802AA94
strh r5, [r0]
str r5, [r4, 0x1C]
str r5, [r4, 0x5C]
bl link_get_multiplayer_id
bl GetMultiplayerId
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -67368,7 +67368,7 @@ _0802BDFE:
ldr r2, [sp]
cmp r0, 0
beq _0802BE38
ldr r1, =gUnknown_020229F0
ldr r1, =gLinkPlayers + 8
add r1, r9
adds r0, r7, 0
bl StringCopy
@@ -70279,7 +70279,7 @@ _0802D46A:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -70363,7 +70363,7 @@ _0802D516:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -70481,7 +70481,7 @@ _0802D606:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -70561,7 +70561,7 @@ _0802D6AA:
str r4, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -70760,7 +70760,7 @@ sub_802D7E8: @ 802D7E8
str r1, [sp, 0x4]
str r3, [sp, 0x8]
movs r1, 0x1
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -70814,7 +70814,7 @@ sub_802D884: @ 802D884
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -70867,7 +70867,7 @@ sub_802D8FC: @ 802D8FC
str r5, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
@@ -72425,7 +72425,7 @@ sub_802E500: @ 802E500
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
bl Print
bl PrintTextOnWindow
movs r6, 0
adds r7, r4, 0
movs r0, 0xFF
@@ -72453,7 +72453,7 @@ _0802E58A:
adds r0, r7, 0
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [sp, 0x20]
ldm r0!, {r1}
str r0, [sp, 0x20]
@@ -72480,7 +72480,7 @@ _0802E58A:
adds r0, r7, 0
movs r1, 0x1
adds r2, r5, 0
bl Print
bl PrintTextOnWindow
movs r0, 0x80
lsls r0, 21
add r8, r0
@@ -73093,7 +73093,7 @@ sub_802EAB0: @ 802EAB0
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x16]
_0802EAD8:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _0802EB1A
asm/load_save.s
+15 -103
View File
@@ -5,97 +5,9 @@
.text
thumb_func_start CheckForFlashMemory
@ void CheckForFlashMemory()
CheckForFlashMemory: @ 8076B68
push {lr}
bl IdentifyFlash
lsls r0, 16
cmp r0, 0
bne _08076B84
ldr r1, =gFlashMemoryPresent
movs r0, 0x1
str r0, [r1]
bl StartFlashMemoryTimer
b _08076B8A
.pool
_08076B84:
ldr r1, =gFlashMemoryPresent
movs r0, 0
str r0, [r1]
_08076B8A:
pop {r0}
bx r0
.pool
thumb_func_end CheckForFlashMemory
thumb_func_start ClearSav2
ClearSav2: @ 8076B94
push {lr}
sub sp, 0x4
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02024A54
ldr r2, =0x010007d6
mov r0, sp
bl CpuSet
add sp, 0x4
pop {r0}
bx r0
.pool
thumb_func_end ClearSav2
thumb_func_start ClearSav1
ClearSav1: @ 8076BB8
push {lr}
sub sp, 0x4
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02025A00
ldr r2, =0x01001f04
mov r0, sp
bl CpuSet
add sp, 0x4
pop {r0}
bx r0
.pool
thumb_func_end ClearSav1
thumb_func_start InitSaveBlockPointersWithRandomOffset
@ void InitSaveBlockPointersWithRandomOffset(u8 offset)
InitSaveBlockPointersWithRandomOffset: @ 8076BDC
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r5, =gSaveBlock1Ptr
bl Random
adds r4, r0
movs r0, 0x7C
ands r4, r0
ldr r1, =gSaveBlock2Ptr
ldr r0, =gUnknown_02024A54
adds r0, r4, r0
str r0, [r1]
ldr r0, =gUnknown_02025A00
adds r0, r4, r0
str r0, [r5]
ldr r1, =gUnknown_03005D94
ldr r0, =gUnknown_02029808
adds r4, r0
str r4, [r1]
bl SetBagItemsPointers
bl sub_81617F4
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end InitSaveBlockPointersWithRandomOffset
thumb_func_start saveblock_randomize_and_relocate
saveblock_randomize_and_relocate: @ 8076C2C
thumb_func_start MoveSaveBlocks_ResetHeap
MoveSaveBlocks_ResetHeap: @ 8076C2C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -126,7 +38,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
ldr r0, =0x02000f2c
adds r2, r7, 0
bl memcpy
ldr r0, =gUnknown_03005D94
ldr r0, =gPokemonStoragePtr
mov r8, r0
ldr r1, [r0]
ldr r0, =0x000083d0
@@ -141,7 +53,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
adds r1, r0
ldrb r0, [r4, 0xD]
adds r0, r1
bl InitSaveBlockPointersWithRandomOffset
bl SetSaveBlocksPointers
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
adds r1, r4, 0
@@ -173,7 +85,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
lsrs r0, 16
adds r4, r0
adds r0, r4, 0
bl saveblock_apply_crypto
bl ApplyNewEncyprtionKeyToAllEncryptedData
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
adds r0, 0xAC
@@ -187,7 +99,7 @@ saveblock_randomize_and_relocate: @ 8076C2C
pop {r0}
bx r0
.pool
thumb_func_end saveblock_randomize_and_relocate
thumb_func_end MoveSaveBlocks_ResetHeap
thumb_func_start sav2_x1_query_bit1
sav2_x1_query_bit1: @ 8076D24
@@ -713,8 +625,8 @@ ApplyNewEncyprtionKeyToHword: @ 8077100
.pool
thumb_func_end ApplyNewEncyprtionKeyToHword
thumb_func_start apply_u32_xor_crypto
apply_u32_xor_crypto: @ 8077118
thumb_func_start ApplyNewEncyprtionKeyToWord
ApplyNewEncyprtionKeyToWord: @ 8077118
ldr r2, =gSaveBlock2Ptr
ldr r3, [r2]
adds r3, 0xAC
@@ -725,24 +637,24 @@ apply_u32_xor_crypto: @ 8077118
str r2, [r0]
bx lr
.pool
thumb_func_end apply_u32_xor_crypto
thumb_func_end ApplyNewEncyprtionKeyToWord
thumb_func_start saveblock_apply_crypto
saveblock_apply_crypto: @ 8077130
thumb_func_start ApplyNewEncyprtionKeyToAllEncryptedData
ApplyNewEncyprtionKeyToAllEncryptedData: @ 8077130
push {r4,r5,lr}
adds r4, r0, 0
bl sub_8084864
bl ApplyNewEncyprtionKeyToGameStats
adds r0, r4, 0
bl ApplyNewEncyprtionKeyToBagItems_
adds r0, r4, 0
bl sub_8024690
bl ApplyNewEncyprtionKeyToBerryPowder
ldr r5, =gSaveBlock1Ptr
ldr r0, [r5]
movs r1, 0x92
lsls r1, 3
adds r0, r1
adds r1, r4, 0
bl apply_u32_xor_crypto
bl ApplyNewEncyprtionKeyToWord
ldr r0, [r5]
ldr r1, =0x00000494
adds r0, r1
@@ -752,6 +664,6 @@ saveblock_apply_crypto: @ 8077130
pop {r0}
bx r0
.pool
thumb_func_end saveblock_apply_crypto
thumb_func_end ApplyNewEncyprtionKeyToAllEncryptedData
.align 2, 0 @ Don't pad with nop.
asm/lottery_corner.s
-381
View File
@@ -1,381 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ResetLotteryCorner
ResetLotteryCorner: @ 8177558
push {r4,lr}
bl Random
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
bl Random
lsls r0, 16
orrs r0, r4
bl sub_8177814
ldr r0, =0x00004045
movs r1, 0
bl VarSet
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end ResetLotteryCorner
thumb_func_start sub_8177584
sub_8177584: @ 8177584
push {r4,r5,lr}
lsls r0, 16
lsrs r4, r0, 16
bl Random
lsls r0, 16
lsrs r1, r0, 16
subs r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
ldr r0, =0x0000ffff
cmp r4, r0
beq _081775B4
ldr r5, =0x41c64e6d
ldr r3, =0x00003039
adds r2, r0, 0
_081775A4:
adds r0, r1, 0
muls r0, r5
adds r1, r0, r3
subs r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, r2
bne _081775A4
_081775B4:
adds r0, r1, 0
bl sub_8177814
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8177584
thumb_func_start sub_81775CC
sub_81775CC: @ 81775CC
push {lr}
bl sub_817783C
ldr r1, =gScriptResult
strh r0, [r1]
pop {r0}
bx r0
.pool
thumb_func_end sub_81775CC
thumb_func_start sub_81775E0
sub_81775E0: @ 81775E0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
ldr r1, =gSpecialVar_0x8004
movs r0, 0
strh r0, [r1]
movs r0, 0
str r0, [sp, 0x4]
movs r1, 0
str r1, [sp]
movs r7, 0
_081775FC:
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl GetMonData
cmp r0, 0
beq _08177658
adds r0, r4, 0
movs r1, 0x2D
bl GetMonData
cmp r0, 0
bne _0817764E
adds r0, r4, 0
movs r1, 0x1
bl GetMonData
adds r1, r0, 0
ldr r0, =gScriptResult
ldrh r0, [r0]
lsls r1, 16
lsrs r1, 16
bl sub_817778C
lsls r0, 24
lsrs r0, 24
ldr r1, =gSpecialVar_0x8004
ldrh r2, [r1]
cmp r0, r2
bls _0817764E
cmp r0, 0x1
bls _0817764E
subs r0, 0x1
strh r0, [r1]
movs r0, 0xE
str r0, [sp]
str r7, [sp, 0x4]
_0817764E:
adds r0, r7, 0x1
lsls r0, 16
lsrs r7, r0, 16
cmp r7, 0x5
bls _081775FC
_08177658:
movs r7, 0
ldr r1, =gUnknown_03005D94
mov r9, r1
_0817765E:
movs r6, 0
adds r2, r7, 0x1
mov r10, r2
lsls r0, r7, 2
adds r0, r7
mov r8, r0
_0817766A:
mov r1, r8
lsls r0, r1, 4
subs r0, r1
lsls r0, 5
adds r5, r0, 0x4
mov r2, r9
ldr r0, [r2]
adds r0, r5
lsls r1, r6, 2
adds r1, r6
lsls r4, r1, 4
adds r0, r4
movs r1, 0xB
bl pokemon_getattr_encrypted
cmp r0, 0
beq _081776D2
mov r1, r9
ldr r0, [r1]
adds r0, r5
adds r0, r4
movs r1, 0x2D
bl pokemon_getattr_encrypted
cmp r0, 0
bne _081776D2
mov r2, r9
ldr r0, [r2]
adds r0, r5
adds r0, r4
movs r1, 0x1
bl pokemon_getattr_encrypted
adds r1, r0, 0
ldr r0, =gScriptResult
ldrh r0, [r0]
lsls r1, 16
lsrs r1, 16
bl sub_817778C
lsls r0, 24
lsrs r0, 24
ldr r1, =gSpecialVar_0x8004
ldrh r2, [r1]
cmp r0, r2
bls _081776D2
cmp r0, 0x1
bls _081776D2
subs r0, 0x1
strh r0, [r1]
str r7, [sp]
str r6, [sp, 0x4]
_081776D2:
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
cmp r6, 0x1D
bls _0817766A
mov r1, r10
lsls r0, r1, 16
lsrs r7, r0, 16
cmp r7, 0xD
bls _0817765E
ldr r3, =gSpecialVar_0x8004
ldrh r0, [r3]
cmp r0, 0
beq _0817776E
ldr r2, =gSpecialVar_0x8005
ldr r1, =gUnknown_085E7080
subs r0, 0x1
lsls r0, 1
adds r0, r1
ldrh r0, [r0]
strh r0, [r2]
ldr r2, [sp]
cmp r2, 0xE
bne _0817773C
ldr r1, =gSpecialVar_0x8006
movs r0, 0
strh r0, [r1]
movs r0, 0x64
ldr r1, [sp, 0x4]
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
ldr r2, =gStringVar1
movs r1, 0x2
bl GetMonData
b _08177768
.pool
_0817773C:
ldr r1, =gSpecialVar_0x8006
movs r0, 0x1
strh r0, [r1]
ldr r2, =gUnknown_03005D94
ldr r1, [sp]
lsls r0, r1, 2
adds r0, r1
lsls r1, r0, 4
subs r1, r0
lsls r1, 5
adds r1, 0x4
ldr r0, [r2]
adds r0, r1
ldr r2, [sp, 0x4]
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
adds r0, r1
ldr r2, =gStringVar1
movs r1, 0x2
bl pokemon_getattr_encrypted
_08177768:
ldr r0, =gStringVar1
bl StringGetEnd10
_0817776E:
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81775E0
thumb_func_start sub_817778C
sub_817778C: @ 817778C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
lsls r0, 16
lsrs r6, r0, 16
lsls r1, 16
lsrs r5, r1, 16
movs r0, 0
mov r8, r0
movs r7, 0
ldr r1, =gUnknown_0203BCEC
mov r10, r1
ldr r0, =gUnknown_0203BCEE
mov r9, r0
_081777AC:
adds r0, r6, 0
movs r1, 0xA
bl __umodsi3
adds r4, r0, 0
mov r1, r10
strh r4, [r1]
adds r0, r5, 0
movs r1, 0xA
bl __umodsi3
mov r1, r9
strh r0, [r1]
lsls r4, 16
lsls r0, 16
cmp r4, r0
bne _081777FA
adds r0, r6, 0
movs r1, 0xA
bl __udivsi3
lsls r0, 16
lsrs r6, r0, 16
adds r0, r5, 0
movs r1, 0xA
bl __udivsi3
lsls r0, 16
lsrs r5, r0, 16
mov r0, r8
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
mov r8, r0
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0x4
bls _081777AC
_081777FA:
mov r0, r8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_817778C
thumb_func_start sub_8177814
sub_8177814: @ 8177814
push {r4,lr}
adds r1, r0, 0
lsrs r4, r1, 16
lsls r1, 16
lsrs r1, 16
ldr r0, =0x0000404b
bl VarSet
ldr r0, =0x0000404c
adds r1, r4, 0
bl VarSet
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8177814
thumb_func_start sub_817783C
sub_817783C: @ 817783C
push {r4,lr}
ldr r0, =0x0000404b
bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, =0x0000404c
bl VarGet
lsls r0, 16
orrs r0, r4
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_817783C
thumb_func_start sub_8177864
sub_8177864: @ 8177864
push {lr}
lsls r0, 16
lsrs r0, 16
bl sub_8177814
pop {r0}
bx r0
thumb_func_end sub_8177864
.align 2, 0 @ Don't pad with nop.
asm/main_menu.s
+1 -1
View File
@@ -4509,7 +4509,7 @@ CreateMainMenuErrorWindow: @ 8031E18
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl Print
bl PrintTextOnWindow
movs r0, 0x7
bl PutWindowTilemap
movs r0, 0x7
asm/mauville_old_man.s
+3 -3
View File
@@ -810,7 +810,7 @@ sub_8120708: @ 8120708
movs r1, 0x1
adds r2, r5, 0
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, =gUnknown_03002F84
strb r4, [r0]
movs r0, 0
@@ -2292,7 +2292,7 @@ _08121272:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
movs r0, 0x80
lsls r0, 21
adds r5, r0
@@ -2321,7 +2321,7 @@ _081212AA:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
ldrb r4, [r5]
bl sub_8120ED8
adds r1, r0, 0
asm/menu_helpers.s
+3 -3
View File
@@ -587,8 +587,8 @@ _08122208:
bx r1
thumb_func_end sub_81221EC
thumb_func_start atk2D_jumpifarraynotequal
atk2D_jumpifarraynotequal: @ 812220C
thumb_func_start sub_812220C
sub_812220C: @ 812220C
push {r4-r6,lr}
adds r6, r2, 0
ldr r2, [sp, 0x10]
@@ -633,7 +633,7 @@ _08122254:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end atk2D_jumpifarraynotequal
thumb_func_end sub_812220C
thumb_func_start sub_812225C
sub_812225C: @ 812225C
asm/money.s
+3 -94
View File
@@ -5,100 +5,9 @@
.text
thumb_func_start DecryptMoney
@ int DecryptMoney(u32 *moneyPointer)
DecryptMoney: @ 80E5114
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
adds r1, 0xAC
ldr r0, [r0]
ldr r1, [r1]
eors r0, r1
bx lr
.pool
thumb_func_end DecryptMoney
thumb_func_start SetMoney
@ void SetMoney(u32 *moneyPointer, u32 moneyAmount)
SetMoney: @ 80E5128
ldr r2, =gSaveBlock2Ptr
ldr r2, [r2]
adds r2, 0xAC
ldr r2, [r2]
eors r2, r1
str r2, [r0]
bx lr
.pool
thumb_func_end SetMoney
thumb_func_start IsEnoughMoney
@ bool8 IsEnoughMoney(u32 *moneyPointer, u32 price)
IsEnoughMoney: @ 80E513C
push {r4,lr}
adds r4, r1, 0
bl DecryptMoney
cmp r0, r4
bcs _080E514C
movs r0, 0
b _080E514E
_080E514C:
movs r0, 0x1
_080E514E:
pop {r4}
pop {r1}
bx r1
thumb_func_end IsEnoughMoney
thumb_func_start add_money
@ void add_money(int *money_ptr, int amount)
add_money: @ 80E5154
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r1, 0
bl DecryptMoney
adds r5, r0, 0
adds r0, r5, r4
ldr r5, =0x000f423f
adds r4, r5, 0
cmp r0, r5
bhi _080E5178
adds r5, r0, 0
adds r0, r6, 0
bl DecryptMoney
cmp r5, r0
bcs _080E5178
adds r5, r4, 0
_080E5178:
adds r0, r6, 0
adds r1, r5, 0
bl SetMoney
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end add_money
thumb_func_start subtract_money
@ void subtract_money(int *money_ptr, int amount)
subtract_money: @ 80E518C
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
bl DecryptMoney
adds r1, r0, 0
cmp r1, r4
bcs _080E51A0
movs r1, 0
b _080E51A2
_080E51A0:
subs r1, r4
_080E51A2:
adds r0, r5, 0
bl SetMoney
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end subtract_money
thumb_func_start sub_80E51B0
sub_80E51B0: @ 80E51B0
@@ -128,7 +37,7 @@ sub_80E51D4: @ 80E51D4
adds r0, r1
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
bl subtract_money
bl SubtractMoney
pop {r0}
bx r0
.pool
@@ -207,7 +116,7 @@ _080E5264:
adds r0, r7, 0
movs r1, 0x1
mov r3, r8
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r3}
mov r8, r3
@@ -293,7 +202,7 @@ sub_80E52EC: @ 80E52EC
add r0, sp, 0x10
movs r1, 0
adds r2, r4, 0
bl rbox_template_set
bl SetWindowTemplateFields
ldr r4, =gUnknown_02039F98
add r0, sp, 0x10
bl AddWindow
asm/mystery_event_menu.s
+1 -1
View File
@@ -19,7 +19,7 @@ sub_8178944: @ 8178944
sub_8178958: @ 8178958
push {lr}
movs r2, 0
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
ldrh r0, [r1, 0x1A]
ldrh r1, [r1, 0x36]
cmp r0, r1
asm/mystery_event_script.s
+3 -3
View File
@@ -513,7 +513,7 @@ sub_8153BB0: @ 8153BB0
ldrb r1, [r2]
adds r2, 0x1
str r2, [r4, 0x8]
bl sub_80F9B30
bl GiveGiftRibbonToParty
ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B6A
bl StringExpandPlaceholders
@@ -691,7 +691,7 @@ _08153D22:
b _08153DB6
.pool
_08153D4C:
ldr r7, =gUnknown_020246E0
ldr r7, =gPlayerParty + 500
adds r0, r7, 0
adds r1, r5, 0
movs r2, 0x64
@@ -730,7 +730,7 @@ _08153D86:
bl sub_80D460C
_08153DA4:
bl party_compaction
bl calc_player_party_count
bl CalculatePlayerPartyCount
ldr r0, =gStringVar4
ldr r1, =gUnknown_08674BF0
bl StringExpandPlaceholders
asm/naming_screen.s
+4 -4
View File
@@ -730,7 +730,7 @@ pokemon_store: @ 80E33D8
ldrb r0, [r0]
cmp r0, 0x2
bne _080E342C
bl calc_player_party_count
bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
@@ -3276,7 +3276,7 @@ sub_80E4894: @ 80E4894
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -3328,7 +3328,7 @@ sub_80E48E8: @ 80E48E8
movs r1, 0x1
add r2, sp, 0xC
movs r3, 0x8
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -3865,7 +3865,7 @@ _080E4D76:
str r1, [sp, 0x8]
movs r1, 0x1
add r2, sp, 0xC
bl Print
bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
asm/new_game.s
-142
View File
@@ -1,142 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start NewGameInitData
@ void NewGameInitData()
NewGameInitData: @ 80844A0
push {r4,r5,lr}
ldr r0, =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _080844AE
cmp r0, 0x2
bne _080844B2
_080844AE:
bl RtcReset
_080844B2:
ldr r1, =gDifferentSaveFile
movs r0, 0x1
strb r0, [r1]
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
adds r0, 0xAC
movs r5, 0
str r5, [r0]
bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
bl ResetPokedex
bl sub_8084400
bl ClearSav1
bl ClearMailData
ldr r0, [r4]
strb r5, [r0, 0x9]
ldr r0, [r4]
adds r0, 0xA8
str r5, [r0]
bl InitPlayerTrainerId
bl PlayTimeCounter_Reset
bl ClearPokedexFlags
bl InitEventData
bl ClearTVShowData
bl ResetGabbyAndTy
bl ResetSecretBases
bl ClearBerryTrees
ldr r4, =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0x92
lsls r1, 3
adds r0, r1
ldr r1, =0x00000bb8
bl SetMoney
movs r0, 0
bl SetCoins
bl ResetLinkContestBoolean
bl ResetGameStats
bl ClearAllContestWinnerPics
bl InitLinkBattleRecords
bl InitSeedotSizeRecord
bl InitLotadSizeRecord
ldr r0, =gPlayerPartyCount
strb r5, [r0]
bl ZeroPlayerPartyMons
bl ResetPokemonStorageSystem
bl ClearRoamerData
bl ClearRoamerLocationData
ldr r0, [r4]
ldr r1, =0x00000496
adds r0, r1
strh r5, [r0]
bl ClearBag
bl NewGameInitPCItems
bl ClearPokeblocks
bl ClearDecorationInventories
bl InitEasyChatPhrases
bl SetMauvilleOldMan
bl InitDewfordTrend
bl ResetFanClub
bl ResetLotteryCorner
bl WarpToTruck
ldr r0, =gUnknown_082715DE
bl ScriptContext2_RunNewScript
bl ResetMiniGamesResults
bl copy_strings_to_sav1
bl SetLilycoveLady
bl sub_819FAA0
bl sub_81A4B14
bl sub_8195E10
bl sub_801AFD8
bl sub_800E5AC
bl sub_81D54BC
bl ResetContestLinkResults
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end NewGameInitData
thumb_func_start ResetMiniGamesResults
ResetMiniGamesResults: @ 80845CC
push {r4-r6,lr}
sub sp, 0x4
mov r0, sp
movs r5, 0
strh r5, [r0]
ldr r4, =gSaveBlock2Ptr
ldr r1, [r4]
movs r0, 0xF6
lsls r0, 1
adds r1, r0
ldr r6, =0x01000008
mov r0, sp
adds r2, r6, 0
bl CpuSet
ldr r0, [r4]
movs r1, 0xFA
lsls r1, 1
adds r0, r1
movs r1, 0
bl SetBerryPowder
bl ResetPokeJumpResults
mov r0, sp
adds r0, 0x2
strh r5, [r0]
ldr r1, [r4]
movs r2, 0x83
lsls r2, 2
adds r1, r2
adds r2, r6, 0
bl CpuSet
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end ResetMiniGamesResults
.align 2, 0 @ Don't pad with nop.
asm/option_menu.s
+3 -3
View File
@@ -833,7 +833,7 @@ _080BABAE:
movs r1, 0x1
add r2, sp, 0xC
adds r3, r6, 0
bl Print
bl PrintTextOnWindow
add sp, 0x1C
pop {r4-r6}
pop {r0}
@@ -1470,7 +1470,7 @@ sub_80BB0D0: @ 80BB0D0
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -1505,7 +1505,7 @@ _080BB114:
movs r0, 0x1
movs r1, 0x1
movs r3, 0x8
bl Print
bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
asm/player_pc.s
+11 -11
View File
@@ -380,12 +380,12 @@ sub_816B148: @ 816B148
cmp r0, 0
bne _0816B174
ldr r0, =gUnknown_081F863F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0816B184
.pool
_0816B174:
ldr r0, =gUnknown_081F958F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0816B184
.pool
_0816B180:
@@ -472,7 +472,7 @@ sub_816B21C: @ 816B21C
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r4}
pop {r0}
@@ -966,7 +966,7 @@ sub_816B5F8: @ 816B5F8
adds r0, r4, 0
movs r1, 0x1
adds r2, r6, 0
bl Print
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r4, =gUnknown_0203BCB8
@@ -1484,7 +1484,7 @@ sub_816BABC: @ 816BABC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl calc_player_party_count
bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
bne _0816BAD4
@@ -1968,7 +1968,7 @@ _0816BE8E:
adds r0, r6, 0
movs r1, 0x7
adds r2, r4, 0
bl Print
bl PrintTextOnWindow
_0816BED4:
add sp, 0xC
pop {r4-r6}
@@ -2019,7 +2019,7 @@ _0816BF32:
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -2252,7 +2252,7 @@ sub_816C110: @ 816C110
movs r1, 0x8
str r1, [sp]
movs r1, 0x32
bl atk2D_jumpifarraynotequal
bl sub_812220C
add sp, 0x4
pop {r0}
bx r0
@@ -2317,7 +2317,7 @@ _0816C186:
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r4]
ldr r1, =0x00000662
adds r0, r1
@@ -2448,7 +2448,7 @@ sub_816C2C0: @ 816C2C0
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -2909,7 +2909,7 @@ sub_816C6BC: @ 816C6BC
adds r0, r6, 0
movs r1, 0x1
adds r2, r4, 0
bl Print
bl PrintTextOnWindow
add sp, 0xC
pop {r4-r6}
pop {r0}
asm/pokedex.s
+3 -3
View File
@@ -9377,8 +9377,8 @@ sub_80C0620: @ 80C0620
.pool
thumb_func_end sub_80C0620
thumb_func_start sub_80C0630
sub_80C0630: @ 80C0630
thumb_func_start GetPokedexHeightWeight
GetPokedexHeightWeight: @ 80C0630
push {lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -9406,7 +9406,7 @@ _080C065C:
pop {r1}
bx r1
.pool
thumb_func_end sub_80C0630
thumb_func_end GetPokedexHeightWeight
thumb_func_start pokedex_flag_operation
@ u8 pokedex_flag_operation(u16 nationalPokedexNum, u8 op)
asm/pokedex_area_screen.s
+1 -1
View File
@@ -304,7 +304,7 @@ _0813CCB8:
adds r0, 0x10
adds r1, r2, 0
adds r1, 0x11
bl sub_8161F64
bl GetRoamerLocation
ldr r1, [r5]
ldrb r0, [r1, 0x10]
ldrb r1, [r1, 0x11]
asm/pokemon_1.s
+94 -1155
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_2.s
+130 -130
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_8069DEC
sub_8069DEC: @ 8069DEC
thumb_func_start CountAliveMonsInBattle
CountAliveMonsInBattle: @ 8069DEC
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -115,10 +115,10 @@ _08069EC2:
pop {r1}
bx r1
.pool
thumb_func_end sub_8069DEC
thumb_func_end CountAliveMonsInBattle
thumb_func_start sub_8069ED8
sub_8069ED8: @ 8069ED8
thumb_func_start ShouldGetStatBadgeBoost
ShouldGetStatBadgeBoost: @ 8069ED8
push {r4,r5,lr}
lsls r0, 16
lsrs r5, r0, 16
@@ -140,7 +140,7 @@ sub_8069ED8: @ 8069ED8
ands r0, r1
cmp r0, 0
beq _08069F10
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 3
@@ -162,7 +162,7 @@ _08069F2E:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8069ED8
thumb_func_end ShouldGetStatBadgeBoost
thumb_func_start sub_8069F34
sub_8069F34: @ 8069F34
@@ -186,7 +186,7 @@ sub_8069F34: @ 8069F34
.pool
_08069F5C:
movs r0, 0
bl sub_8069DEC
bl CountAliveMonsInBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -228,29 +228,29 @@ _08069FA6:
bx r1
thumb_func_end sub_8069F34
thumb_func_start pokemon_get_gender
pokemon_get_gender: @ 8069FB4
thumb_func_start GetMonGender
GetMonGender: @ 8069FB4
push {lr}
bl pokemon_roll_gender
bl GetBoxMonGender
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end pokemon_get_gender
thumb_func_end GetMonGender
thumb_func_start pokemon_roll_gender
pokemon_roll_gender: @ 8069FC4
thumb_func_start GetBoxMonGender
GetBoxMonGender: @ 8069FC4
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr_encrypted
bl GetBoxMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
movs r2, 0
bl pokemon_getattr_encrypted
bl GetBoxMonData
adds r2, r0, 0
ldr r1, =gBaseStats
lsls r0, r5, 3
@@ -286,10 +286,10 @@ _0806A01A:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end pokemon_roll_gender
thumb_func_end GetBoxMonGender
thumb_func_start pokemon_species_get_gender_info
pokemon_species_get_gender_info: @ 806A020
thumb_func_start GetGenderFromSpeciesAndPersonality
GetGenderFromSpeciesAndPersonality: @ 806A020
push {lr}
adds r3, r1, 0
lsls r0, 16
@@ -326,7 +326,7 @@ _0806A060:
_0806A062:
pop {r1}
bx r1
thumb_func_end pokemon_species_get_gender_info
thumb_func_end GetGenderFromSpeciesAndPersonality
thumb_func_start sub_806A068
sub_806A068: @ 806A068
@@ -544,9 +544,9 @@ _0806A20A:
.pool
thumb_func_end sub_806A1C0
thumb_func_start pokemon_encrypt
@ void pokemon_encrypt(pokemon *mon)
pokemon_encrypt: @ 806A228
thumb_func_start EncryptBoxMon
@ void EncryptBoxMon(pokemon *mon)
EncryptBoxMon: @ 806A228
push {r4,lr}
adds r3, r0, 0
movs r4, 0
@@ -566,11 +566,11 @@ _0806A232:
pop {r4}
pop {r0}
bx r0
thumb_func_end pokemon_encrypt
thumb_func_end EncryptBoxMon
thumb_func_start pokemon_decrypt
@ void pokemon_decrypt(pokemon *mon)
pokemon_decrypt: @ 806A24C
thumb_func_start DecryptBoxMon
@ void DecryptBoxMon(pokemon *mon)
DecryptBoxMon: @ 806A24C
push {r4,lr}
adds r3, r0, 0
movs r4, 0
@@ -590,11 +590,11 @@ _0806A256:
pop {r4}
pop {r0}
bx r0
thumb_func_end pokemon_decrypt
thumb_func_end DecryptBoxMon
thumb_func_start pokemon_data_permutator
@ int pokemon_data_permutator(pokemon *mon, int a2, u8 a3)
pokemon_data_permutator: @ 806A270
thumb_func_start GetSubstruct
@ int GetSubstruct(pokemon *mon, int a2, u8 a3)
GetSubstruct: @ 806A270
push {r4-r6,lr}
adds r5, r0, 0
adds r0, r1, 0
@@ -980,7 +980,7 @@ _0806A510:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end pokemon_data_permutator
thumb_func_end GetSubstruct
thumb_func_start GetMonData
@ int GetMonData(pokemon *mon, enum pokemon_data_request req, void *data)
@@ -1132,16 +1132,16 @@ _0806A65E:
_0806A666:
adds r0, r4, 0
adds r1, r3, 0
bl pokemon_getattr_encrypted
bl GetBoxMonData
_0806A66E:
pop {r4}
pop {r1}
bx r1
thumb_func_end GetMonData
thumb_func_start pokemon_getattr_encrypted
@ int pokemon_getattr_encrypted(pokemon *mon, enum pokemon_data_request req, void *data)
pokemon_getattr_encrypted: @ 806A674
thumb_func_start GetBoxMonData
@ int GetBoxMonData(pokemon *mon, enum pokemon_data_request req, void *data)
GetBoxMonData: @ 806A674
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1160,28 +1160,28 @@ pokemon_getattr_encrypted: @ 806A674
ble _0806A6F2
ldr r1, [r0]
movs r2, 0
bl pokemon_data_permutator
bl GetSubstruct
mov r9, r0
mov r0, r8
ldr r1, [r0]
movs r2, 0x1
bl pokemon_data_permutator
bl GetSubstruct
mov r10, r0
mov r2, r8
ldr r1, [r2]
mov r0, r8
movs r2, 0x2
bl pokemon_data_permutator
bl GetSubstruct
adds r7, r0, 0
mov r0, r8
ldr r1, [r0]
movs r2, 0x3
bl pokemon_data_permutator
bl GetSubstruct
adds r5, r0, 0
mov r0, r8
bl pokemon_decrypt
bl DecryptBoxMon
mov r0, r8
bl pokemon_calc_checksum
bl CalculateBoxMonChecksum
lsls r0, 16
lsrs r0, 16
mov r1, r8
@@ -1925,7 +1925,7 @@ _0806AC8C:
cmp r6, 0xA
ble _0806AC98
mov r0, r8
bl pokemon_encrypt
bl EncryptBoxMon
_0806AC98:
adds r0, r4, 0
add sp, 0x4
@@ -1936,7 +1936,7 @@ _0806AC98:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end pokemon_getattr_encrypted
thumb_func_end GetBoxMonData
thumb_func_start SetMonData
@ int SetMonData(pokemon *mon, enum pokemon_data_request req, void *data)
@@ -2056,15 +2056,15 @@ _0806AD86:
b _0806AD96
_0806AD90:
adds r0, r3, 0
bl SetMonData_encrypted
bl SetBoxMonData
_0806AD96:
pop {r0}
bx r0
thumb_func_end SetMonData
thumb_func_start SetMonData_encrypted
@ int SetMonData_encrypted(pokemon *mon, enum pokemon_data_request req, void *data)
SetMonData_encrypted: @ 806AD9C
thumb_func_start SetBoxMonData
@ int SetBoxMonData(pokemon *mon, enum pokemon_data_request req, void *data)
SetBoxMonData: @ 806AD9C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2083,27 +2083,27 @@ SetMonData_encrypted: @ 806AD9C
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0
bl pokemon_data_permutator
bl GetSubstruct
mov r8, r0
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0x1
bl pokemon_data_permutator
bl GetSubstruct
mov r9, r0
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0x2
bl pokemon_data_permutator
bl GetSubstruct
adds r6, r0, 0
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0x3
bl pokemon_data_permutator
bl GetSubstruct
adds r5, r0, 0
adds r0, r7, 0
bl pokemon_decrypt
bl DecryptBoxMon
adds r0, r7, 0
bl pokemon_calc_checksum
bl CalculateBoxMonChecksum
lsls r0, 16
lsrs r0, 16
ldrh r1, [r7, 0x1C]
@@ -2120,7 +2120,7 @@ SetMonData_encrypted: @ 806AD9C
orrs r0, r1
strb r0, [r5, 0x7]
adds r0, r7, 0
bl pokemon_encrypt
bl EncryptBoxMon
b _0806B3EC
_0806AE1C:
mov r0, r10
@@ -2850,10 +2850,10 @@ _0806B3D8:
cmp r0, 0xA
ble _0806B3EC
adds r0, r7, 0
bl pokemon_calc_checksum
bl CalculateBoxMonChecksum
strh r0, [r7, 0x1C]
adds r0, r7, 0
bl pokemon_encrypt
bl EncryptBoxMon
_0806B3EC:
pop {r3-r5}
mov r8, r3
@@ -2863,20 +2863,20 @@ _0806B3EC:
pop {r0}
bx r0
.pool
thumb_func_end SetMonData_encrypted
thumb_func_end SetBoxMonData
thumb_func_start memcpy_pokemon
@ void *memcpy_pokemon(void *dest, void *src, unsigned int size)
memcpy_pokemon: @ 806B408
thumb_func_start CopyMon
@ void *CopyMon(void *dest, void *src, unsigned int size)
CopyMon: @ 806B408
push {lr}
bl memcpy
pop {r0}
bx r0
thumb_func_end memcpy_pokemon
thumb_func_end CopyMon
thumb_func_start pokemon_catch
@ int pokemon_catch(pokemon *mon)
pokemon_catch: @ 806B414
thumb_func_start GiveMonToPlayer
@ int GiveMonToPlayer(pokemon *mon)
GiveMonToPlayer: @ 806B414
push {r4-r6,lr}
adds r6, r0, 0
ldr r4, =gSaveBlock2Ptr
@@ -2915,7 +2915,7 @@ _0806B446:
adds r0, r4, 0
adds r1, r6, 0
movs r2, 0x64
bl memcpy_pokemon
bl CopyMon
ldr r1, =gPlayerPartyCount
adds r0, r5, 0x1
strb r0, [r1]
@@ -2924,18 +2924,18 @@ _0806B446:
.pool
_0806B480:
adds r0, r6, 0
bl pokemon_add_to_pc
bl SendMonToPC
lsls r0, 24
lsrs r0, 24
_0806B48A:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end pokemon_catch
thumb_func_end GiveMonToPlayer
thumb_func_start pokemon_add_to_pc
@ int pokemon_add_to_pc(pokemon *mon)
pokemon_add_to_pc: @ 806B490
thumb_func_start SendMonToPC
@ int SendMonToPC(pokemon *mon)
SendMonToPC: @ 806B490
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2959,15 +2959,15 @@ _0806B4B2:
adds r4, r0, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0
bne _0806B514
mov r0, r8
bl sub_806E924
bl MonRestorePP
adds r0, r4, 0
mov r1, r8
movs r2, 0x50
bl memcpy_pokemon
bl CopyMon
ldr r0, =gSpecialVar_0x8012
strh r5, [r0]
ldr r0, =gSpecialVar_0x8013
@@ -3008,11 +3008,11 @@ _0806B530:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end pokemon_add_to_pc
thumb_func_end SendMonToPC
thumb_func_start calc_player_party_count
@ u8 calc_player_party_count()
calc_player_party_count: @ 806B53C
thumb_func_start CalculatePlayerPartyCount
@ u8 CalculatePlayerPartyCount()
CalculatePlayerPartyCount: @ 806B53C
push {r4,lr}
ldr r0, =gPlayerPartyCount
movs r1, 0
@@ -3045,11 +3045,11 @@ _0806B572:
pop {r1}
bx r1
.pool
thumb_func_end calc_player_party_count
thumb_func_end CalculatePlayerPartyCount
thumb_func_start calc_enemy_party_count
@ u8 calc_enemy_party_count()
calc_enemy_party_count: @ 806B580
thumb_func_start CalculateEnemyPartyCount
@ u8 CalculateEnemyPartyCount()
CalculateEnemyPartyCount: @ 806B580
push {r4,lr}
ldr r0, =gUnknown_020244EA
movs r1, 0
@@ -3082,13 +3082,13 @@ _0806B5B6:
pop {r1}
bx r1
.pool
thumb_func_end calc_enemy_party_count
thumb_func_end CalculateEnemyPartyCount
thumb_func_start sub_806B5C4
sub_806B5C4: @ 806B5C4
thumb_func_start GetMonsStateToDoubles
GetMonsStateToDoubles: @ 806B5C4
push {r4-r6,lr}
movs r6, 0
bl calc_player_party_count
bl CalculatePlayerPartyCount
ldr r1, =gPlayerPartyCount
ldrb r0, [r1]
cmp r0, 0x1
@@ -3140,11 +3140,11 @@ _0806B628:
pop {r1}
bx r1
.pool
thumb_func_end sub_806B5C4
thumb_func_end GetMonsStateToDoubles
thumb_func_start CheckPlayerPartySize
@ u8 CheckPlayerPartySize()
CheckPlayerPartySize: @ 806B638
thumb_func_start GetMonsStateToDoubles_2
@ u8 GetMonsStateToDoubles_2()
GetMonsStateToDoubles_2: @ 806B638
push {r4-r6,lr}
movs r6, 0
movs r5, 0
@@ -3190,11 +3190,11 @@ _0806B68C:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end CheckPlayerPartySize
thumb_func_end GetMonsStateToDoubles_2
thumb_func_start sub_806B694
@ int sub_806B694(u16 a1, int a2)
sub_806B694: @ 806B694
thumb_func_start GetAbilityBySpecies
@ int GetAbilityBySpecies(u16 a1, int a2)
GetAbilityBySpecies: @ 806B694
push {lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -3224,7 +3224,7 @@ _0806B6C6:
pop {r1}
bx r1
.pool
thumb_func_end sub_806B694
thumb_func_end GetAbilityBySpecies
thumb_func_start GetMonAbility
@ u8 GetMonAbility(pokemon *mon)
@@ -3245,7 +3245,7 @@ GetMonAbility: @ 806B6D8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_806B694
bl GetAbilityBySpecies
lsls r0, 24
lsrs r0, 24
pop {r4,r5}
@@ -3253,8 +3253,8 @@ GetMonAbility: @ 806B6D8
bx r1
thumb_func_end GetMonAbility
thumb_func_start create_enemy_party
create_enemy_party: @ 806B70C
thumb_func_start CreateSecretBaseEnemyParty
CreateSecretBaseEnemyParty: @ 806B70C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3311,7 +3311,7 @@ _0806B730:
str r0, [sp, 0xC]
adds r0, r5, 0
movs r3, 0xF
bl create_pokemon_set_level
bl CreateMon
ldr r1, =gBattleResources
ldr r0, [r1]
adds r1, r7, 0
@@ -3392,12 +3392,12 @@ _0806B80A:
pop {r0}
bx r0
.pool
thumb_func_end create_enemy_party
thumb_func_end CreateSecretBaseEnemyParty
thumb_func_start sub_806B830
sub_806B830: @ 806B830
thumb_func_start GetSecretBaseTrainerPicIndex
GetSecretBaseTrainerPicIndex: @ 806B830
push {r4,r5,lr}
ldr r5, =gUnknown_08329EB8
ldr r5, =gSecretBaseTrainerClasses
ldr r0, =gBattleResources
ldr r0, [r0]
ldr r4, [r0]
@@ -3421,12 +3421,12 @@ sub_806B830: @ 806B830
pop {r1}
bx r1
.pool
thumb_func_end sub_806B830
thumb_func_end GetSecretBaseTrainerPicIndex
thumb_func_start sub_806B870
sub_806B870: @ 806B870
thumb_func_start GetSecretBaseTrainerNameIndex
GetSecretBaseTrainerNameIndex: @ 806B870
push {r4,r5,lr}
ldr r5, =gUnknown_08329EB8
ldr r5, =gSecretBaseTrainerClasses
ldr r0, =gBattleResources
ldr r0, [r0]
ldr r4, [r0]
@@ -3450,10 +3450,10 @@ sub_806B870: @ 806B870
pop {r1}
bx r1
.pool
thumb_func_end sub_806B870
thumb_func_end GetSecretBaseTrainerNameIndex
thumb_func_start sub_806B8B0
sub_806B8B0: @ 806B8B0
thumb_func_start PlayerPartyAndPokemonStorageFull
PlayerPartyAndPokemonStorageFull: @ 806B8B0
push {r4,lr}
movs r4, 0
_0806B8B4:
@@ -3473,17 +3473,17 @@ _0806B8D0:
adds r4, 0x1
cmp r4, 0x5
ble _0806B8B4
bl sub_806B8E4
bl PokemonStorageFull
lsls r0, 24
lsrs r0, 24
_0806B8DE:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_806B8B0
thumb_func_end PlayerPartyAndPokemonStorageFull
thumb_func_start sub_806B8E4
sub_806B8E4: @ 806B8E4
thumb_func_start PokemonStorageFull
PokemonStorageFull: @ 806B8E4
push {r4-r6,lr}
movs r6, 0
_0806B8E8:
@@ -3494,7 +3494,7 @@ _0806B8EC:
lsrs r1, 24
lsrs r0, r5, 24
movs r2, 0xB
bl get_pokemon_data_from_any_box
bl GetBoxMonDataFromAnyBox
cmp r0, 0
bne _0806B900
movs r0, 0
@@ -3511,7 +3511,7 @@ _0806B90E:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_806B8E4
thumb_func_end PokemonStorageFull
thumb_func_start GetSpeciesName
@ void GetSpeciesName(u8 *dest, u16 speciesId)
@@ -3559,9 +3559,9 @@ _0806B954:
bx r0
thumb_func_end GetSpeciesName
thumb_func_start CalcPPWithPPUps
@ u16 CalcPPWithPPUps(u16 moveId, s32 ppUpCounts, u8 monMoveIndex)
CalcPPWithPPUps: @ 806B960
thumb_func_start CalculatePPWithBonus
@ u16 CalculatePPWithBonus(u16 moveId, s32 ppUpCounts, u8 monMoveIndex)
CalculatePPWithBonus: @ 806B960
push {r4,lr}
lsls r0, 16
lsrs r0, 16
@@ -3593,10 +3593,10 @@ CalcPPWithPPUps: @ 806B960
pop {r1}
bx r1
.pool
thumb_func_end CalcPPWithPPUps
thumb_func_end CalculatePPWithBonus
thumb_func_start sub_806B9A8
sub_806B9A8: @ 806B9A8
thumb_func_start RemoveMonPPBonus
RemoveMonPPBonus: @ 806B9A8
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -3624,10 +3624,10 @@ sub_806B9A8: @ 806B9A8
pop {r0}
bx r0
.pool
thumb_func_end sub_806B9A8
thumb_func_end RemoveMonPPBonus
thumb_func_start sub_806B9E4
sub_806B9E4: @ 806B9E4
thumb_func_start RemoveBattleMonPPBonus
RemoveBattleMonPPBonus: @ 806B9E4
lsls r1, 24
lsrs r1, 24
adds r0, 0x3B
@@ -3639,10 +3639,10 @@ sub_806B9E4: @ 806B9E4
strb r1, [r0]
bx lr
.pool
thumb_func_end sub_806B9E4
thumb_func_end RemoveBattleMonPPBonus
thumb_func_start battle_data_fill
battle_data_fill: @ 806B9FC
thumb_func_start CopyPlayerPartyMonToBattleData
CopyPlayerPartyMonToBattleData: @ 806B9FC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3925,7 +3925,7 @@ _0806BA4E:
ldrh r0, [r7]
ldrb r1, [r7, 0x17]
lsrs r1, 7
bl sub_806B694
bl GetAbilityBySpecies
adds r1, r7, 0
adds r1, 0x20
strb r0, [r1]
@@ -3987,6 +3987,6 @@ _0806BCB2:
pop {r0}
bx r0
.pool
thumb_func_end battle_data_fill
thumb_func_end CopyPlayerPartyMonToBattleData
.align 2, 0 @ Don't pad with nop.
asm/pokemon_3.s
+127 -2084
View File
File diff suppressed because it is too large Load Diff
asm/front_pic_anim.s → asm/pokemon_animation.s
View File
asm/pokemon_item_effect.s
+1967
View File
File diff suppressed because it is too large Load Diff
asm/record_mixing.s
+12 -12
View File
@@ -110,7 +110,7 @@ sub_80E6CA0: @ 80E6CA0
ldr r2, =0x00001124
adds r1, r5, r2
bl sub_81659DC
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _080E6D1C
@@ -182,7 +182,7 @@ sub_80E6D54: @ 80E6D54
bl sub_81659DC
adds r0, r4, 0
bl TaskDummy4
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _080E6DEE
@@ -278,7 +278,7 @@ _080E6E60:
ldr r0, [r5]
adds r0, r4
bl sub_80E8AC0
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _080E6EFA
@@ -470,7 +470,7 @@ sub_80E70F4: @ 80E70F4
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl Print
bl PrintTextOnWindow
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -999,7 +999,7 @@ _080E75AC:
b _080E75FC
.pool
_080E75D0:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _080E75FC
@@ -1291,7 +1291,7 @@ sub_80E7808: @ 80E7808
thumb_func_start sub_80E7810
sub_80E7810: @ 80E7810
push {lr}
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1405,7 +1405,7 @@ sub_80E78C4: @ 80E78C4
muls r0, r1
mov r2, r9
adds r6, r2, r0
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
@@ -1481,7 +1481,7 @@ sub_80E7948: @ 80E7948
cmp r0, 0x1
bne _080E79FE
adds r7, r6, 0
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
ldr r1, [r5]
lsls r0, r1, 3
subs r0, r1
@@ -1567,7 +1567,7 @@ sub_80E7A14: @ 80E7A14
ldr r1, [r6]
movs r2, 0x40
bl memcpy
bl sub_818D9AC
bl GetLilycoveLadyId
lsls r0, 24
cmp r0, 0
bne _080E7A60
@@ -1735,7 +1735,7 @@ sub_80E7B60: @ 80E7B60
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x38]
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
ldrh r0, [r0, 0x4]
bl SeedRng2
bl sub_8009FCC
@@ -1797,7 +1797,7 @@ _080E7BF8:
muls r0, r1
ldr r2, [sp, 0x2C]
adds r7, r2, r0
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
mov r3, r8
lsls r0, r3, 3
subs r0, r3
@@ -2280,7 +2280,7 @@ sub_80E7F68: @ 80E7F68
ldrh r1, [r4]
bl VarSet
ldr r0, =gStringVar1
ldr r1, =gUnknown_020229F0
ldr r1, =gLinkPlayers + 8
bl StringCopy
ldrh r1, [r4]
ldr r0, =0x00000113
asm/rom_8184DA4.s → asm/recorded_battle.s
+37 -37
View File
@@ -122,7 +122,7 @@ _08184EAC:
ands r5, r0
cmp r5, 0
beq _08184F64
bl link_get_multiplayer_id
bl GetMultiplayerId
ldr r1, =gUnknown_0203C7B4
strb r0, [r1]
bl sub_8009FCC
@@ -132,7 +132,7 @@ _08184EAC:
movs r5, 0
ldr r0, =gUnknown_0203CC80
mov r9, r0
ldr r6, =gUnknown_020229E8
ldr r6, =gLinkPlayers
movs r0, 0x8
adds r0, r6
mov r8, r0
@@ -174,7 +174,7 @@ _08184EDC:
.pool
_08184F3C:
adds r5, 0x1
ldr r0, =gUnknown_020229F0
ldr r0, =gLinkPlayers + 8
adds r1, r3, r0
ldr r0, =gUnknown_0203CC84
adds r2, r4, r0
@@ -495,7 +495,7 @@ sub_81851A8: @ 81851A8
cmp r0, 0
beq _0818525E
movs r5, 0
ldr r4, =gUnknown_020229E8
ldr r4, =gLinkPlayers
b _081851DA
.pool
_081851D0:
@@ -873,12 +873,12 @@ _081854DC:
adds r0, r7, r3
str r2, [r0]
_081854E2:
ldr r4, =gUnknown_02038BCA
ldr r4, =gTrainerBattleOpponent_A
ldrh r1, [r4]
ldr r5, =0x000004f4
adds r0, r7, r5
strh r1, [r0]
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
ldrh r1, [r0]
ldr r2, =0x000004f6
adds r0, r7, r2
@@ -944,7 +944,7 @@ _081854E2:
str r0, [r1]
ldr r4, =0xfffffed4
adds r1, r4, 0
ldr r5, =gUnknown_02038BCA
ldr r5, =gTrainerBattleOpponent_A
ldrh r5, [r5]
adds r0, r1, r5
lsls r0, 16
@@ -957,7 +957,7 @@ _08185580:
ldr r0, =0x00000504
adds r3, r7, r0
mov r10, r9
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
mov r12, r1
adds r2, r4, 0
mov r8, r2
@@ -981,7 +981,7 @@ _08185592:
ble _08185592
mov r0, r9
ldr r2, [r0]
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
ldrh r0, [r1]
ldr r3, =0xfffffed4
adds r0, r3
@@ -1002,7 +1002,7 @@ _08185592:
ldr r2, =0x0000050e
adds r4, r7, r2
mov r10, r9
ldr r5, =gUnknown_02038BCA
ldr r5, =gTrainerBattleOpponent_A
mov r8, r5
adds r5, r3, 0
_081855E6:
@@ -1032,7 +1032,7 @@ _08185664:
ldr r1, =0x0000050e
adds r4, r7, r1
mov r10, r9
ldr r2, =gUnknown_02038BCA
ldr r2, =gTrainerBattleOpponent_A
mov r8, r2
adds r5, r3, 0
_08185672:
@@ -1057,7 +1057,7 @@ _08185672:
_08185696:
mov r1, r9
ldr r2, [r1]
ldr r3, =gUnknown_02038BCA
ldr r3, =gTrainerBattleOpponent_A
ldrh r0, [r3]
ldr r4, =0xfffffed4
adds r0, r4
@@ -1070,7 +1070,7 @@ _08185696:
b _08185856
.pool
_081856C4:
ldr r3, =gUnknown_02038BCC
ldr r3, =gTrainerBattleOpponent_B
ldrh r3, [r3]
adds r0, r1, r3
lsls r0, 16
@@ -1083,7 +1083,7 @@ _081856D4:
ldr r4, =0x00000504
adds r3, r7, r4
mov r10, r9
ldr r5, =gUnknown_02038BCC
ldr r5, =gTrainerBattleOpponent_B
mov r12, r5
ldr r0, =0xfffffed4
mov r8, r0
@@ -1107,7 +1107,7 @@ _081856E6:
ble _081856E6
mov r0, r9
ldr r2, [r0]
ldr r1, =gUnknown_02038BCC
ldr r1, =gTrainerBattleOpponent_B
ldrh r0, [r1]
ldr r3, =0xfffffed4
adds r0, r3
@@ -1128,7 +1128,7 @@ _081856E6:
ldr r2, =0x0000050e
adds r4, r7, r2
mov r10, r9
ldr r5, =gUnknown_02038BCC
ldr r5, =gTrainerBattleOpponent_B
mov r8, r5
adds r5, r3, 0
_0818573A:
@@ -1158,7 +1158,7 @@ _08185784:
ldr r1, =0x0000050e
adds r4, r7, r1
mov r10, r9
ldr r2, =gUnknown_02038BCC
ldr r2, =gTrainerBattleOpponent_B
mov r8, r2
adds r5, r3, 0
_08185792:
@@ -1183,7 +1183,7 @@ _08185792:
_081857B6:
mov r1, r9
ldr r2, [r1]
ldr r3, =gUnknown_02038BCC
ldr r3, =gTrainerBattleOpponent_B
ldrh r0, [r3]
ldr r4, =0xfffffed4
adds r0, r4
@@ -1259,7 +1259,7 @@ _08185856:
adds r0, r7, r2
strb r1, [r0]
_0818585C:
ldr r3, =gUnknown_02038BCA
ldr r3, =gTrainerBattleOpponent_A
ldrh r0, [r3]
ldr r1, =0x0000018f
cmp r0, r1
@@ -1284,7 +1284,7 @@ _0818585C:
ldr r0, =0x0000050e
adds r4, r7, r0
mov r10, r9
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
mov r8, r1
adds r5, r3, 0
_08185894:
@@ -1310,14 +1310,14 @@ _08185894:
ble _08185894
mov r3, r9
ldr r2, [r3]
ldr r4, =gUnknown_02038BCA
ldr r4, =gTrainerBattleOpponent_A
ldrh r1, [r4]
ldr r5, =0xfffffe70
adds r1, r5
b _081859AC
.pool
_08185900:
ldr r3, =gUnknown_02038BCC
ldr r3, =gTrainerBattleOpponent_B
ldrh r0, [r3]
cmp r0, r1
bls _0818597C
@@ -1341,7 +1341,7 @@ _08185900:
ldr r0, =0x0000050e
adds r4, r7, r0
mov r10, r9
ldr r1, =gUnknown_02038BCC
ldr r1, =gTrainerBattleOpponent_B
mov r8, r1
adds r5, r3, 0
_08185936:
@@ -1367,7 +1367,7 @@ _08185936:
ble _08185936
mov r3, r9
ldr r2, [r3]
ldr r4, =gUnknown_02038BCC
ldr r4, =gTrainerBattleOpponent_B
ldrh r1, [r4]
ldr r5, =0xfffffe70
adds r1, r5
@@ -1542,9 +1542,9 @@ sub_8185AB0: @ 8185AB0
ldr r0, =gBattleTypeFlags
movs r1, 0
str r1, [r0]
ldr r0, =gUnknown_02038BCA
ldr r0, =gTrainerBattleOpponent_A
strh r1, [r0]
ldr r0, =gUnknown_02038BCC
ldr r0, =gTrainerBattleOpponent_B
strh r1, [r0]
ldr r0, =gUnknown_02038BCE
strh r1, [r0]
@@ -1624,7 +1624,7 @@ _08185B7C:
cmp r6, 0x5
ble _08185B7C
movs r6, 0
ldr r3, =gUnknown_020229E8
ldr r3, =gLinkPlayers
mov r8, r3
mov r0, r8
adds r0, 0x8
@@ -1715,12 +1715,12 @@ _08185C2A:
lsls r1, 17
orrs r0, r1
str r0, [r2]
ldr r1, =gUnknown_02038BCA
ldr r1, =gTrainerBattleOpponent_A
ldr r2, =0x000004f4
adds r0, r7, r2
ldrh r0, [r0]
strh r0, [r1]
ldr r1, =gUnknown_02038BCC
ldr r1, =gTrainerBattleOpponent_B
adds r3, 0xE
adds r0, r7, r3
ldrh r0, [r0]
@@ -2007,7 +2007,7 @@ _08185F02:
sub_8185F40: @ 8185F40
push {r4,r5,lr}
movs r2, 0
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
ldr r3, =gActiveBank
ldrh r1, [r0, 0x18]
adds r4, r0, 0
@@ -2115,7 +2115,7 @@ sub_8185FD0: @ 8185FD0
movs r3, 0
ldr r7, =gUnknown_0203CC70
adds r6, r4, 0
ldr r5, =gUnknown_02024090
ldr r5, =gBattleMons + 0xC
movs r4, 0x58
_08186000:
lsls r2, r3, 1
@@ -2192,7 +2192,7 @@ _0818608A:
movs r1, 0x58
mov r0, r10
muls r0, r1
ldr r3, =gUnknown_02024090
ldr r3, =gBattleMons + 0xC
adds r1, r0, r3
_081860AA:
ldrh r0, [r1]
@@ -2227,7 +2227,7 @@ _081860DE:
lsls r0, r5, 1
adds r5, 0x1
adds r0, r7
ldr r1, =gUnknown_02024090
ldr r1, =gBattleMons + 0xC
adds r3, r0, r1
lsls r0, r4, 3
mov r6, r8
@@ -2341,7 +2341,7 @@ _081861A6:
adds r1, r2, r5
ldrb r0, [r4]
adds r0, r7
ldr r3, =gUnknown_020240A8
ldr r3, =gBattleMons + 0x24
adds r0, r3
ldrb r0, [r0]
strb r0, [r1]
@@ -2638,13 +2638,13 @@ _081863FC:
.pool
thumb_func_end sub_818603C
thumb_func_start sub_8186438
sub_8186438: @ 8186438
thumb_func_start GetAiScriptsInRecordedBattle
GetAiScriptsInRecordedBattle: @ 8186438
ldr r0, =gUnknown_0203C7BC
ldr r0, [r0]
bx lr
.pool
thumb_func_end sub_8186438
thumb_func_end GetAiScriptsInRecordedBattle
thumb_func_start sub_8186444
sub_8186444: @ 8186444
asm/region_map.s
+8 -8
View File
@@ -1571,7 +1571,7 @@ _08123904:
_08123928:
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
ldr r3, =gUnknown_02037318
ldr r3, =gMapHeader
ldrb r1, [r3, 0x14]
movs r2, 0
strh r1, [r0]
@@ -1599,7 +1599,7 @@ _08123956:
b _08123ABE
.pool
_0812396C:
ldr r2, =gUnknown_02037318
ldr r2, =gMapHeader
ldrb r1, [r2, 0x1A]
movs r0, 0x2
ands r0, r1
@@ -1685,7 +1685,7 @@ _081239E4:
_08123A28:
ldr r4, =gUnknown_0203A144
ldr r0, [r4]
ldr r1, =gUnknown_02037318
ldr r1, =gMapHeader
ldrb r1, [r1, 0x14]
strh r1, [r0]
cmp r1, 0x57
@@ -2811,7 +2811,7 @@ sub_8124288: @ 8124288
str r0, [sp, 0x10]
ldr r0, =SpriteCallbackDummy
str r0, [sp, 0x14]
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x14]
bl sub_8124668
cmp r0, 0
@@ -3461,7 +3461,7 @@ _0812480C:
movs r0, 0x2
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
b _0812489C
@@ -3607,7 +3607,7 @@ _08124926:
movs r0, 0x1
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0xB]
ldr r1, [r4]
@@ -3628,7 +3628,7 @@ _08124926:
movs r0, 0x1
movs r1, 0x1
adds r2, r4, 0
bl Print
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =gUnknown_03001180
@@ -3674,7 +3674,7 @@ _081249FC:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =gUnknown_03001180
asm/reset_rtc_screen.s
+5 -5
View File
@@ -460,7 +460,7 @@ sub_809EBC4: @ 809EBC4
mov r0, r10
movs r1, 0x1
ldr r3, [sp, 0xC]
bl Print
bl PrintTextOnWindow
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -523,7 +523,7 @@ sub_809ECB4: @ 809ECB4
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x7E
bl Print
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0xC
@@ -976,7 +976,7 @@ sub_809F0C0: @ 809F0C0
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl Print
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0xC
@@ -1020,7 +1020,7 @@ _0809F11C:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r1, =gLocalTime
ldrh r3, [r1]
ldrb r0, [r1, 0x2]
@@ -1041,7 +1041,7 @@ _0809F11C:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
adds r0, r1, 0
asm/reshow_battle_screen.s
+3 -3
View File
@@ -905,7 +905,7 @@ _080A9B1E:
_080A9B24:
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r4, r5, r0
strb r6, [r4]
adds r0, r5, 0
@@ -976,7 +976,7 @@ _080A9BB8:
cmp r0, 0x2
bne _080A9BF0
_080A9BD4:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0x1
@@ -984,7 +984,7 @@ _080A9BD4:
b _080A9BFC
.pool
_080A9BF0:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0
asm/roamer.s
+502
View File
@@ -0,0 +1,502 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ClearRoamerData
ClearRoamerData: @ 8161B34
push {r4,r5,lr}
ldr r5, =gSaveBlock1Ptr
ldr r0, [r5]
ldr r4, =0x000031dc
adds r0, r4
movs r1, 0
movs r2, 0x1C
bl memset
ldr r0, [r5]
adds r0, r4
ldr r1, =0x00000197
strh r1, [r0, 0x8]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end ClearRoamerData
thumb_func_start ClearRoamerLocationData
ClearRoamerLocationData: @ 8161B60
push {r4-r6,lr}
movs r2, 0
ldr r6, =sRoamerLocation
ldr r4, =sLocationHistory
movs r3, 0
adds r5, r4, 0x1
_08161B6C:
lsls r1, r2, 1
adds r0, r1, r4
strb r3, [r0]
adds r1, r5
strb r3, [r1]
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x2
bls _08161B6C
movs r0, 0
strb r0, [r6]
strb r0, [r6, 0x1]
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end ClearRoamerLocationData
thumb_func_start CreateInitialRoamerMon
CreateInitialRoamerMon: @ 8161B94
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x10
lsls r0, 16
cmp r0, 0
bne _08161BBC
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, =0x000031dc
adds r1, r2
ldr r2, =0x00000197
b _08161BC8
.pool
_08161BBC:
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, =0x000031dc
adds r1, r2
movs r2, 0xCC
lsls r2, 1
_08161BC8:
strh r2, [r1, 0x8]
adds r7, r0, 0
ldr r6, =gEnemyParty
ldr r0, [r7]
ldr r5, =0x000031dc
adds r0, r5
ldrh r1, [r0, 0x8]
movs r4, 0
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
str r4, [sp, 0xC]
adds r0, r6, 0
movs r2, 0x28
movs r3, 0x20
bl CreateMon
ldr r0, [r7]
adds r0, r5
movs r1, 0x28
strb r1, [r0, 0xC]
ldr r0, [r7]
adds r0, r5
strb r4, [r0, 0xD]
ldr r0, [r7]
adds r0, r5
movs r1, 0x1
strb r1, [r0, 0x13]
adds r0, r6, 0
movs r1, 0x42
bl GetMonData
ldr r1, [r7]
adds r1, r5
str r0, [r1]
adds r0, r6, 0
movs r1, 0
bl GetMonData
ldr r1, [r7]
adds r1, r5
str r0, [r1, 0x4]
adds r0, r6, 0
movs r1, 0x3A
bl GetMonData
ldr r1, [r7]
adds r1, r5
movs r2, 0
mov r8, r2
strh r0, [r1, 0xA]
adds r0, r6, 0
movs r1, 0x16
bl GetMonData
ldr r1, [r7]
adds r1, r5
strb r0, [r1, 0xE]
adds r0, r6, 0
movs r1, 0x17
bl GetMonData
ldr r1, [r7]
adds r1, r5
strb r0, [r1, 0xF]
adds r0, r6, 0
movs r1, 0x18
bl GetMonData
ldr r1, [r7]
adds r1, r5
strb r0, [r1, 0x10]
adds r0, r6, 0
movs r1, 0x21
bl GetMonData
ldr r1, [r7]
adds r1, r5
strb r0, [r1, 0x11]
adds r0, r6, 0
movs r1, 0x2F
bl GetMonData
ldr r1, [r7]
adds r1, r5
strb r0, [r1, 0x12]
ldr r4, =sRoamerLocation
mov r0, r8
strb r0, [r4]
bl Random
ldr r5, =sRoamerLocations
lsls r0, 16
lsrs r0, 16
movs r1, 0x14
bl __umodsi3
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 1
adds r1, r0
lsls r1, 1
adds r1, r5
ldrb r0, [r1]
strb r0, [r4, 0x1]
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end CreateInitialRoamerMon
thumb_func_start InitRoamer
InitRoamer: @ 8161CBC
push {lr}
bl ClearRoamerData
bl ClearRoamerLocationData
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
bl CreateInitialRoamerMon
pop {r0}
bx r0
.pool
thumb_func_end InitRoamer
thumb_func_start UpdateLocationHistoryForRoamer
UpdateLocationHistoryForRoamer: @ 8161CD8
ldr r0, =sLocationHistory
ldrb r1, [r0, 0x2]
strb r1, [r0, 0x4]
ldrb r1, [r0, 0x3]
strb r1, [r0, 0x5]
ldrb r1, [r0]
strb r1, [r0, 0x2]
ldrb r1, [r0, 0x1]
strb r1, [r0, 0x3]
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
ldrb r1, [r2, 0x4]
strb r1, [r0]
ldrb r1, [r2, 0x5]
strb r1, [r0, 0x1]
bx lr
.pool
thumb_func_end UpdateLocationHistoryForRoamer
thumb_func_start RoamerMoveToOtherLocationSet
RoamerMoveToOtherLocationSet: @ 8161D00
push {r4,r5,lr}
movs r1, 0
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x000031dc
adds r0, r2
ldrb r0, [r0, 0x13]
cmp r0, 0
beq _08161D3E
ldr r0, =sRoamerLocation
strb r1, [r0]
ldr r5, =sRoamerLocations
adds r4, r0, 0
_08161D1A:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x14
bl __umodsi3
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 1
adds r1, r0
lsls r1, 1
adds r1, r5
ldrb r1, [r1]
ldrb r0, [r4, 0x1]
cmp r0, r1
beq _08161D1A
strb r1, [r4, 0x1]
_08161D3E:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end RoamerMoveToOtherLocationSet
thumb_func_start RoamerMove
RoamerMove: @ 8161D54
push {r4-r7,lr}
movs r4, 0
bl Random
lsls r0, 16
movs r1, 0xF0
lsls r1, 12
ands r1, r0
cmp r1, 0
bne _08161D6E
bl RoamerMoveToOtherLocationSet
b _08161DE2
_08161D6E:
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000031dc
adds r0, r1
ldrb r0, [r0, 0x13]
cmp r0, 0
beq _08161DE2
ldr r7, =sRoamerLocation
ldr r3, =sRoamerLocations
_08161D80:
lsls r0, r4, 1
adds r0, r4
lsls r2, r0, 1
adds r1, r2, r3
ldrb r0, [r7, 0x1]
ldrb r1, [r1]
cmp r0, r1
bne _08161DD8
ldr r6, =sRoamerLocations
adds r5, r2, 0x1
ldr r4, =sLocationHistory
_08161D96:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
bl __umodsi3
lsls r0, 16
lsrs r0, 16
adds r0, r5
adds r0, r6
ldrb r1, [r0]
ldrb r0, [r4, 0x4]
cmp r0, 0
bne _08161DBA
ldrb r0, [r4, 0x5]
cmp r0, r1
beq _08161D96
_08161DBA:
cmp r1, 0xFF
beq _08161D96
strb r1, [r7, 0x1]
b _08161DE2
.pool
_08161DD8:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x13
bls _08161D80
_08161DE2:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end RoamerMove
thumb_func_start IsRoamerAt
IsRoamerAt: @ 8161DE8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
lsls r1, 24
lsrs r1, 24
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, =0x000031dc
adds r0, r3
ldrb r0, [r0, 0x13]
cmp r0, 0
beq _08161E20
ldr r0, =sRoamerLocation
ldrb r3, [r0]
cmp r2, r3
bne _08161E20
ldrb r0, [r0, 0x1]
cmp r1, r0
bne _08161E20
movs r0, 0x1
b _08161E22
.pool
_08161E20:
movs r0, 0
_08161E22:
pop {r1}
bx r1
thumb_func_end IsRoamerAt
thumb_func_start CreateRoamerMonInstance
CreateRoamerMonInstance: @ 8161E28
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =gEnemyParty
bl ZeroEnemyPartyMons
ldr r4, =gSaveBlock1Ptr
ldr r0, [r4]
ldr r1, =0x000031dc
adds r0, r1
ldrh r1, [r0, 0x8]
ldrb r2, [r0, 0xC]
ldr r3, [r0]
ldr r0, [r0, 0x4]
str r0, [sp]
adds r0, r5, 0
bl CreateMonWithIVsPersonality
ldr r2, [r4]
ldr r0, =0x000031e9
adds r2, r0
adds r0, r5, 0
movs r1, 0x37
bl SetMonData
ldr r2, [r4]
ldr r1, =0x000031e6
adds r2, r1
adds r0, r5, 0
movs r1, 0x39
bl SetMonData
ldr r2, [r4]
ldr r0, =0x000031ea
adds r2, r0
adds r0, r5, 0
movs r1, 0x16
bl SetMonData
ldr r2, [r4]
ldr r1, =0x000031eb
adds r2, r1
adds r0, r5, 0
movs r1, 0x17
bl SetMonData
ldr r2, [r4]
ldr r0, =0x000031ec
adds r2, r0
adds r0, r5, 0
movs r1, 0x18
bl SetMonData
ldr r2, [r4]
ldr r1, =0x000031ed
adds r2, r1
adds r0, r5, 0
movs r1, 0x21
bl SetMonData
ldr r2, [r4]
ldr r0, =0x000031ee
adds r2, r0
adds r0, r5, 0
movs r1, 0x2F
bl SetMonData
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end CreateRoamerMonInstance
thumb_func_start TryStartRoamerEncounter
TryStartRoamerEncounter: @ 8161EDC
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldrb r0, [r1, 0x4]
ldrb r1, [r1, 0x5]
bl IsRoamerAt
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08161F10
bl Random
lsls r0, 16
movs r1, 0xC0
lsls r1, 10
ands r1, r0
cmp r1, 0
bne _08161F10
bl CreateRoamerMonInstance
movs r0, 0x1
b _08161F12
.pool
_08161F10:
movs r0, 0
_08161F12:
pop {r1}
bx r1
thumb_func_end TryStartRoamerEncounter
thumb_func_start UpdateRoamerHPStatus
UpdateRoamerHPStatus: @ 8161F18
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x39
bl GetMonData
ldr r5, =gSaveBlock1Ptr
ldr r1, [r5]
ldr r4, =0x000031dc
adds r1, r4
strh r0, [r1, 0xA]
adds r0, r6, 0
movs r1, 0x37
bl GetMonData
ldr r1, [r5]
adds r1, r4
strb r0, [r1, 0xD]
bl RoamerMoveToOtherLocationSet
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end UpdateRoamerHPStatus
thumb_func_start SetRoamerInactive
SetRoamerInactive: @ 8161F4C
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000031dc
adds r0, r1
movs r1, 0
strb r1, [r0, 0x13]
bx lr
.pool
thumb_func_end SetRoamerInactive
thumb_func_start GetRoamerLocation
GetRoamerLocation: @ 8161F64
ldr r3, =sRoamerLocation
ldrb r2, [r3]
strb r2, [r0]
ldrb r0, [r3, 0x1]
strb r0, [r1]
bx lr
.pool
thumb_func_end GetRoamerLocation
.align 2, 0 @ Don't pad with nop.
asm/rom3.s
+15 -15
View File
@@ -96,7 +96,7 @@ _080326B8:
adds r0, r4, 0
movs r2, 0x2
movs r3, 0x20
bl create_pokemon_set_level
bl CreateMon
str r5, [sp, 0x10]
adds r0, r4, 0
movs r1, 0xC
@@ -294,7 +294,7 @@ _080328F0:
cmp r1, 0
beq _08032918
ldr r1, =gBattleBankFunc
ldr r0, =sub_815936C
ldr r0, =SetBankFuncToSafariBufferRunCommand
b _08032934
.pool
_08032918:
@@ -468,7 +468,7 @@ _08032AAA:
ldrb r5, [r0]
movs r0, 0
mov r10, r0
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
mov r12, r1
adds r7, r4, 0
mov r8, r0
@@ -492,7 +492,7 @@ _08032AE4:
cmp r0, 0x3
bne _08032B06
_08032AE8:
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
adds r0, r4, r0
ldrb r0, [r0, 0x18]
movs r1, 0
@@ -507,7 +507,7 @@ _08032AFC:
_08032B06:
cmp r10, r5
bne _08032B56
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
adds r3, r4, r0
ldrh r1, [r3, 0x18]
lsls r1, 2
@@ -544,7 +544,7 @@ _08032B4C:
ldrh r0, [r3, 0x18]
b _08032C24
_08032B56:
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
adds r0, r4, r2
ldrh r1, [r0, 0x18]
movs r3, 0x1
@@ -895,7 +895,7 @@ _08032E2E:
b _0803303C
.pool
_08032E8C:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r5, r0, 24
ldr r0, [r4]
@@ -909,7 +909,7 @@ _08032E8C:
_08032EA4:
movs r0, 0
mov r10, r0
ldr r1, =gUnknown_020229E8
ldr r1, =gLinkPlayers
mov r12, r1
ldr r7, =gBanksBySide
mov r8, r0
@@ -933,7 +933,7 @@ _08032EE0:
cmp r0, 0x3
bne _08032F02
_08032EE4:
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
adds r0, r4, r0
ldrb r0, [r0, 0x18]
movs r1, 0
@@ -948,7 +948,7 @@ _08032EF8:
_08032F02:
cmp r10, r5
bne _08032F52
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
adds r3, r4, r0
ldrh r1, [r3, 0x18]
lsls r1, 2
@@ -985,7 +985,7 @@ _08032F48:
ldrh r0, [r3, 0x18]
b _08033020
_08032F52:
ldr r2, =gUnknown_020229E8
ldr r2, =gLinkPlayers
adds r0, r4, r2
ldrh r1, [r0, 0x18]
movs r3, 0x1
@@ -2600,7 +2600,7 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4
ldrh r0, [r0]
mov r1, r12
strh r0, [r1, 0x2]
ldr r0, =gUnknown_02024208
ldr r0, =gLastUsedItem
ldrh r0, [r0]
strh r0, [r1, 0x4]
ldr r0, =gLastUsedAbility
@@ -2633,7 +2633,7 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4
strb r0, [r7, 0xB]
movs r3, 0
mov r9, r2
ldr r0, =gUnknown_02022F78
ldr r0, =gBattleTextBuff3
mov r8, r0
adds r2, 0x10
ldr r0, =gBattleMons
@@ -2715,7 +2715,7 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC
ldrh r0, [r0]
mov r1, r12
strh r0, [r1, 0x2]
ldr r0, =gUnknown_02024208
ldr r0, =gLastUsedItem
ldrh r0, [r0]
strh r0, [r1, 0x4]
ldr r0, =gLastUsedAbility
@@ -2731,7 +2731,7 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC
strb r0, [r1, 0x8]
movs r3, 0
mov r9, r2
ldr r7, =gUnknown_02022F78
ldr r7, =gBattleTextBuff3
mov r8, r7
mov r4, r9
adds r4, 0x10
asm/rom4.s
+55 -55
View File
@@ -16,7 +16,7 @@ sub_8084620: @ 8084620
lsls r0, 3
adds r4, r0
adds r0, r4, 0
bl DecryptMoney
bl GetMoney
adds r1, r0, 0
lsrs r1, 1
adds r0, r4, 0
@@ -131,8 +131,8 @@ sub_8084788: @ 8084788
bl FlagReset
bl sub_8085B2C
bl wild_pokemon_reroll
bl mapnumbers_history_shift_sav1_0_2_4_out
bl sub_8161D00
bl UpdateLocationHistoryForRoamer
bl RoamerMoveToOtherLocationSet
pop {r0}
bx r0
.pool
@@ -238,8 +238,8 @@ _08084854:
.pool
thumb_func_end sav12_xor_set
thumb_func_start sub_8084864
sub_8084864: @ 8084864
thumb_func_start ApplyNewEncyprtionKeyToGameStats
ApplyNewEncyprtionKeyToGameStats: @ 8084864
push {r4-r6,lr}
adds r5, r0, 0
movs r4, 0
@@ -251,7 +251,7 @@ _0808486C:
ldr r0, [r6]
adds r0, r1
adds r1, r5, 0
bl apply_u32_xor_crypto
bl ApplyNewEncyprtionKeyToWord
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -261,7 +261,7 @@ _0808486C:
pop {r0}
bx r0
.pool
thumb_func_end sub_8084864
thumb_func_end ApplyNewEncyprtionKeyToGameStats
thumb_func_start CopyFieldObjectTemplatesToSav1
@ void CopyFieldObjectTemplatesToSav1()
@@ -278,7 +278,7 @@ CopyFieldObjectTemplatesToSav1: @ 8084894
ldr r2, =0x05000180
mov r0, sp
bl CpuSet
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r2, [r0, 0x4]
ldr r0, [r2, 0x4]
ldr r1, [r5]
@@ -302,7 +302,7 @@ CopyFieldObjectTemplatesToSav1: @ 8084894
@ void CopyFieldObjectTemplateCoordsToSav1()
CopyFieldObjectTemplateCoordsToSav1: @ 80848E0
push {lr}
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r1, [r0, 0x4]
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
@@ -393,7 +393,7 @@ _08084978:
mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980
push {r4,lr}
bl move_tilemap_camera_to_upper_left_corner
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
ldr r0, [r4]
bl copy_map_tileset1_tileset2_to_vram
ldr r0, [r4]
@@ -571,7 +571,7 @@ warp1_get_mapheader: @ 8084AA8
set_current_map_header_from_sav1_save_old_name: @ 8084ACC
push {r4-r6,lr}
ldr r1, =gUnknown_020322FC
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
ldrb r0, [r4, 0x14]
strh r0, [r1]
ldr r5, =gSaveBlock1Ptr
@@ -607,7 +607,7 @@ set_current_map_header_from_sav1_save_old_name: @ 8084ACC
thumb_func_start set_current_map_header_from_sav1
set_current_map_header_from_sav1: @ 8084B1C
push {r4,r5,lr}
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0x4
@@ -646,7 +646,7 @@ update_camera_pos_from_warpid: @ 8084B5C
adds r4, r0, 0
cmp r1, 0
blt _08084B94
ldr r3, =gUnknown_02037318
ldr r3, =gMapHeader
ldr r0, [r3, 0x4]
ldrb r5, [r0, 0x1]
cmp r1, r5
@@ -680,7 +680,7 @@ _08084B94:
b _08084BCC
_08084BB0:
ldr r3, [r4]
ldr r2, =gUnknown_02037318
ldr r2, =gMapHeader
ldr r0, [r2]
ldr r0, [r0]
lsrs r1, r0, 31
@@ -1232,7 +1232,7 @@ sub_8084FC0: @ 8084FC0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0, 0xC]
ldr r3, [r0]
ldr r1, [r0, 0x4]
@@ -1366,7 +1366,7 @@ mliX_load_map: @ 8085098
str r3, [sp]
adds r2, r3, 0
bl warp1_set
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
ldrb r0, [r4, 0x14]
cmp r0, 0x3A
beq _080850C8
@@ -1402,12 +1402,12 @@ _08085116:
cmp r4, 0xC
ble _08085116
bl sub_80A0A2C
bl mapnumbers_history_shift_sav1_0_2_4_out
bl sub_8161D54
bl UpdateLocationHistoryForRoamer
bl RoamerMove
bl sub_80AEE20
bl wild_encounter_reset_coro_args
bl mapheader_run_script_with_tag_x5
ldr r2, =gUnknown_02037318
ldr r2, =gMapHeader
ldrb r0, [r2, 0x14]
cmp r0, 0x3A
bne _0808514C
@@ -1436,7 +1436,7 @@ mli0_load_map: @ 8085160
ands r0, r1
cmp r0, 0
bne _080851A2
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrh r1, [r0, 0x12]
ldr r0, =0x00000169
cmp r1, r0
@@ -1453,7 +1453,7 @@ _08085190:
_0808519E:
bl CopyFieldObjectTemplatesToSav1
_080851A2:
ldr r4, =gUnknown_02037318
ldr r4, =gMapHeader
ldrb r0, [r4, 0x17]
bl is_light_level_1_2_3_5_or_6
lsls r0, 24
@@ -1493,8 +1493,8 @@ _08085200:
bl update_sav1_flash_used_on_map
bl sav1_reset_battle_music_maybe
bl mapheader_run_script_with_tag_x3
bl mapnumbers_history_shift_sav1_0_2_4_out
bl sub_8161D00
bl UpdateLocationHistoryForRoamer
bl RoamerMoveToOtherLocationSet
ldrh r1, [r4, 0x12]
ldr r0, =0x00000169
cmp r1, r0
@@ -1802,7 +1802,7 @@ cur_mapdata_block_role_at_screen_center_acc_to_sav1: @ 8085450
thumb_func_start sav1_map_is_biking_allowed
sav1_map_is_biking_allowed: @ 8085474
push {lr}
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r1, [r0, 0x1A]
movs r0, 0x1
ands r0, r1
@@ -1821,7 +1821,7 @@ _0808548E:
thumb_func_start update_sav1_flash_used_on_map
update_sav1_flash_used_on_map: @ 8085494
push {lr}
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r1, [r0, 0x15]
cmp r1, 0
bne _080854B0
@@ -1897,7 +1897,7 @@ sub_8085524: @ 8085524
ldr r1, [r1]
strh r0, [r1, 0x32]
bl get_mapdata_header
ldr r1, =gUnknown_02037318
ldr r1, =gMapHeader
str r0, [r1]
pop {r0}
bx r0
@@ -2592,7 +2592,7 @@ _08085A88:
_08085AA4:
movs r0, 0x1
mov r9, r0
bl calc_player_party_count
bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -3471,7 +3471,7 @@ sub_80861E8: @ 80861E8
thumb_func_start sub_8086204
sub_8086204: @ 8086204
push {lr}
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r1, [r0, 0x1A]
movs r0, 0xF8
ands r0, r1
@@ -3507,7 +3507,7 @@ _0808624A:
bl GetCurrentTrainerHillMapId
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrh r1, [r0, 0x12]
ldr r0, =0x00000169
cmp r1, r0
@@ -3528,7 +3528,7 @@ _0808628A:
bl sub_809757C
bl sub_809E7B0
bl sub_8084788
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrh r1, [r0, 0x12]
ldr r0, =0x00000169
cmp r1, r0
@@ -3713,7 +3713,7 @@ _0808644C:
bl overworld_bg_setup
bl script_env_1_init
bl script_env_2_disable
bl saveblock_randomize_and_relocate_
bl MoveSaveBlocks_ResetHeap_
bl sub_80867D8
b _08086506
_08086462:
@@ -3739,13 +3739,13 @@ _08086492:
bl move_tilemap_camera_to_upper_left_corner
b _08086506
_08086498:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
bl copy_map_tileset1_to_vram
b _08086506
.pool
_080864A8:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
bl copy_map_tileset2_to_vram
b _08086506
@@ -3756,7 +3756,7 @@ _080864B8:
lsrs r0, 24
cmp r0, 0x1
beq _08086512
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
bl apply_map_tileset1_tileset2_palette
b _08086506
@@ -3838,7 +3838,7 @@ _08086570:
bl mli0_load_map
b _08086622
_0808657C:
bl saveblock_randomize_and_relocate_
bl MoveSaveBlocks_ResetHeap_
bl sub_80867D8
b _08086622
_08086586:
@@ -3858,13 +3858,13 @@ _080865A6:
bl move_tilemap_camera_to_upper_left_corner
b _08086622
_080865AC:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
bl copy_map_tileset1_to_vram
b _08086622
.pool
_080865BC:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
bl copy_map_tileset2_to_vram
b _08086622
@@ -3875,7 +3875,7 @@ _080865CC:
lsrs r0, 24
cmp r0, 0x1
beq _0808662E
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
bl apply_map_tileset1_tileset2_palette
b _08086622
@@ -3887,7 +3887,7 @@ _080865EE:
bl cur_mapheader_run_tileset_funcs_after_some_cpuset
b _08086622
_080865F4:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r1, [r0, 0x1A]
movs r0, 0xF8
ands r0, r1
@@ -3941,7 +3941,7 @@ _0808664C:
beq _0808668A
b _0808668E
_08086656:
bl saveblock_randomize_and_relocate_
bl MoveSaveBlocks_ResetHeap_
bl sub_80867D8
movs r0, 0
bl sub_8086988
@@ -4006,7 +4006,7 @@ _080866B4:
.4byte _0808679A
_080866EC:
bl sub_808631C
bl saveblock_randomize_and_relocate_
bl MoveSaveBlocks_ResetHeap_
bl sub_80867D8
b _08086792
_080866FA:
@@ -4027,13 +4027,13 @@ _0808671E:
bl move_tilemap_camera_to_upper_left_corner
b _08086792
_08086724:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
bl copy_map_tileset1_to_vram
b _08086792
.pool
_08086734:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
bl copy_map_tileset2_to_vram
b _08086792
@@ -4044,7 +4044,7 @@ _08086744:
lsrs r0, 24
cmp r0, 0x1
beq _080867A8
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldr r0, [r0]
bl apply_map_tileset1_tileset2_palette
b _08086792
@@ -4106,14 +4106,14 @@ _080867B4:
bx r0
thumb_func_end do_load_map_stuff_loop
thumb_func_start saveblock_randomize_and_relocate_
saveblock_randomize_and_relocate_: @ 80867C8
thumb_func_start MoveSaveBlocks_ResetHeap_
MoveSaveBlocks_ResetHeap_: @ 80867C8
push {lr}
bl sub_81BE6AC
bl saveblock_randomize_and_relocate
bl MoveSaveBlocks_ResetHeap
pop {r0}
bx r0
thumb_func_end saveblock_randomize_and_relocate_
thumb_func_end MoveSaveBlocks_ResetHeap_
thumb_func_start sub_80867D8
sub_80867D8: @ 80867D8
@@ -4490,7 +4490,7 @@ sub_8086B14: @ 8086B14
ldrb r0, [r0]
cmp r6, r0
bcs _08086B7E
ldr r7, =gUnknown_020229E8
ldr r7, =gLinkPlayers
_08086B44:
lsls r5, r6, 24
lsrs r5, 24
@@ -4538,7 +4538,7 @@ sub_8086B9C: @ 8086B9C
ldrb r0, [r0]
cmp r4, r0
bcs _08086BCA
ldr r5, =gUnknown_020229E8
ldr r5, =gLinkPlayers
_08086BAA:
lsls r0, r4, 24
lsrs r0, 24
@@ -5336,7 +5336,7 @@ _080871D4:
cmp r0, 0x1
bne _080871EA
ldr r0, =gUnknown_08277513
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
ldr r0, =sub_80871C0
bl c1_link_related_func_set
_080871EA:
@@ -5774,7 +5774,7 @@ sub_8087530: @ 8087530
movs r0, 0x5
bl PlaySE
adds r0, r4, 0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r4}
pop {r0}
@@ -5787,7 +5787,7 @@ sub_808754C: @ 808754C
movs r0, 0x6
bl PlaySE
ldr r0, =gUnknown_082774EF
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r0}
bx r0
@@ -5801,7 +5801,7 @@ sub_8087568: @ 8087568
movs r0, 0x5
bl PlaySE
adds r0, r4, 0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r4}
pop {r0}
@@ -5812,7 +5812,7 @@ sub_8087568: @ 8087568
sub_8087584: @ 8087584
push {lr}
ldr r0, =gUnknown_08277509
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r0}
bx r0
asm/rom6.s
+43 -43
View File
@@ -88,7 +88,7 @@ task08_080C9820: @ 813549C
cmp r0, 0
beq _0813551E
_081354D2:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x5
bne _08135504
@@ -308,7 +308,7 @@ sub_81356C4: @ 81356C4
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_082907F0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@@ -1205,7 +1205,7 @@ sub_8135F04: @ 8135F04
adds r1, r3
ldr r5, [r2]
adds r5, r1
ldr r2, =gUnknown_085B262C
ldr r2, =gPokeblockNames
ldrb r1, [r5]
lsls r1, 2
adds r1, r2
@@ -2583,7 +2583,7 @@ sub_8136AB4: @ 8136AB4
movs r1, 0
bl sub_8198070
ldr r0, =gStringVar1
ldr r3, =gUnknown_085B262C
ldr r3, =gPokeblockNames
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
ldr r1, =gUnknown_0203CE7C
@@ -2784,7 +2784,7 @@ sub_8136C8C: @ 8136C8C
lsls r4, 16
lsrs r4, 16
ldr r0, =gBattleTextBuff1
ldr r3, =gUnknown_085B262C
ldr r3, =gPokeblockNames
ldr r2, [r5]
ldrh r1, [r7]
lsls r1, 3
@@ -2838,9 +2838,9 @@ sub_8136D2C: @ 8136D2C
lsrs r4, 24
ldr r5, =gUnknown_0203CE7C
ldrb r0, [r5]
bl sub_80FC3E8
bl SafariZoneActivatePokeblockFeeder
ldr r0, =gStringVar1
ldr r3, =gUnknown_085B262C
ldr r3, =gPokeblockNames
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
ldrh r1, [r5]
@@ -3188,7 +3188,7 @@ sub_8136FE4: @ 8136FE4
lsrs r0, 24
movs r6, 0
movs r4, 0
ldr r1, =gUnknown_085B25A0
ldr r1, =gPokeblockFlavorCompatibilityTable
mov r9, r1
lsls r1, r0, 2
adds r7, r1, r0
@@ -3236,7 +3236,7 @@ sub_8137044: @ 8137044
movs r1, 0
bl sub_8136F9C
lsls r0, 24
ldr r1, =gUnknown_085B262C
ldr r1, =gPokeblockNames
lsrs r0, 22
adds r0, r1
ldr r1, [r0]
@@ -3255,7 +3255,7 @@ sub_8137068: @ 8137068
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
ldr r7, =gUnknown_085B262C
ldr r7, =gPokeblockNames
_08137074:
lsls r1, r4, 3
ldr r0, =gUnknown_085B2720
@@ -3346,7 +3346,7 @@ sub_81370FC: @ 81370FC
b _08137152
.pool
_08137134:
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x15]
cmp r0, 0x1
bne _08137170
@@ -3408,7 +3408,7 @@ sub_81371B4: @ 81371B4
ldr r0, =0x00000888
bl FlagSet
ldr r0, =gUnknown_082926F8
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@@ -5213,7 +5213,7 @@ is_tile_that_overrides_player_control: @ 81380D8
lsls r0, 24
cmp r0, 0
beq _0813810A
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x1
blt _0813810A
@@ -5250,7 +5250,7 @@ sub_8138120: @ 8138120
lsls r0, 24
cmp r0, 0
beq _08138152
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x1
blt _08138152
@@ -5287,7 +5287,7 @@ sub_8138168: @ 8138168
lsls r0, 24
cmp r0, 0
beq _0813819A
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x1
blt _0813819A
@@ -5324,7 +5324,7 @@ sub_81381B0: @ 81381B0
lsls r0, 24
cmp r0, 0
beq _081381E2
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x1
blt _081381E2
@@ -5361,7 +5361,7 @@ sub_81381F8: @ 81381F8
lsls r0, 24
cmp r0, 0
beq _0813822A
ldr r0, =gUnknown_02037318
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x1
blt _0813822A
@@ -5396,7 +5396,7 @@ sub_8138240: @ 8138240
mov r7, r8
push {r7}
movs r6, 0
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r7, r0, 24
bl sub_8009FCC
@@ -5416,7 +5416,7 @@ _08138262:
lsls r1, r4, 3
subs r1, r4
lsls r1, 2
ldr r2, =gUnknown_020229F0
ldr r2, =gLinkPlayers + 8
adds r1, r2
bl StringCopy
adds r0, r6, 0x1
@@ -5459,7 +5459,7 @@ SpawnLinkPartnerFieldObject: @ 81382A0
adds r0, r4, 0
movs r2, 0x8
bl memcpy
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -5531,7 +5531,7 @@ _08138350:
_08138358:
cmp r10, r6
beq _0813840A
ldr r0, =gUnknown_020229E8
ldr r0, =gLinkPlayers
lsls r2, r6, 3
subs r1, r2, r6
lsls r1, 2
@@ -7545,7 +7545,7 @@ sub_81393C8: @ 81393C8
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
bl sub_806DC8C
bl GetMonEVCount
lsls r0, 16
ldr r1, =0x01fd0000
cmp r0, r1
@@ -7630,7 +7630,7 @@ sub_813946C: @ 813946C
adds r0, r5, 0
movs r2, 0x7
movs r3, 0x20
bl create_pokemon_set_level
bl CreateMon
movs r1, 0x1
add r0, sp, 0x10
strh r1, [r0]
@@ -7676,7 +7676,7 @@ sub_81394D8: @ 81394D8
bl sub_8133EDC
lsls r0, 16
lsrs r6, r0, 16
bl calc_player_party_count
bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -7724,7 +7724,7 @@ sub_8139540: @ 8139540
push {lr}
ldr r0, =gPlayerParty
movs r1, 0x3F
bl sub_806DD7C
bl CheckPartyPokerus
lsls r0, 24
cmp r0, 0
beq _08139558
@@ -7885,7 +7885,7 @@ _08139684:
thumb_func_start sub_8139688
sub_8139688: @ 8139688
push {r4-r6,lr}
bl calc_player_party_count
bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -8204,7 +8204,7 @@ _081398FC:
thumb_func_start sub_813990C
sub_813990C: @ 813990C
push {r4,r5,lr}
bl calc_player_party_count
bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -8236,8 +8236,8 @@ _08139944:
bx r1
thumb_func_end sub_813990C
thumb_func_start in_multi_battle_room_with_var_condition
in_multi_battle_room_with_var_condition: @ 813994C
thumb_func_start InMultiBattleRoom
InMultiBattleRoom: @ 813994C
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
@@ -8259,7 +8259,7 @@ _08139978:
_0813997A:
pop {r1}
bx r1
thumb_func_end in_multi_battle_room_with_var_condition
thumb_func_end InMultiBattleRoom
thumb_func_start sub_8139980
sub_8139980: @ 8139980
@@ -8530,7 +8530,7 @@ sub_8139B60: @ 8139B60
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r4, 0
bl Print
bl PrintTextOnWindow
ldr r6, =gUnknown_085B2BB4
ldr r4, =gSpecialVar_0x8005
ldrh r0, [r4]
@@ -8555,7 +8555,7 @@ sub_8139B60: @ 8139B60
mov r1, r8
str r1, [sp, 0x8]
movs r1, 0x1
bl Print
bl PrintTextOnWindow
ldrb r0, [r5]
bl PutWindowTilemap
ldrb r0, [r5]
@@ -9940,7 +9940,7 @@ nullsub_55: @ 813A768
sub_813A76C: @ 813A76C
push {r4-r6,lr}
movs r4, 0
ldr r6, =gUnknown_020229E8
ldr r6, =gLinkPlayers
ldr r0, =0x0000401f
adds r5, r0, 0
_0813A776:
@@ -10149,7 +10149,7 @@ sub_813A8FC: @ 813A8FC
str r1, [sp, 0x8]
movs r1, 0x1
add r2, sp, 0xC
bl Print
bl PrintTextOnWindow
add sp, 0x2C
pop {r0}
bx r0
@@ -10644,7 +10644,7 @@ sub_813AD34: @ 813AD34
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
b _0813ADAC
.pool
_0813AD90:
@@ -10660,7 +10660,7 @@ _0813AD90:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
_0813ADAC:
add sp, 0xC
pop {r4-r7}
@@ -10764,7 +10764,7 @@ _0813AE1E:
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl Print
bl PrintTextOnWindow
ldrh r0, [r6, 0x22]
lsls r0, 24
lsrs r0, 24
@@ -11229,7 +11229,7 @@ _0813B27E:
bl get_pokemon_by_box_and_pos
movs r1, 0xB
movs r2, 0
bl pokemon_getattr_encrypted
bl GetBoxMonData
cmp r0, 0
bne _0813B2C0
bl get_unknown_box_id
@@ -11640,7 +11640,7 @@ _0813B5E4:
beq _0813B5F2
b _0813B7C6
_0813B5F2:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _0813B5FE
@@ -11662,7 +11662,7 @@ _0813B614:
bne _0813B622
b _0813B7C6
_0813B622:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
beq _0813B62E
@@ -11729,7 +11729,7 @@ _0813B6B4:
beq _0813B6C2
b _0813B7C6
_0813B6C2:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _0813B790
@@ -11747,7 +11747,7 @@ _0813B6E4:
ands r1, r0
cmp r1, 0
beq _0813B7C6
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
beq _0813B790
@@ -11769,7 +11769,7 @@ _0813B708:
b _0813B7C6
.pool
_0813B728:
bl link_get_multiplayer_id
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _0813B74C
asm/rom_8034C54.s
+11 -16488
View File
File diff suppressed because it is too large Load Diff
asm/rom_8072304.s
+10 -10
View File
@@ -962,7 +962,7 @@ sub_8072A88: @ 8072A88
lsls r5, r0, 2
movs r7, 0xD
negs r7, r7
ldr r2, =gUnknown_03005D70
ldr r2, =gHealthBoxesIds
mov r9, r2
_08072AB2:
mov r1, r9
@@ -1071,7 +1071,7 @@ _08072B78:
movs r5, 0x20
movs r4, 0x2C
_08072B7C:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r6, r0
ldrb r0, [r0]
adds r1, r5, 0
@@ -1966,7 +1966,7 @@ _0807332E:
ldr r2, =gBattlePartyID
mov r8, r2
_08073336:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
mov r1, r9
adds r6, r1, r0
ldrb r1, [r6]
@@ -2224,7 +2224,7 @@ _0807355C:
movs r2, 0x4
bl healthbar_draw_field_maybe
_08073592:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
add r0, r9
ldrb r1, [r0]
lsls r0, r1, 4
@@ -3759,7 +3759,7 @@ sub_80741E8: @ 80741E8
adds r4, r1, 0
lsls r0, 24
lsrs r7, r0, 24
ldr r5, =gUnknown_02022E2C
ldr r5, =gDisplayedStringBattle
ldr r1, =gUnknown_085ED228
adds r0, r5, 0
bl StringCopy
@@ -3774,7 +3774,7 @@ sub_80741E8: @ 80741E8
bl StringAppend
adds r5, r0, 0
adds r0, r4, 0
bl pokemon_get_gender
bl GetMonGender
lsls r0, 24
lsrs r6, r0, 24
adds r0, r4, 0
@@ -3814,7 +3814,7 @@ _08074270:
_08074272:
adds r0, r5, 0
bl StringCopy
ldr r0, =gUnknown_02022E2C
ldr r0, =gDisplayedStringBattle
add r1, sp, 0x10
str r1, [sp]
movs r1, 0
@@ -4422,7 +4422,7 @@ sub_80747D8: @ 80747D8
ldr r1, =gUnknown_085CCB3C
add r0, sp, 0x4
bl StringCopy
ldr r1, =gUnknown_0203A04C
ldr r1, =gNumSafariBalls
ldrb r1, [r1]
movs r2, 0
movs r3, 0x2
@@ -8512,7 +8512,7 @@ sub_8076918: @ 8076918
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r5, r0
ldrb r1, [r0]
lsls r0, r1, 4
@@ -8635,7 +8635,7 @@ sub_80769F4: @ 80769F4
adds r3, r1, r2
movs r0, 0x1
strh r0, [r3, 0x2E]
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r4, r0
ldrb r0, [r4]
strh r0, [r3, 0x30]
asm/rom_80A5C6C.s
+45 -45
View File
@@ -12,7 +12,7 @@ sub_80A5C6C: @ 80A5C6C
lsrs r5, r0, 24
lsls r1, 24
lsrs r4, r1, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A5C8A
@@ -70,7 +70,7 @@ _080A5CD8:
b _080A5DB0
.pool
_080A5D00:
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A5D28
@@ -168,7 +168,7 @@ sub_80A5DB8: @ 80A5DB8
lsls r0, 24
cmp r0, 0
beq _080A5DDA
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A5DDA
@@ -176,7 +176,7 @@ sub_80A5DB8: @ 80A5DB8
_080A5DDA:
cmp r5, 0xC9
bne _080A5E90
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A5E04
@@ -399,7 +399,7 @@ sub_80A5FA0: @ 80A5FA0
lsrs r0, 24
cmp r0, 0x1
bne _080A5FFE
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A5FFE
@@ -449,7 +449,7 @@ sub_80A600C: @ 80A600C
lsls r0, 24
cmp r0, 0
beq _080A6030
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A603E
@@ -527,7 +527,7 @@ sub_80A60AC: @ 80A60AC
lsrs r1, 24
cmp r1, 0x1
bhi _080A6126
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A60E8
@@ -645,7 +645,7 @@ sub_80A6190: @ 80A6190
bl sub_80A5C6C
lsls r0, 24
lsrs r6, r0, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A6238
@@ -716,8 +716,8 @@ _080A6238:
bx r1
thumb_func_end sub_80A6190
thumb_func_start obj_id_for_side_relative_to_move
obj_id_for_side_relative_to_move: @ 80A6240
thumb_func_start GetAnimBankSpriteId
GetAnimBankSpriteId: @ 80A6240
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -785,15 +785,15 @@ _080A62CA:
pop {r1}
bx r1
.pool
thumb_func_end obj_id_for_side_relative_to_move
thumb_func_end GetAnimBankSpriteId
thumb_func_start oamt_set_x3A_32
oamt_set_x3A_32: @ 80A62D4
thumb_func_start StoreSpriteCallbackInData6
StoreSpriteCallbackInData6: @ 80A62D4
strh r1, [r0, 0x3A]
lsrs r1, 16
strh r1, [r0, 0x3C]
bx lr
thumb_func_end oamt_set_x3A_32
thumb_func_end StoreSpriteCallbackInData6
thumb_func_start sub_80A62DC
sub_80A62DC: @ 80A62DC
@@ -1868,7 +1868,7 @@ sub_80A6A90: @ 80A6A90
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A6ABC
@@ -1942,7 +1942,7 @@ battle_type_is_double: @ 80A6B20
sub_80A6B30: @ 80A6B30
push {r4,lr}
adds r4, r0, 0
bl sub_80A4DF0
bl IsContest
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -1988,7 +1988,7 @@ sub_80A6B90: @ 80A6B90
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
bl sub_80A4DF0
bl IsContest
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -2046,7 +2046,7 @@ sub_80A6BFC: @ 80A6BFC
ldr r0, =gUnknown_02023060
ldr r0, [r0]
str r0, [r4, 0x4]
bl sub_80A4DF0
bl IsContest
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -2222,7 +2222,7 @@ sub_80A6D60: @ 80A6D60
adds r5, r2, 0
ldrb r0, [r4, 0x9]
bl sub_80A6D10
bl sub_80A4DF0
bl IsContest
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2244,7 +2244,7 @@ _080A6D86:
thumb_func_start sub_80A6D94
sub_80A6D94: @ 80A6D94
push {lr}
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A6DA4
@@ -2263,7 +2263,7 @@ sub_80A6DAC: @ 80A6DAC
lsls r0, 24
cmp r0, 0
beq _080A6DBE
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A6DD4
@@ -2883,13 +2883,13 @@ _080A71F0:
thumb_func_start sub_80A7238
sub_80A7238: @ 80A7238
push {r4,lr}
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A7268
ldr r4, =gSprites
movs r0, 0
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -2929,7 +2929,7 @@ sub_80A7270: @ 80A7270
ldrh r0, [r4, 0x2E]
lsls r0, 24
lsrs r7, r0, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A72A6
@@ -2968,7 +2968,7 @@ _080A72B4:
movs r1, 0x80
orrs r0, r1
strb r0, [r2]
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A7312
@@ -3357,7 +3357,7 @@ sub_80A75AC: @ 80A75AC
movs r4, 0
cmp r0, 0
beq _080A7602
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A75F6
@@ -3432,7 +3432,7 @@ _080A7674:
ldr r0, [sp]
cmp r0, 0
beq _080A769A
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A7694
@@ -3449,7 +3449,7 @@ _080A769A:
ldr r0, [sp, 0x4]
cmp r0, 0
beq _080A76B0
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A76B0
@@ -3483,7 +3483,7 @@ sub_80A76C4: @ 80A76C4
lsrs r3, 24
mov r8, r3
movs r4, 0
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A76F2
@@ -3703,7 +3703,7 @@ _080A785C:
str r0, [r5, 0x1C]
ldr r1, =move_anim_8072740
adds r0, r5, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
pop {r4-r7}
pop {r0}
bx r0
@@ -3846,7 +3846,7 @@ _080A798E:
str r0, [r5, 0x1C]
ldr r1, =move_anim_8072740
adds r0, r5, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
pop {r4-r7}
pop {r0}
bx r0
@@ -3858,7 +3858,7 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: @ 80A79E8
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -4084,7 +4084,7 @@ sub_80A7B98: @ 80A7B98
lsrs r4, r0, 24
ldr r0, =gBattleAnimArgs
ldrb r0, [r0]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@@ -4550,7 +4550,7 @@ _080A7F38:
beq _080A7F42
b _080A8034
_080A7F42:
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A7F78
@@ -5014,7 +5014,7 @@ sub_80A82E4: @ 80A82E4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A8300
@@ -5056,7 +5056,7 @@ sub_80A8328: @ 80A8328
bl GetBankIdentity
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A8344
@@ -5088,7 +5088,7 @@ GetBankIdentity_permutated: @ 80A8364
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A838A
@@ -5363,7 +5363,7 @@ _080A85B2:
bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A85EE
@@ -5412,7 +5412,7 @@ sub_80A861C: @ 80A861C
lsls r1, 24
lsrs r1, 24
mov r9, r1
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _080A86C4
@@ -5811,7 +5811,7 @@ _080A8946:
lsls r0, 24
cmp r0, 0
beq _080A8998
bl sub_80A4DF0
bl IsContest
lsls r0, 24
cmp r0, 0
bne _080A8998
@@ -5985,7 +5985,7 @@ _080A8AB6:
strh r0, [r4, 0x38]
ldr r1, =move_anim_8074EE0
adds r0, r4, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A66DC
str r0, [r4, 0x1C]
pop {r4}
@@ -6040,7 +6040,7 @@ _080A8B26:
bl StartSpriteAnim
ldr r1, =move_anim_8074EE0
adds r0, r4, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A66DC
str r0, [r4, 0x1C]
pop {r4}
@@ -6083,7 +6083,7 @@ _080A8B9C:
str r0, [r4, 0x1C]
ldr r1, =move_anim_8072740
adds r0, r4, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
@@ -6101,7 +6101,7 @@ sub_80A8BC4: @ 80A8BC4
ldr r0, =gTasks
adds r5, r1, r0
movs r0, 0
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
movs r6, 0
@@ -6516,7 +6516,7 @@ _080A8F32:
str r0, [r4, 0x1C]
ldr r1, =move_anim_8072740
adds r0, r4, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
asm/rom_80C6FA0.s
+168 -168
View File
File diff suppressed because it is too large Load Diff
asm/rom_8145E84.s
-60
View File
@@ -1,60 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8145E84
sub_8145E84: @ 8145E84
push {r4,lr}
ldr r4, =gUnknown_0300120B
ldrb r0, [r4]
cmp r0, 0
beq _08145E98
cmp r0, 0x1
beq _08145EAC
b _08145EC0
.pool
_08145E98:
ldr r0, =gUnknown_0300120A
ldrb r0, [r0]
bl sub_8145F6C
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
b _08145EC0
.pool
_08145EAC:
bl sub_8145F20
lsls r0, 24
cmp r0, 0
beq _08145EC0
movs r0, 0
strb r0, [r4]
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
_08145EC0:
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8145E84
thumb_func_start sub_8145EDC
sub_8145EDC: @ 8145EDC
push {lr}
ldr r1, =gUnknown_0300120A
strb r0, [r1]
ldr r0, =sub_8145E84
bl SetMainCallback2
pop {r0}
bx r0
.pool
thumb_func_end sub_8145EDC
.align 2, 0 @ Don't pad with nop.
asm/rom_8158B30.s
-29569
View File
File diff suppressed because it is too large Load Diff
asm/rom_815A0D4.s
+14458
View File
File diff suppressed because it is too large Load Diff
asm/rom_8161F74.s
+11568
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More