diff options
Diffstat (limited to 'asm')
| -rwxr-xr-x | asm/berry_crush.s | 36 | ||||
| -rw-r--r-- | asm/macros/battle_frontier/battle_pike.inc | 44 |
2 files changed, 39 insertions, 41 deletions
diff --git a/asm/berry_crush.s b/asm/berry_crush.s index b6d07662e..cd70df741 100755 --- a/asm/berry_crush.s +++ b/asm/berry_crush.s @@ -296,7 +296,7 @@ _08021C5E: lsrs r2, 24 mov r1, r10 lsrs r3, r1, 24 - ldr r1, =gUnknown_082F32D8 + ldr r1, =sBerryCrushTextColors1 str r1, [sp] movs r4, 0 str r4, [sp, 0x4] @@ -338,7 +338,7 @@ _08021CC8: ldrb r0, [r0] mov r4, r10 lsrs r3, r4, 24 - ldr r1, =gUnknown_082F32D8 + ldr r1, =sBerryCrushTextColors1 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] @@ -402,7 +402,7 @@ sub_8021D34: @ 8021D34 ldrh r1, [r2, 0x4] bl sub_8021944 ldrb r0, [r4] - ldr r4, =gUnknown_082F32D8 + ldr r4, =sBerryCrushTextColors1 str r4, [sp] str r6, [sp, 0x4] ldr r1, =gText_TimeColon @@ -423,7 +423,7 @@ sub_8021D34: @ 8021D34 lsrs r6, r0, 24 mov r2, r9 ldrb r0, [r2] - ldr r1, =gUnknown_082F32D8 + ldr r1, =sBerryCrushTextColors1 str r1, [sp] mov r2, r10 str r2, [sp, 0x4] @@ -464,7 +464,7 @@ sub_8021D34: @ 8021D34 lsrs r6, r0, 24 mov r4, r9 ldrb r0, [r4] - ldr r1, =gUnknown_082F32D8 + ldr r1, =sBerryCrushTextColors1 str r1, [sp] mov r2, r10 str r2, [sp, 0x4] @@ -484,7 +484,7 @@ sub_8021D34: @ 8021D34 lsrs r6, r0, 24 mov r1, r9 ldrb r0, [r1] - ldr r2, =gUnknown_082F32D8 + ldr r2, =sBerryCrushTextColors1 str r2, [sp] mov r1, r10 str r1, [sp, 0x4] @@ -515,7 +515,7 @@ sub_8021D34: @ 8021D34 lsrs r6, r0, 24 mov r4, r9 ldrb r0, [r4] - ldr r1, =gUnknown_082F32D8 + ldr r1, =sBerryCrushTextColors1 str r1, [sp] mov r2, r10 str r2, [sp, 0x4] @@ -529,7 +529,7 @@ sub_8021D34: @ 8021D34 lsls r0, 24 lsrs r7, r0, 24 ldrb r0, [r4] - ldr r4, =gUnknown_082F32D8 + ldr r4, =sBerryCrushTextColors1 str r4, [sp] mov r1, r10 str r1, [sp, 0x4] @@ -552,7 +552,7 @@ sub_8021D34: @ 8021D34 lsrs r6, r0, 24 mov r1, r9 ldrb r0, [r1] - ldr r2, =gUnknown_082F32D8 + ldr r2, =sBerryCrushTextColors1 str r2, [sp] mov r1, r10 str r1, [sp, 0x4] @@ -633,7 +633,7 @@ _08021F0A: lsls r0, 1 add r0, r8 ldrb r0, [r0] - ldr r1, =gUnknown_082F32E7 + ldr r1, =sBerryCrushTextColors4 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] @@ -649,7 +649,7 @@ _08021FC4: lsls r0, 1 add r0, r8 ldrb r0, [r0] - ldr r1, =gUnknown_082F32D8 + ldr r1, =sBerryCrushTextColors1 str r1, [sp] str r2, [sp, 0x4] str r4, [sp, 0x8] @@ -667,7 +667,7 @@ _08021FDE: add r8, r4 mov r1, r8 ldrb r0, [r1] - ldr r2, =gUnknown_082F32D8 + ldr r2, =sBerryCrushTextColors1 mov r9, r2 str r2, [sp] movs r5, 0 @@ -1019,7 +1019,7 @@ _080222D0: lsls r0, 24 lsrs r7, r0, 24 ldrb r0, [r6, 0x2] - ldr r5, =gUnknown_082F32E1 + ldr r5, =sBerryCrushTextColorTable str r5, [sp] mov r1, r9 str r1, [sp, 0x4] @@ -1062,7 +1062,7 @@ _08022336: ldr r1, =gText_Var1Players bl StringExpandPlaceholders ldrb r0, [r6, 0x2] - ldr r1, =gUnknown_082F32D8 + ldr r1, =sBerryCrushTextColors1 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] @@ -1082,7 +1082,7 @@ _08022336: lsls r1, 24 lsrs r7, r1, 24 ldrb r0, [r6, 0x2] - ldr r1, =gUnknown_082F32D8 + ldr r1, =sBerryCrushTextColors1 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] @@ -1155,7 +1155,7 @@ _080223CA: lsls r0, 24 lsrs r7, r0, 24 ldrb r0, [r6, 0x2] - ldr r1, =gUnknown_082F32D8 + ldr r1, =sBerryCrushTextColors1 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] @@ -1405,7 +1405,7 @@ _08022616: mov r1, r8 str r1, [sp] str r1, [sp, 0x4] - ldr r1, =gUnknown_082F32DB + ldr r1, =sBerryCrushTextColors2 str r1, [sp, 0x8] mov r1, r8 str r1, [sp, 0xC] @@ -1432,7 +1432,7 @@ _08022668: mov r1, r8 str r1, [sp] str r1, [sp, 0x4] - ldr r1, =gUnknown_082F32DE + ldr r1, =sBerryCrushTextColors3 str r1, [sp, 0x8] mov r1, r8 str r1, [sp, 0xC] diff --git a/asm/macros/battle_frontier/battle_pike.inc b/asm/macros/battle_frontier/battle_pike.inc index d40cb0bac..30f5c88d8 100644 --- a/asm/macros/battle_frontier/battle_pike.inc +++ b/asm/macros/battle_frontier/battle_pike.inc @@ -1,6 +1,4 @@ -@ TODO: Add explanatory comments to macros - - @ + @ Set sRoomType to the next PIKE_ROOM_* id .macro pike_setnextroom setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE special CallBattlePikeFunction @@ -25,19 +23,19 @@ special CallBattlePikeFunction .endm - @ + @ TRUE if the next room is the last (15th) room, FALSE otherwise .macro pike_isfinalroom setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_FINAL_ROOM special CallBattlePikeFunction .endm - @ + @ Set the object event gfx for the room being entered .macro pike_setroomobjects setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS special CallBattlePikeFunction .endm - @ + @ Get the current room type (sRoomType) .macro pike_getroomtype setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction @@ -62,33 +60,33 @@ special CallBattlePikeFunction .endm - @ + @ Returns the PIKE_STATUS_* to be afflicted for the status room .macro pike_getstatus setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS special CallBattlePikeFunction .endm - @ + @ Returns the PIKE_STATUSMON_* that attacks the player for the status room .macro pike_getstatusmon setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON special CallBattlePikeFunction .endm - @ + @ Randomly heals either one or two party mons and returns the number of mons healed .macro pike_healonetwomons setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS special CallBattlePikeFunction .endm - @ + @ Buffers a message for the lone NPC in the NPC room to gStringVar4 .macro pike_getnpcmsg setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG special CallBattlePikeFunction .endm - @ - .macro pike_fadescreen - setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE + @ Flashes the screen 3 times for when the Dusclops/Kirlia attacks the player + .macro pike_flashscreen + setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FLASH special CallBattlePikeFunction .endm @@ -98,31 +96,31 @@ special CallBattlePikeFunction .endm - @ TRUE if its the Pike Queens room + @ Set which room to give a hint about. TRUE if its the Pike Queens room next .macro pike_sethintroom setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM special CallBattlePikeFunction .endm - @ + @ Get PIKE_ROOM_(LEFT/CENTER/RIGHT) for which room to give a hint about .macro pike_gethintroomid setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID special CallBattlePikeFunction .endm - @ + @ Get the PIKE_HINT_* to give about the next room .macro pike_gethint setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT special CallBattlePikeFunction .endm - @ + @ Reset the frontier trainer ids for the start of the challenge .macro pike_cleartrainerids setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS special CallBattlePikeFunction .endm - @ + @ Buffer the opponents battle intro speech to gStringVar4. \trainer 0 for Trainer A, 1 for Trainer B .macro pike_gettrainerintro trainer:req setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_TRAINER_INTRO setvar VAR_0x8005, \trainer @@ -135,32 +133,32 @@ special CallBattlePikeFunction .endm - @ + @ Heal 0-2 party mons depending on which room was chosen for the Pike Queen battle. Return the number healed .macro pike_prequeenheal setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN special CallBattlePikeFunction .endm - @ + @ When \set is TRUE, prevent healing rooms from appearing (for 1st room or when party is full health). \set FALSE to re-enable healing rooms .macro pike_nohealing set:req setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEAL_ROOMS_DISABLED setvar VAR_0x8005, \set special CallBattlePikeFunction .endm - @ + @ TRUE if the party is full health (full HP, PP, and no status), FALSE otherwise .macro pike_ispartyfullhealth setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_PARTY_FULL_HEALTH special CallBattlePikeFunction .endm - @ + @ Save the party held items in pikeHeldItemsBackup .macro pike_savehelditems setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_HELD_ITEMS special CallBattlePikeFunction .endm - @ + @ Restore the party held items from pikeHeldItemsBackup .macro pike_resethelditems setvar VAR_0x8004, BATTLE_PIKE_FUNC_RESET_HELD_ITEMS special CallBattlePikeFunction |