Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update event macro comments #1558

Merged
merged 22 commits into from
Nov 23, 2021
Merged

Update event macro comments #1558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f85de6e
Start event macro comment updates
GriffinRichards Aug 5, 2021
65d3b58
Add PARTY_NOTHING_CHOSEN
GriffinRichards Nov 15, 2021
c113059
Drop some overworld prefixes
GriffinRichards Nov 15, 2021
04cc923
Handle optional arguments for warp commands, add WARP_ID_NONE
GriffinRichards Nov 15, 2021
63c5905
Continue updating event macro comments
GriffinRichards Nov 16, 2021
5d9c31a
Label slot machine ids, fix GetPriceReduction
GriffinRichards Nov 16, 2021
d414787
Some TV clean-up
GriffinRichards Nov 16, 2021
61aa9c3
More updating event macro comments
GriffinRichards Nov 16, 2021
eb95ac0
Document field_tasks
GriffinRichards Nov 17, 2021
c1970a4
Remove dead sub references
GriffinRichards Nov 17, 2021
700425e
Index sMapHealLocations
GriffinRichards Nov 17, 2021
c940b67
Continue macro comment updating
GriffinRichards Nov 17, 2021
c4f8f4d
Add STR_VAR_# ids to string buffer macros
GriffinRichards Nov 18, 2021
b9fa18b
Merge branch 'master' of https://github.com/GriffinRichards/pokeemera…
GriffinRichards Nov 18, 2021
1b35f9a
Use specific name limits for string limit functions
GriffinRichards Nov 18, 2021
b5b5d95
Distinguish 'virtual object' names from object events
GriffinRichards Nov 18, 2021
c89dfd9
Finish updating macro comments
GriffinRichards Nov 18, 2021
591ab72
Macro comment typo fix, Object->object
GriffinRichards Nov 18, 2021
6c6487d
Missing spaces to tabs in scripts files
GriffinRichards Nov 19, 2021
c57efdb
Allow compare + goto_if/call_if as a single statement
GriffinRichards Nov 19, 2021
e66ea0c
Reformat compare + goto_if/call_if to single statements
GriffinRichards Nov 19, 2021
42a83ee
Use STR_VAR names for apprentice_buff and frontier_gettrainername
GriffinRichards Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 10 additions & 10 deletions asm/macros/battle_ai_script.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,11 @@
.4byte \param1
.endm

.macro nullsub_2A
.macro nop_2A
.byte 0x2a
.endm

.macro nullsub_2B
.macro nop_2B
.byte 0x2b
.endm

Expand Down Expand Up @@ -287,11 +287,11 @@
.4byte \param1
.endm

.macro nullsub_32
.macro nop_32
.byte 0x32
.endm

.macro nullsub_33
.macro nop_33
.byte 0x33
.endm

Expand Down Expand Up @@ -467,27 +467,27 @@
.byte \battler
.endm

.macro nullsub_52
.macro nop_52
.byte 0x52
.endm

.macro nullsub_53
.macro nop_53
.byte 0x53
.endm

.macro nullsub_54
.macro nop_54
.byte 0x54
.endm

.macro nullsub_55
.macro nop_55
.byte 0x55
.endm

.macro nullsub_56
.macro nop_56
.byte 0x56
.endm

.macro nullsub_57
.macro nop_57
.byte 0x57
.endm

Expand Down
14 changes: 11 additions & 3 deletions asm/macros/battle_frontier/apprentice.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,19 @@
@ Buffer some APPRENTICE_BUFF_* string to the given stringvar (0 for STR_VAR_1, 1 for STR_VAR_2, 2 for STR_VAR_3)
.macro apprentice_buff stringvar:req, tobuff:req
setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
setvar VAR_0x8005, \stringvar
.if \stringvar == STR_VAR_1
setvar VAR_0x8005, 0
.elseif \stringvar == STR_VAR_2
setvar VAR_0x8005, 1
.elseif \stringvar == STR_VAR_3
setvar VAR_0x8005, 2
.else
setvar VAR_0x8005, \stringvar
.endif
.if \tobuff >= VARS_START
copyvar VAR_0x8006, \tobuff
copyvar VAR_0x8006, \tobuff
.else
setvar VAR_0x8006, \tobuff
setvar VAR_0x8006, \tobuff
.endif
special CallApprenticeFunction
.endm
Expand Down
8 changes: 7 additions & 1 deletion asm/macros/battle_frontier/frontier_util.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,13 @@
@ Buffer the name of gTrainerBattleOpponent_A in STR_VAR_1 (0) or STR_VAR_2 (1)
.macro frontier_gettrainername stringVar:req
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME
setvar VAR_0x8005, \stringVar
.if \stringVar == STR_VAR_1
setvar VAR_0x8005, 0
.elseif \stringVar == STR_VAR_2
setvar VAR_0x8005, 1
.else
setvar VAR_0x8005, \stringVar
.endif
special CallFrontierUtilFunc
.endm

Expand Down
Loading