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

Merge pull request #420 from DizzyEggg/bored

Browse Source 
Get rid of static functions in includ and add req macro arguments
This commit is contained in:
Diegoisawesome
2018-12-02 14:05:35 -06:00
committed by GitHub
parent c123b8d6f1 9828e0e97b
commit 2912ec0e37
9 changed files with 576 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_ai_script.inc
+85 -85
View File
@@ -1,206 +1,206 @@
.macro if_random_less_than param0, param1 .macro if_random_less_than param0:req, param1:req
.byte 0x0 .byte 0x0
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_random_greater_than param0, param1 .macro if_random_greater_than param0:req, param1:req
.byte 0x1 .byte 0x1
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_random_equal param0, param1 .macro if_random_equal param0:req, param1:req
.byte 0x2 .byte 0x2
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_random_not_equal param0, param1 .macro if_random_not_equal param0:req, param1:req
.byte 0x3 .byte 0x3
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro score param0 .macro score param0:req
.byte 0x4 .byte 0x4
.byte \param0 .byte \param0
.endm .endm
.macro if_hp_less_than battler, param1, param2 .macro if_hp_less_than battler:req, param1:req, param2:req
.byte 0x5 .byte 0x5
.byte \battler .byte \battler
.byte \param1 .byte \param1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_hp_more_than battler, param1, param2 .macro if_hp_more_than battler:req, param1:req, param2:req
.byte 0x6 .byte 0x6
.byte \battler .byte \battler
.byte \param1 .byte \param1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_hp_equal battler, param1, param2 .macro if_hp_equal battler:req, param1:req, param2:req
.byte 0x7 .byte 0x7
.byte \battler .byte \battler
.byte \param1 .byte \param1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_hp_not_equal battler, param1, param2 .macro if_hp_not_equal battler:req, param1:req, param2:req
.byte 0x8 .byte 0x8
.byte \battler .byte \battler
.byte \param1 .byte \param1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_status battler, status1, param2 .macro if_status battler:req, status1:req, param2:req
.byte 0x9 .byte 0x9
.byte \battler .byte \battler
.4byte \status1 .4byte \status1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_not_status battler, status1, param2 .macro if_not_status battler:req, status1:req, param2:req
.byte 0xa .byte 0xa
.byte \battler .byte \battler
.4byte \status1 .4byte \status1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_status2 battler, status2, param2 .macro if_status2 battler:req, status2:req, param2:req
.byte 0xb .byte 0xb
.byte \battler .byte \battler
.4byte \status2 .4byte \status2
.4byte \param2 .4byte \param2
.endm .endm
.macro if_not_status2 battler, status2, param2 .macro if_not_status2 battler:req, status2:req, param2:req
.byte 0xc .byte 0xc
.byte \battler .byte \battler
.4byte \status2 .4byte \status2
.4byte \param2 .4byte \param2
.endm .endm
.macro if_status3 battler, status3, param2 .macro if_status3 battler:req, status3:req, param2:req
.byte 0xd .byte 0xd
.byte \battler .byte \battler
.4byte \status3 .4byte \status3
.4byte \param2 .4byte \param2
.endm .endm
.macro if_not_status3 battler, status3, param2 .macro if_not_status3 battler:req, status3:req, param2:req
.byte 0xe .byte 0xe
.byte \battler .byte \battler
.4byte \status3 .4byte \status3
.4byte \param2 .4byte \param2
.endm .endm
.macro if_side_affecting battler, sidestatus, param2 .macro if_side_affecting battler:req, sidestatus:req, param2:req
.byte 0xf .byte 0xf
.byte \battler .byte \battler
.4byte \sidestatus .4byte \sidestatus
.4byte \param2 .4byte \param2
.endm .endm
.macro if_not_side_affecting battler, sidestatus, param2 .macro if_not_side_affecting battler:req, sidestatus:req, param2:req
.byte 0x10 .byte 0x10
.byte \battler .byte \battler
.4byte \sidestatus .4byte \sidestatus
.4byte \param2 .4byte \param2
.endm .endm
.macro if_less_than param0, param1 .macro if_less_than param0:req, param1:req
.byte 0x11 .byte 0x11
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_more_than param0, param1 .macro if_more_than param0:req, param1:req
.byte 0x12 .byte 0x12
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_equal param0, param1 .macro if_equal param0:req, param1:req
.byte 0x13 .byte 0x13
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_not_equal param0, param1 .macro if_not_equal param0:req, param1:req
.byte 0x14 .byte 0x14
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_less_than_ptr param0, param1 .macro if_less_than_ptr param0:req, param1:req
.byte 0x15 .byte 0x15
.4byte \param0 .4byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_more_than_ptr param0, param1 .macro if_more_than_ptr param0:req, param1:req
.byte 0x16 .byte 0x16
.4byte \param0 .4byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_equal_ptr param0, param1 .macro if_equal_ptr param0:req, param1:req
.byte 0x17 .byte 0x17
.4byte \param0 .4byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_not_equal_ptr param0, param1 .macro if_not_equal_ptr param0:req, param1:req
.byte 0x18 .byte 0x18
.4byte \param0 .4byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_move param0, param1 .macro if_move param0:req, param1:req
.byte 0x19 .byte 0x19
.2byte \param0 .2byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_not_move param0, param1 .macro if_not_move param0:req, param1:req
.byte 0x1a .byte 0x1a
.2byte \param0 .2byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_in_bytes param0, param1 .macro if_in_bytes param0:req, param1:req
.byte 0x1b .byte 0x1b
.4byte \param0 .4byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_not_in_bytes param0, param1 .macro if_not_in_bytes param0:req, param1:req
.byte 0x1c .byte 0x1c
.4byte \param0 .4byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_in_hwords param0, param1 .macro if_in_hwords param0:req, param1:req
.byte 0x1d .byte 0x1d
.4byte \param0 .4byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_not_in_hwords param0, param1 .macro if_not_in_hwords param0:req, param1:req
.byte 0x1e .byte 0x1e
.4byte \param0 .4byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_user_has_attacking_move param0 .macro if_user_has_attacking_move param0:req
.byte 0x1f .byte 0x1f
.4byte \param0 .4byte \param0
.endm .endm
.macro if_user_has_no_attacking_moves param0 .macro if_user_has_no_attacking_moves param0:req
.byte 0x20 .byte 0x20
.4byte \param0 .4byte \param0
.endm .endm
@@ -209,7 +209,7 @@
.byte 0x21 .byte 0x21
.endm .endm
.macro get_type param0 .macro get_type param0:req
.byte 0x22 .byte 0x22
.byte \param0 .byte \param0
.endm .endm
@@ -222,30 +222,30 @@
.byte 0x24 .byte 0x24
.endm .endm
.macro get_last_used_bank_move battler .macro get_last_used_bank_move battler:req
.byte 0x25 .byte 0x25
.byte \battler .byte \battler
.endm .endm
.macro if_equal_ param0, param1 .macro if_equal_ param0:req, param1:req
.byte 0x26 .byte 0x26
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_not_equal_ param0, param1 .macro if_not_equal_ param0:req, param1:req
.byte 0x27 .byte 0x27
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_user_goes param0, param1 .macro if_user_goes param0:req, param1:req
.byte 0x28 .byte 0x28
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_user_doesnt_go param0, param1 .macro if_user_doesnt_go param0:req, param1:req
.byte 0x29 .byte 0x29
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
@@ -259,7 +259,7 @@
.byte 0x2b .byte 0x2b
.endm .endm
.macro count_usable_party_mons battler .macro count_usable_party_mons battler:req
.byte 0x2c .byte 0x2c
.byte \battler .byte \battler
.endm .endm
@@ -272,7 +272,7 @@
.byte 0x2e .byte 0x2e
.endm .endm
.macro get_ability battler .macro get_ability battler:req
.byte 0x2f .byte 0x2f
.byte \battler .byte \battler
.endm .endm
@@ -281,7 +281,7 @@
.byte 0x30 .byte 0x30
.endm .endm
.macro if_type_effectiveness param0, param1 .macro if_type_effectiveness param0:req, param1:req
.byte 0x31 .byte 0x31
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
@@ -295,14 +295,14 @@
.byte 0x33 .byte 0x33
.endm .endm
.macro if_status_in_party battler, status1, param2 .macro if_status_in_party battler:req, status1:req, param2:req
.byte 0x34 .byte 0x34
.byte \battler .byte \battler
.4byte \status1 .4byte \status1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_status_not_in_party battler, status1, param2 .macro if_status_not_in_party battler:req, status1:req, param2:req
.byte 0x35 .byte 0x35
.byte \battler .byte \battler
.4byte \status1 .4byte \status1
@@ -313,19 +313,19 @@
.byte 0x36 .byte 0x36
.endm .endm
.macro if_effect param0, param1 .macro if_effect param0:req, param1:req
.byte 0x37 .byte 0x37
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_not_effect param0, param1 .macro if_not_effect param0:req, param1:req
.byte 0x38 .byte 0x38
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_stat_level_less_than battler, stat, param2, param3 .macro if_stat_level_less_than battler:req, stat:req, param2:req, param3:req
.byte 0x39 .byte 0x39
.byte \battler .byte \battler
.byte \stat .byte \stat
@@ -333,7 +333,7 @@
.4byte \param3 .4byte \param3
.endm .endm
.macro if_stat_level_more_than battler, stat, param2, param3 .macro if_stat_level_more_than battler:req, stat:req, param2:req, param3:req
.byte 0x3a .byte 0x3a
.byte \battler .byte \battler
.byte \stat .byte \stat
@@ -341,7 +341,7 @@
.4byte \param3 .4byte \param3
.endm .endm
.macro if_stat_level_equal battler, stat, param2, param3 .macro if_stat_level_equal battler:req, stat:req, param2:req, param3:req
.byte 0x3b .byte 0x3b
.byte \battler .byte \battler
.byte \stat .byte \stat
@@ -349,7 +349,7 @@
.4byte \param3 .4byte \param3
.endm .endm
.macro if_stat_level_not_equal battler, stat, param2, param3 .macro if_stat_level_not_equal battler:req, stat:req, param2:req, param3:req
.byte 0x3c .byte 0x3c
.byte \battler .byte \battler
.byte \stat .byte \stat
@@ -357,52 +357,52 @@
.4byte \param3 .4byte \param3
.endm .endm
.macro if_can_faint param0 .macro if_can_faint param0:req
.byte 0x3d .byte 0x3d
.4byte \param0 .4byte \param0
.endm .endm
.macro if_cant_faint param0 .macro if_cant_faint param0:req
.byte 0x3e .byte 0x3e
.4byte \param0 .4byte \param0
.endm .endm
.macro if_has_move battler, param1, param2 .macro if_has_move battler:req, param1:req, param2:req
.byte 0x3f .byte 0x3f
.byte \battler .byte \battler
.2byte \param1 .2byte \param1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_doesnt_have_move battler, param1, param2 .macro if_doesnt_have_move battler:req, param1:req, param2:req
.byte 0x40 .byte 0x40
.byte \battler .byte \battler
.2byte \param1 .2byte \param1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_has_move_with_effect battler, param1, param2 .macro if_has_move_with_effect battler:req, param1:req, param2:req
.byte 0x41 .byte 0x41
.byte \battler .byte \battler
.byte \param1 .byte \param1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_doesnt_have_move_with_effect battler, param1, param2 .macro if_doesnt_have_move_with_effect battler:req, param1:req, param2:req
.byte 0x42 .byte 0x42
.byte \battler .byte \battler
.byte \param1 .byte \param1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_any_move_disabled_or_encored battler, param1, param2 .macro if_any_move_disabled_or_encored battler:req, param1:req, param2:req
.byte 0x43 .byte 0x43
.byte \battler .byte \battler
.byte \param1 .byte \param1
.4byte \param2 .4byte \param2
.endm .endm
.macro if_curr_move_disabled_or_encored param0, param1 .macro if_curr_move_disabled_or_encored param0:req, param1:req
.byte 0x44 .byte 0x44
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
@@ -412,7 +412,7 @@
.byte 0x45 .byte 0x45
.endm .endm
.macro if_random_safari_flee param0 .macro if_random_safari_flee param0:req
.byte 0x46 .byte 0x46
.4byte \param0 .4byte \param0
.endm .endm
@@ -421,22 +421,22 @@
.byte 0x47 .byte 0x47
.endm .endm
.macro get_hold_effect battler .macro get_hold_effect battler:req
.byte 0x48 .byte 0x48
.byte \battler .byte \battler
.endm .endm
.macro get_gender battler .macro get_gender battler:req
.byte 0x49 .byte 0x49
.byte \battler .byte \battler
.endm .endm
.macro is_first_turn_for battler .macro is_first_turn_for battler:req
.byte 0x4a .byte 0x4a
.byte \battler .byte \battler
.endm .endm
.macro get_stockpile_count battler .macro get_stockpile_count battler:req
.byte 0x4b .byte 0x4b
.byte \battler .byte \battler
.endm .endm
@@ -445,7 +445,7 @@
.byte 0x4c .byte 0x4c
.endm .endm
.macro get_used_held_item battler .macro get_used_held_item battler:req
.byte 0x4d .byte 0x4d
.byte \battler .byte \battler
.endm .endm
@@ -462,7 +462,7 @@
.byte 0x50 .byte 0x50
.endm .endm
.macro get_protect_count battler .macro get_protect_count battler:req
.byte 0x51 .byte 0x51
.byte \battler .byte \battler
.endm .endm
@@ -491,12 +491,12 @@
.byte 0x57 .byte 0x57
.endm .endm
.macro call param0 .macro call param0:req
.byte 0x58 .byte 0x58
.4byte \param0 .4byte \param0
.endm .endm
.macro goto param0 .macro goto param0:req
.byte 0x59 .byte 0x59
.4byte \param0 .4byte \param0
.endm .endm
@@ -505,46 +505,46 @@
.byte 0x5a .byte 0x5a
.endm .endm
.macro if_level_cond param0, param1 .macro if_level_cond param0:req, param1:req
.byte 0x5b .byte 0x5b
.byte \param0 .byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro if_target_taunted param0 .macro if_target_taunted param0:req
.byte 0x5c .byte 0x5c
.4byte \param0 .4byte \param0
.endm .endm
.macro if_target_not_taunted param0 .macro if_target_not_taunted param0:req
.byte 0x5d .byte 0x5d
.4byte \param0 .4byte \param0
.endm .endm
.macro if_target_is_ally param0 .macro if_target_is_ally param0:req
.byte 0x5e .byte 0x5e
.4byte \param0 .4byte \param0
.endm .endm
.macro is_of_type battler, type .macro is_of_type battler:req, type:req
.byte 0x5f .byte 0x5f
.byte \battler .byte \battler
.byte \type .byte \type
.endm .endm
.macro check_ability battler, ability .macro check_ability battler:req, ability:req
.byte 0x60 .byte 0x60
.byte \battler .byte \battler
.byte \ability .byte \ability
.endm .endm
.macro if_flash_fired battler, param1 .macro if_flash_fired battler:req, param1:req
.byte 0x61 .byte 0x61
.byte \battler .byte \battler
.4byte \param1 .4byte \param1
.endm .endm
.macro if_holds_item battler, param1, param2 .macro if_holds_item battler:req, param1:req, param2:req
.byte 0x62 .byte 0x62
.byte \battler .byte \battler
.2byte \param1 .2byte \param1
@@ -572,48 +572,48 @@
get_type AI_TYPE2_TARGET get_type AI_TYPE2_TARGET
.endm .endm
.macro if_ability battler, ability, ptr .macro if_ability battler:req, ability:req, ptr:req
check_ability \battler, \ability check_ability \battler, \ability
if_equal 1, \ptr if_equal 1, \ptr
.endm .endm
.macro if_no_ability battler, ability, ptr .macro if_no_ability battler:req, ability:req, ptr:req
check_ability \battler, \ability check_ability \battler, \ability
if_equal 0, \ptr if_equal 0, \ptr
.endm .endm
.macro if_type battler, type, ptr .macro if_type battler:req, type:req, ptr:req
is_of_type \battler, \type is_of_type \battler, \type
if_equal 1, \ptr if_equal 1, \ptr
.endm .endm
.macro if_no_type battler, type, ptr .macro if_no_type battler:req, type:req, ptr:req
is_of_type \battler, \type is_of_type \battler, \type
if_equal 0, \ptr if_equal 0, \ptr
.endm .endm
.macro if_target_faster ptr .macro if_target_faster ptr:req
if_user_goes 1, \ptr if_user_goes 1, \ptr
.endm .endm
.macro if_user_faster ptr .macro if_user_faster ptr:req
if_user_goes 0, \ptr if_user_goes 0, \ptr
.endm .endm
.macro if_double_battle ptr .macro if_double_battle ptr:req
is_double_battle is_double_battle
if_equal 1, \ptr if_equal 1, \ptr
.endm .endm
.macro if_not_double_battle ptr .macro if_not_double_battle ptr:req
is_double_battle is_double_battle
if_equal 0, \ptr if_equal 0, \ptr
.endm .endm
.macro if_any_move_disabled battler, ptr .macro if_any_move_disabled battler:req, ptr:req
if_any_move_disabled_or_encored \battler, 0, \ptr if_any_move_disabled_or_encored \battler, 0, \ptr
.endm .endm
.macro if_any_move_encored battler, ptr .macro if_any_move_encored battler:req, ptr:req
if_any_move_disabled_or_encored \battler, 1, \ptr if_any_move_disabled_or_encored \battler, 1, \ptr
.endm .endm
asm/macros/battle_anim_script.inc
+56 -56
View File
@@ -1,16 +1,16 @@
@ commands @ commands
.macro loadspritegfx param0 .macro loadspritegfx tag:req
.byte 0x0 .byte 0x0
.2byte \param0 .2byte \tag
.endm .endm
.macro unloadspritegfx param0 .macro unloadspritegfx tag:req
.byte 0x1 .byte 0x1
.2byte \param0 .2byte \tag
.endm .endm
.macro createsprite template, anim_battler, subpriority_offset, argv:vararg .macro createsprite template:req, anim_battler:req, subpriority_offset:req, argv:vararg
.byte 0x02 .byte 0x02
.4byte \template .4byte \template
.if \anim_battler == ANIM_TARGET .if \anim_battler == ANIM_TARGET
@@ -24,7 +24,7 @@
.Lsprite_\@_2: .Lsprite_\@_2:
.endm .endm
.macro createvisualtask addr, priority, argv:vararg .macro createvisualtask addr:req, priority:req, argv:vararg
.byte 0x03 .byte 0x03
.4byte \addr .4byte \addr
.byte \priority .byte \priority
@@ -34,7 +34,7 @@
.Lcreatetask_\@_2: .Lcreatetask_\@_2:
.endm .endm
.macro delay param0 .macro delay param0:req
.byte 0x4 .byte 0x4
.byte \param0 .byte \param0
.endm .endm
@@ -55,22 +55,22 @@
.byte 0x8 .byte 0x8
.endm .endm
.macro playse param0 .macro playse se:req
.byte 0x9 .byte 0x9
.2byte \param0 .2byte \se
.endm .endm
.macro monbg battler .macro monbg battler:req
.byte 0xa .byte 0xa
.byte \battler .byte \battler
.endm .endm
.macro clearmonbg battler .macro clearmonbg battler:req
.byte 0xb .byte 0xb
.byte \battler .byte \battler
.endm .endm
.macro setalpha eva, evb .macro setalpha eva:req, evb:req
.byte 0x0C .byte 0x0C
.2byte ((\evb) << 8) | (\eva) .2byte ((\evb) << 8) | (\eva)
.endm .endm
@@ -79,7 +79,7 @@
.byte 0xd .byte 0xd
.endm .endm
.macro call param0 .macro call param0:req
.byte 0xe .byte 0xe
.4byte \param0 .4byte \param0
.endm .endm
@@ -88,32 +88,32 @@
.byte 0xf .byte 0xf
.endm .endm
.macro setarg param0, param1 .macro setarg param0:req, param1:req
.byte 0x10 .byte 0x10
.byte \param0 .byte \param0
.2byte \param1 .2byte \param1
.endm .endm
.macro choosetwoturnanim param0, param1 .macro choosetwoturnanim param0:req, param1:req
.byte 0x11 .byte 0x11
.4byte \param0 .4byte \param0
.4byte \param1 .4byte \param1
.endm .endm
.macro jumpifmoveturn param0, param1 .macro jumpifmoveturn param0:req, ptr:req
.byte 0x12 .byte 0x12
.byte \param0 .byte \param0
.4byte \param1 .4byte \ptr
.endm .endm
.macro goto param0 .macro goto ptr:req
.byte 0x13 .byte 0x13
.4byte \param0 .4byte \ptr
.endm .endm
.macro fadetobg param0 .macro fadetobg bg:req
.byte 0x14 .byte 0x14
.byte \param0 .byte \bg
.endm .endm
.macro restorebg .macro restorebg
@@ -128,52 +128,52 @@
.byte 0x17 .byte 0x17
.endm .endm
.macro changebg param0 .macro changebg bg:req
.byte 0x18 .byte 0x18
.byte \param0 .byte \bg
.endm .endm
.macro playsewithpan param0, param1 .macro playsewithpan se:req, pan:req
.byte 0x19 .byte 0x19
.2byte \param0 .2byte \se
.byte \param1 .byte \pan
.endm .endm
.macro setpan param0 .macro setpan pan:req
.byte 0x1a .byte 0x1a
.byte \param0 .byte \pan
.endm .endm
.macro panse_1B param0, param1, param2, param3, param4 .macro panse_1B se:req, param1:req, param2:req, param3:req, param4
.byte 0x1b .byte 0x1b
.2byte \param0 .2byte \se
.byte \param1 .byte \param1
.byte \param2 .byte \param2
.byte \param3 .byte \param3
.byte \param4 .byte \param4
.endm .endm
.macro loopsewithpan param0, param1, param2, param3 .macro loopsewithpan se:req, param1:req, param2:req, param3:req
.byte 0x1c .byte 0x1c
.2byte \param0 .2byte \se
.byte \param1 .byte \param1
.byte \param2 .byte \param2
.byte \param3 .byte \param3
.endm .endm
.macro waitplaysewithpan param0, param1, param2 .macro waitplaysewithpan se:req, param1:req, param2:req
.byte 0x1d .byte 0x1d
.2byte \param0 .2byte \se
.byte \param1 .byte \param1
.byte \param2 .byte \param2
.endm .endm
.macro setbldcnt param0 .macro setbldcnt param0:req
.byte 0x1e .byte 0x1e
.2byte \param0 .2byte \param0
.endm .endm
.macro createsoundtask addr, argv:vararg .macro createsoundtask addr:req, argv:vararg
.byte 0x1F .byte 0x1F
.4byte \addr .4byte \addr
.byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2 .byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2
@@ -186,54 +186,54 @@
.byte 0x20 .byte 0x20
.endm .endm
.macro jumpargeq param0, param1, param2 .macro jumpargeq param0:req, param1:req, ptr:req
.byte 0x21 .byte 0x21
.byte \param0 .byte \param0
.2byte \param1 .2byte \param1
.4byte \param2 .4byte \ptr
.endm .endm
.macro monbg_22 battler .macro monbg_22 battler:req
.byte 0x22 .byte 0x22
.byte \battler .byte \battler
.endm .endm
.macro clearmonbg_23 battler .macro clearmonbg_23 battler:req
.byte 0x23 .byte 0x23
.byte \battler .byte \battler
.endm .endm
.macro jumpifcontest param0 .macro jumpifcontest ptr:req
.byte 0x24 .byte 0x24
.4byte \param0 .4byte \ptr
.endm .endm
.macro fadetobgfromset param0, param1, param2 .macro fadetobgfromset param0:req, param1:req, param2:req
.byte 0x25 .byte 0x25
.byte \param0 .byte \param0
.byte \param1 .byte \param1
.byte \param2 .byte \param2
.endm .endm
.macro panse_26 param0, param1, param2, param3, param4 .macro panse_26 se:req, param1:req, param2:req, param3:req, param4
.byte 0x26 .byte 0x26
.2byte \param0 .2byte \se
.byte \param1 .byte \param1
.byte \param2 .byte \param2
.byte \param3 .byte \param3
.byte \param4 .byte \param4
.endm .endm
.macro panse_27 param0, param1, param2, param3, param4 .macro panse_27 se:req, param1:req, param2:req, param3:req, param4
.byte 0x27 .byte 0x27
.2byte \param0 .2byte \se
.byte \param1 .byte \param1
.byte \param2 .byte \param2
.byte \param3 .byte \param3
.byte \param4 .byte \param4
.endm .endm
.macro monbgprio_28 battler .macro monbgprio_28 battler:req
.byte 0x28 .byte 0x28
.byte \battler .byte \battler
.endm .endm
@@ -242,27 +242,27 @@
.byte 0x29 .byte 0x29
.endm .endm
.macro monbgprio_2A battler .macro monbgprio_2A battler:req
.byte 0x2a .byte 0x2a
.byte \battler .byte \battler
.endm .endm
.macro invisible battler .macro invisible battler:req
.byte 0x2b .byte 0x2b
.byte \battler .byte \battler
.endm .endm
.macro visible battler .macro visible battler:req
.byte 0x2c .byte 0x2c
.byte \battler .byte \battler
.endm .endm
.macro doublebattle_2D battler .macro doublebattle_2D battler:req
.byte 0x2d .byte 0x2d
.byte \battler .byte \battler
.endm .endm
.macro doublebattle_2E battler .macro doublebattle_2E battler:req
.byte 0x2e .byte 0x2e
.byte \battler .byte \battler
.endm .endm
@@ -272,14 +272,14 @@
.endm .endm
@ useful macros @ useful macros
.macro jumpreteq value, ptr .macro jumpreteq value:req, ptr:req
jumpargeq ARG_RET_ID, \value, \ptr jumpargeq ARG_RET_ID, \value, \ptr
.endm .endm
.macro jumprettrue ptr .macro jumprettrue ptr:req
jumpreteq TRUE, \ptr jumpreteq TRUE, \ptr
.endm .endm
.macro jumpretfalse ptr .macro jumpretfalse ptr:req
jumpreteq FALSE, \ptr jumpreteq FALSE, \ptr
.endm .endm
asm/macros/battle_script.inc
+219 -219
View File
File diff suppressed because it is too large Load Diff
asm/macros/event.inc
+185 -185
View File
File diff suppressed because it is too large Load Diff
include/event_object_movement.h
+2 -23
View File
@@ -19,7 +19,8 @@ enum SpinnerRunnerFollowPatterns
RUNFOLLOW_SOUTH_EAST_WEST RUNFOLLOW_SOUTH_EAST_WEST
}; };
struct UnkStruct_085094AC { struct UnkStruct_085094AC
{
const union AnimCmd *const *anims; const union AnimCmd *const *anims;
u8 animPos[4]; u8 animPos[4];
}; };
@@ -45,28 +46,6 @@ struct UnkStruct_085094AC {
#define GROUND_EFFECT_FLAG_HOT_SPRINGS (1 << 18) #define GROUND_EFFECT_FLAG_HOT_SPRINGS (1 << 18)
#define GROUND_EFFECT_FLAG_SEAWEED (1 << 19) #define GROUND_EFFECT_FLAG_SEAWEED (1 << 19)
#define movement_type_def(setup, table) \
static u8 setup##_callback(struct EventObject *, struct Sprite *);\
void setup(struct Sprite *sprite)\
{\
UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\
}\
static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\
{\
return table[sprite->data[1]](eventObject, sprite);\
}
#define movement_type_empty_callback(setup) \
static u8 setup##_callback(struct EventObject *, struct Sprite *);\
void setup(struct Sprite *sprite)\
{\
UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\
}\
static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\
{\
return 0;\
}
struct PairedPalettes struct PairedPalettes
{ {
u16 tag; u16 tag;
include/overworld.h
-7
View File
@@ -47,13 +47,8 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType);
const struct MapLayout *GetMapLayout(void); const struct MapLayout *GetMapLayout(void);
void ApplyCurrentWarp(void); void ApplyCurrentWarp(void);
void set_warp2_warp3_to_neg_1(void); void set_warp2_warp3_to_neg_1(void);
static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
static bool32 IsDummyWarp(struct WarpData *warp);
struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum);
struct MapHeader const *const GetDestinationWarpMapHeader(void); struct MapHeader const *const GetDestinationWarpMapHeader(void);
static void LoadCurrentMapData(void);
static void LoadSaveblockMapHeader(void);
static void SetPlayerCoordsFromWarp(void);
void WarpIntoMap(void); void WarpIntoMap(void);
void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId); void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId);
@@ -67,7 +62,6 @@ void sub_8084D5C(s16 a1, s16 a2);
void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void sub_8084E14(void); void sub_8084E14(void);
void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
static void SetFixedDiveWarpAsDestination(void);
void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void SetFixedHoleWarpAsDestination(s16 x, s16 y); void SetFixedHoleWarpAsDestination(s16 x, s16 y);
void warp1_set_to_sav1w(void); void warp1_set_to_sav1w(void);
@@ -75,7 +69,6 @@ void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void sub_8084F6C(u8 a1); void sub_8084F6C(u8 a1);
void sub_8084FAC(int unused); void sub_8084FAC(int unused);
const struct MapConnection *GetMapConnection(u8 dir); const struct MapConnection *GetMapConnection(u8 dir);
static bool8 SetDiveWarp(u8 dir, u16 x, u16 y);
bool8 SetDiveWarpEmerge(u16 x, u16 y); bool8 SetDiveWarpEmerge(u16 x, u16 y);
bool8 SetDiveWarpDive(u16 x, u16 y); bool8 SetDiveWarpDive(u16 x, u16 y);
void mliX_load_map(u8 mapGroup, u8 mapNum); void mliX_load_map(u8 mapGroup, u8 mapNum);
include/string_util.h
-1
View File
@@ -39,7 +39,6 @@ u8 *WriteColorChangeControlCode(u8 *dest, u32 colorType, u8 color);
bool32 IsStringJapanese(u8 *str); bool32 IsStringJapanese(u8 *str);
bool32 sub_800924C(u8 *str, s32 n); bool32 sub_800924C(u8 *str, s32 n);
u8 GetExtCtrlCodeLength(u8 code); u8 GetExtCtrlCodeLength(u8 code);
static const u8 *SkipExtCtrlCode(const u8 *s);
s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2); s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2);
void ConvertInternationalString(u8 *s, u8 language); void ConvertInternationalString(u8 *s, u8 language);
void StripExtCtrlCodes(u8 *str); void StripExtCtrlCodes(u8 *str);
src/data/items.h
+7 -7
View File
@@ -5961,7 +5961,7 @@ const struct Item gItems[] =
.battleUseFunc = NULL, .battleUseFunc = NULL,
.secondaryId = 0, .secondaryId = 0,
}, },
{ {
.name = _("MYSTICTICKET"), .name = _("MYSTICTICKET"),
.itemId = ITEM_MYSTIC_TICKET, .itemId = ITEM_MYSTIC_TICKET,
.price = 0, .price = 0,
@@ -5977,7 +5977,7 @@ const struct Item gItems[] =
.battleUseFunc = NULL, .battleUseFunc = NULL,
.secondaryId = 0, .secondaryId = 0,
}, },
{ {
.name = _("AURORATICKET"), .name = _("AURORATICKET"),
.itemId = ITEM_AURORA_TICKET, .itemId = ITEM_AURORA_TICKET,
.price = 0, .price = 0,
@@ -5993,7 +5993,7 @@ const struct Item gItems[] =
.battleUseFunc = NULL, .battleUseFunc = NULL,
.secondaryId = 0, .secondaryId = 0,
}, },
{ {
.name = _("POWDER JAR"), .name = _("POWDER JAR"),
.itemId = ITEM_POWDER_JAR, .itemId = ITEM_POWDER_JAR,
.price = 0, .price = 0,
@@ -6009,7 +6009,7 @@ const struct Item gItems[] =
.battleUseFunc = NULL, .battleUseFunc = NULL,
.secondaryId = 0, .secondaryId = 0,
}, },
{ {
.name = _("RUBY"), .name = _("RUBY"),
.itemId = ITEM_RUBY, .itemId = ITEM_RUBY,
.price = 0, .price = 0,
@@ -6025,7 +6025,7 @@ const struct Item gItems[] =
.battleUseFunc = NULL, .battleUseFunc = NULL,
.secondaryId = 0, .secondaryId = 0,
}, },
{ {
.name = _("SAPPHIRE"), .name = _("SAPPHIRE"),
.itemId = ITEM_SAPPHIRE, .itemId = ITEM_SAPPHIRE,
.price = 0, .price = 0,
@@ -6044,7 +6044,7 @@ const struct Item gItems[] =
//Emerald-specific key items //Emerald-specific key items
{ {
.name = _("MAGMA EMBLEM"), .name = _("MAGMA EMBLEM"),
.itemId = ITEM_MAGMA_EMBLEM, .itemId = ITEM_MAGMA_EMBLEM,
.price = 0, .price = 0,
@@ -6060,7 +6060,7 @@ const struct Item gItems[] =
.battleUseFunc = NULL, .battleUseFunc = NULL,
.secondaryId = 0, .secondaryId = 0,
}, },
{ {
.name = _("OLD SEA MAP"), .name = _("OLD SEA MAP"),
.itemId = ITEM_OLD_SEA_MAP, .itemId = ITEM_OLD_SEA_MAP,
.price = 0, .price = 0,
src/event_object_movement.c
+22
View File
@@ -27,6 +27,28 @@
// this file was known as evobjmv.c in Game Freak's original source // this file was known as evobjmv.c in Game Freak's original source
#define movement_type_def(setup, table) \
static u8 setup##_callback(struct EventObject *, struct Sprite *);\
void setup(struct Sprite *sprite)\
{\
UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\
}\
static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\
{\
return table[sprite->data[1]](eventObject, sprite);\
}
#define movement_type_empty_callback(setup) \
static u8 setup##_callback(struct EventObject *, struct Sprite *);\
void setup(struct Sprite *sprite)\
{\
UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\
}\
static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\
{\
return 0;\
}
EWRAM_DATA u8 sCurrentReflectionType = 0; EWRAM_DATA u8 sCurrentReflectionType = 0;
EWRAM_DATA u16 sCurrentSpecialObjectPaletteTag = 0; EWRAM_DATA u16 sCurrentSpecialObjectPaletteTag = 0;
EWRAM_DATA struct LockedAnimEventObjects *gLockedAnimEventObjects = {0}; EWRAM_DATA struct LockedAnimEventObjects *gLockedAnimEventObjects = {0};