diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/m4a.s | 13 | ||||
| -rw-r--r-- | asm/rom3.s | 20 | ||||
| -rw-r--r-- | asm/rom5.s | 16 | ||||
| -rw-r--r-- | asm/rom_8040EB4.s | 14 | ||||
| -rw-r--r-- | asm/rom_8074BAC.s | 20 |
5 files changed, 48 insertions, 35 deletions
diff --git a/asm/macros/m4a.s b/asm/macros/m4a.s new file mode 100644 index 000000000..6c5abc09b --- /dev/null +++ b/asm/macros/m4a.s @@ -0,0 +1,13 @@ + .macro song label, music_player, unknown + .4byte \label + .2byte \music_player + .2byte \unknown + .endm + + .macro music_player info_struct, track_struct, unknown_1, unknown_2 + .4byte \info_struct + .4byte \track_struct + .byte \unknown_1 + .space 1 + .2byte \unknown_2 + .endm diff --git a/asm/rom3.s b/asm/rom3.s index 3b3790736..a32cec299 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -37242,7 +37242,7 @@ _0801C544: _0801C56C: .4byte 0x02024c07 _0801C570: .4byte gBattleMoves _0801C574: .4byte 0x02024db8 -_0801C578: .4byte gUnknown_081FAB1C +_0801C578: .4byte gAccuracyStageRatios _0801C57C: .4byte 0x02024a80 _0801C580: .4byte 0x02024c08 _0801C584: .4byte 0x02024df0 @@ -37782,7 +37782,7 @@ _0801C960: _0801C9BC: .4byte 0x02024c08 _0801C9C0: .4byte 0x02024c98 _0801C9C4: .4byte 0x020239f8 -_0801C9C8: .4byte gUnknown_081FAB50 +_0801C9C8: .4byte gCriticalHitChance _0801C9CC: .4byte 0x02024c0d _0801C9D0: ldr r1, _0801C9E4 @@ -52578,7 +52578,7 @@ _080240FE: muls r4, r0 b _08024140 .align 2, 0 -_08024120: .4byte gUnknown_081F98F0 +_08024120: .4byte gTrainerMoney _08024124: .4byte 0x02000000 _08024128: .4byte 0x020239f8 _0802412C: .4byte 0x02025bc4 @@ -53644,7 +53644,7 @@ _080249A4: .4byte gUnknown_0840165C _080249A8: .4byte 0x02000000 _080249AC: .4byte 0x00016018 _080249B0: .4byte 0x03004360 -_080249B4: .4byte gUnknown_081FACEF +_080249B4: .4byte gLevelUpStatBoxStats _080249B8: .4byte _080249BC .align 2, 0 _080249BC: @@ -53883,7 +53883,7 @@ _08024B9C: .4byte gUnknown_08400D9F _08024BA0: .4byte 0x00016018 _08024BA4: .4byte gUnknown_0840165C _08024BA8: .4byte 0x03004360 -_08024BAC: .4byte gUnknown_081FACEF +_08024BAC: .4byte gLevelUpStatBoxStats _08024BB0: strb r6, [r5] movs r0, 0x11 @@ -54689,7 +54689,7 @@ _08025200: .4byte 0x02024c07 _08025204: .4byte 0x02024ca8 _08025208: .4byte 0x02024a7e _0802520C: .4byte 0x02024a68 -_08025210: .4byte gUnknown_081FACF6 +_08025210: .4byte gProtectSuccessRates _08025214: .4byte gBattleMoves _08025218: .4byte 0x02024be6 _0802521C: .4byte 0x02024d28 @@ -67010,7 +67010,7 @@ atkEB_settypetoterrain: @ 802B330 .align 2, 0 _0802B3A0: .4byte 0x02024a80 _0802B3A4: .4byte 0x02024c07 -_0802B3A8: .4byte gUnknown_081FAD86 +_0802B3A8: .4byte gTerrainToType _0802B3AC: .4byte 0x0300428c _0802B3B0: .4byte 0x030041c0 _0802B3B4: .4byte 0x02024c10 @@ -67532,7 +67532,7 @@ _0802B7DC: strb r1, [r0, 0x5] b _0802B81C .align 2, 0 -_0802B7F4: .4byte gUnknown_081FAD90 +_0802B7F4: .4byte gBallCatchBonuses _0802B7F8: .4byte 0x02024a80 _0802B7FC: .4byte 0x02024c08 _0802B800: .4byte 0x02024c04 @@ -81425,7 +81425,7 @@ _08032964: bx r0 .align 2, 0 _08032970: .4byte 0x02017800 -_08032974: .4byte gUnknown_081ECB14 +_08032974: .4byte gEnemyMonElevation thumb_func_end sub_80328A4 thumb_func_start sub_8032978 @@ -81479,7 +81479,7 @@ _080329AA: b _080329F8 .align 2, 0 _080329D0: .4byte 0x02017800 -_080329D4: .4byte gUnknown_081ECB14 +_080329D4: .4byte gEnemyMonElevation _080329D8: .4byte 0x02020004 _080329DC: .4byte sub_80328A4 _080329E0: diff --git a/asm/rom5.s b/asm/rom5.s index 544d15489..13289f8bd 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -131013,7 +131013,7 @@ _080BABF2: b _080BAC98 .align 2, 0 _080BAC04: .4byte 0x020387d8 -_080BAC08: .4byte gUnknown_084537C0 +_080BAC08: .4byte voicegroup_84537C0 _080BAC0C: lsls r0, r1, 1 adds r0, r1 @@ -131021,7 +131021,7 @@ _080BAC0C: ldr r1, _080BAC18 b _080BAC98 .align 2, 0 -_080BAC18: .4byte gUnknown_08452590 +_080BAC18: .4byte voicegroup_8452590 _080BAC1C: ldr r0, _080BAC30 ldrb r0, [r0] @@ -131034,7 +131034,7 @@ _080BAC1C: b _080BAC98 .align 2, 0 _080BAC30: .4byte 0x020387d8 -_080BAC34: .4byte gUnknown_08453DC0 +_080BAC34: .4byte voicegroup_8453DC0 _080BAC38: lsls r0, r1, 1 adds r0, r1 @@ -131042,7 +131042,7 @@ _080BAC38: ldr r1, _080BAC44 b _080BAC98 .align 2, 0 -_080BAC44: .4byte gUnknown_08452B90 +_080BAC44: .4byte voicegroup_8452B90 _080BAC48: ldr r0, _080BAC5C ldrb r0, [r0] @@ -131055,7 +131055,7 @@ _080BAC48: b _080BAC98 .align 2, 0 _080BAC5C: .4byte 0x020387d8 -_080BAC60: .4byte gUnknown_084543C0 +_080BAC60: .4byte voicegroup_84543C0 _080BAC64: lsls r0, r1, 1 adds r0, r1 @@ -131063,7 +131063,7 @@ _080BAC64: ldr r1, _080BAC70 b _080BAC98 .align 2, 0 -_080BAC70: .4byte gUnknown_08453190 +_080BAC70: .4byte voicegroup_8453190 _080BAC74: ldr r0, _080BAC88 ldrb r0, [r0] @@ -131076,7 +131076,7 @@ _080BAC74: b _080BAC98 .align 2, 0 _080BAC88: .4byte 0x020387d8 -_080BAC8C: .4byte gUnknown_084549C0 +_080BAC8C: .4byte voicegroup_84549C0 _080BAC90: lsls r0, r1, 1 adds r0, r1 @@ -131110,7 +131110,7 @@ _080BACC6: pop {r0} bx r0 .align 2, 0 -_080BACCC: .4byte gUnknown_08453790 +_080BACCC: .4byte voicegroup_8453790 _080BACD0: .4byte 0x03005d30 _080BACD4: .4byte 0x020387b1 _080BACD8: .4byte 0x020387b2 diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index d9a718337..43a72f84f 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -5102,7 +5102,7 @@ sub_80435FC: @ 80435FC pop {r0} bx r0 .align 2, 0 -_0804364C: .4byte gUnknown_0820A430 +_0804364C: .4byte gEggShardVelocities _08043650: .4byte 0x0300481c thumb_func_end sub_80435FC @@ -15873,7 +15873,7 @@ _08048B7A: b _08048C3A .align 2, 0 _08048BA0: .4byte gUnknown_08EA0348 -_08048BA4: .4byte gUnknown_0820AFEC +_08048BA4: .4byte gTradeStripesBG2Tilemap _08048BA8: .4byte gUnknown_08EA02C8 _08048BAC: .4byte 0x0202eec8 _08048BB0: .4byte 0x0202eac8 @@ -15940,7 +15940,7 @@ _08048C3A: pop {r0} bx r0 .align 2, 0 -_08048C40: .4byte gUnknown_0820B7EC +_08048C40: .4byte gTradeStripesBG3Tilemap _08048C44: .4byte 0x06003800 _08048C48: .4byte 0x040000d4 _08048C4C: .4byte 0x80000400 @@ -18507,7 +18507,7 @@ _0804A098: .4byte gUnknown_0820C29C _0804A09C: .4byte 0x03004824 _0804A0A0: .4byte sub_809D62C _0804A0A4: .4byte gUnknown_0820C330 -_0804A0A8: .4byte gUnknown_0820ADEE +_0804A0A8: .4byte gTradePartyBoxTilemap _0804A0AC: ldr r2, _0804A0DC ldr r1, [sp, 0x6C] @@ -18694,7 +18694,7 @@ _0804A0E4: ldr r1, [r2] b _0804A28A .align 2, 0 -_0804A228: .4byte gUnknown_0820ABF0 +_0804A228: .4byte gTradeMovesBoxTilemap _0804A22C: .4byte 0x03004824 _0804A230: .4byte 0x02020004 _0804A234: .4byte gUnknown_0820C29C @@ -19506,7 +19506,7 @@ sub_804A840: @ 804A840 .align 2, 0 _0804A89C: .4byte 0x03004824 _0804A8A0: .4byte gUnknown_0820C330 -_0804A8A4: .4byte gUnknown_0820ADEE +_0804A8A4: .4byte gTradePartyBoxTilemap _0804A8A8: bl sub_8072DEC ldr r4, _0804A924 @@ -19566,7 +19566,7 @@ _0804A8FA: .align 2, 0 _0804A924: .4byte 0x03004824 _0804A928: .4byte gUnknown_0820C330 -_0804A92C: .4byte gUnknown_0820ADEE +_0804A92C: .4byte gTradePartyBoxTilemap _0804A930: .4byte gUnknown_0820C14C _0804A934: .4byte 0x06010000 thumb_func_end sub_804A840 diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s index c1bba49ea..3f0ab95cb 100644 --- a/asm/rom_8074BAC.s +++ b/asm/rom_8074BAC.s @@ -947,7 +947,7 @@ _080752C6: ldr r1, _080752D8 b _08075350 .align 2, 0 -_080752D8: .4byte gUnknown_084537C0 +_080752D8: .4byte voicegroup_84537C0 _080752DC: lsls r0, r1, 1 adds r0, r1 @@ -955,7 +955,7 @@ _080752DC: ldr r1, _080752E8 b _08075350 .align 2, 0 -_080752E8: .4byte gUnknown_08452590 +_080752E8: .4byte voicegroup_8452590 _080752EC: mov r2, r9 cmp r2, 0 @@ -966,7 +966,7 @@ _080752EC: ldr r1, _080752FC b _08075350 .align 2, 0 -_080752FC: .4byte gUnknown_08453DC0 +_080752FC: .4byte voicegroup_8453DC0 _08075300: lsls r0, r1, 1 adds r0, r1 @@ -974,7 +974,7 @@ _08075300: ldr r1, _0807530C b _08075350 .align 2, 0 -_0807530C: .4byte gUnknown_08452B90 +_0807530C: .4byte voicegroup_8452B90 _08075310: mov r0, r9 cmp r0, 0 @@ -985,7 +985,7 @@ _08075310: ldr r1, _08075320 b _08075350 .align 2, 0 -_08075320: .4byte gUnknown_084543C0 +_08075320: .4byte voicegroup_84543C0 _08075324: lsls r0, r1, 1 adds r0, r1 @@ -993,7 +993,7 @@ _08075324: ldr r1, _08075330 b _08075350 .align 2, 0 -_08075330: .4byte gUnknown_08453190 +_08075330: .4byte voicegroup_8453190 _08075334: mov r2, r9 cmp r2, 0 @@ -1004,7 +1004,7 @@ _08075334: ldr r1, _08075344 b _08075350 .align 2, 0 -_08075344: .4byte gUnknown_084549C0 +_08075344: .4byte voicegroup_84549C0 _08075348: lsls r0, r1, 1 adds r0, r1 @@ -1025,7 +1025,7 @@ _0807535A: pop {r0} bx r0 .align 2, 0 -_0807536C: .4byte gUnknown_08453790 +_0807536C: .4byte voicegroup_8453790 _08075370: .4byte 0x0202f79c thumb_func_end sub_80751C0 @@ -6561,7 +6561,7 @@ _08077E20: ldr r0, _08077E2C b _08077E34 .align 2, 0 -_08077E2C: .4byte gUnknown_081ECB14 +_08077E2C: .4byte gEnemyMonElevation _08077E30: ldr r0, _08077E40 adds r0, r7, r0 @@ -6573,7 +6573,7 @@ _08077E36: pop {r1} bx r1 .align 2, 0 -_08077E40: .4byte gUnknown_081ECB14 +_08077E40: .4byte gEnemyMonElevation thumb_func_end sub_8077DD8 thumb_func_start sub_8077E44 |