<!DOCTYPE html>
<html lang='en'>
<head>
<title>pokered-fr - Pokémon Rouge et Bleue (Français)</title>
<meta name='generator' content='cgit v1.2.3'/>
<meta name='robots' content='index, nofollow'/>
<link rel='stylesheet' type='text/css' href='/cgit.css'/>
<link rel='shortcut icon' href='/favicon.ico'/>
<link rel='alternate' title='Atom feed' href='http://git.poke.blue/pokered-fr/atom/constants/misc_constants.asm?h=adding-pokemon' type='application/atom+xml'/>
<link rel='vcs-git' href='https://github.com/einstein95/pokered-fr' title='pokered-fr Git repository'/>
</head>
<body>
<div id='cgit'><table id='header'>
<tr>
<td class='logo' rowspan='2'><a href='/'><img src='/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/'>index</a> : <a title='pokered-fr' href='/pokered-fr/'>pokered-fr</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='e25a7148d0a78549de4f33fa72d519dcaf660e97'/><select name='h' onchange='this.form.submit();'>
<option value='adding-pokemon' selected='selected'>adding-pokemon</option>
<option value='master'>master</option>
<option value='pokedex-order'>pokedex-order</option>
<option value='rgbgfx'>rgbgfx</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Pokémon Rouge et Bleue (Français)</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/pokered-fr/?h=adding-pokemon'>summary</a><a href='/pokered-fr/refs/?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>refs</a><a href='/pokered-fr/log/constants/misc_constants.asm?h=adding-pokemon'>log</a><a href='/pokered-fr/tree/constants/misc_constants.asm?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>tree</a><a class='active' href='/pokered-fr/commit/constants/misc_constants.asm?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>commit</a><a href='/pokered-fr/diff/constants/misc_constants.asm?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>diff</a></td><td class='form'><form class='right' method='get' action='/pokered-fr/log/constants/misc_constants.asm'>
<input type='hidden' name='h' value='adding-pokemon'/><input type='hidden' name='id' value='e25a7148d0a78549de4f33fa72d519dcaf660e97'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/pokered-fr/commit/?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>root</a>/<a href='/pokered-fr/commit/constants?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>constants</a>/<a href='/pokered-fr/commit/constants/misc_constants.asm?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>misc_constants.asm</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='adding-pokemon'/><input type='hidden' name='id' value='e25a7148d0a78549de4f33fa72d519dcaf660e97'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>dannye &lt;corrnondacqb@yahoo.com&gt;</td><td class='right'>2015-07-14 00:58:09 -0500</td></tr>
<tr><th>committer</th><td>dannye &lt;corrnondacqb@yahoo.com&gt;</td><td class='right'>2015-07-14 00:58:09 -0500</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/pokered-fr/commit/constants/misc_constants.asm?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>e25a7148d0a78549de4f33fa72d519dcaf660e97</a> (<a href='/pokered-fr/patch/constants/misc_constants.asm?id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/pokered-fr/tree/?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>5fcc95934c26b1fc86345b10f2a5c80fa740d083</a> /<a href='/pokered-fr/tree/constants/misc_constants.asm?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>constants/misc_constants.asm</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/pokered-fr/commit/constants/misc_constants.asm?h=adding-pokemon&amp;id=b509b48a7f5a9a80225b9c030d7334b26b521c62'>b509b48a7f5a9a80225b9c030d7334b26b521c62</a> (<a href='/pokered-fr/diff/constants/misc_constants.asm?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97&amp;id2=b509b48a7f5a9a80225b9c030d7334b26b521c62'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='sha1'><a href='/pokered-fr/commit/constants/misc_constants.asm?h=adding-pokemon&amp;id=5d3b958763d48e6049e13b068d2f2d5382cdcad2'>5d3b958763d48e6049e13b068d2f2d5382cdcad2</a> (<a href='/pokered-fr/diff/constants/misc_constants.asm?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97&amp;id2=5d3b958763d48e6049e13b068d2f2d5382cdcad2'>diff</a>)</td></tr></table>
<div class='commit-subject'>Merge branch 'master' of https://github.com/YamaArashi/pokered</div><div class='commit-msg'>Conflicts:
	engine/town_map.asm
</div><div class='diffstat-header'><a href='/pokered-fr/diff/?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>Diffstat</a> (limited to 'constants/misc_constants.asm')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/pokered-fr/diff/constants/misc_constants.asm?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>constants/misc_constants.asm</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='51%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 51 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm<br/>index 3452a393..eca97408 100644<br/>--- a/<a href='/pokered-fr/tree/constants/misc_constants.asm?h=adding-pokemon&amp;id=b509b48a7f5a9a80225b9c030d7334b26b521c62'>constants/misc_constants.asm</a><br/>+++ b/<a href='/pokered-fr/tree/constants/misc_constants.asm?h=adding-pokemon&amp;id=e25a7148d0a78549de4f33fa72d519dcaf660e97'>constants/misc_constants.asm</a></div><div class='hunk'>@@ -58,6 +58,57 @@ TRADE_CANCEL_MENU EQU 5</div><div class='ctx'> HEAL_CANCEL_MENU  EQU 6</div><div class='ctx'> NO_YES_MENU       EQU 7</div><div class='ctx'> </div><div class='add'>+; menu exit method constants for list menus and the buy/sell/quit menu</div><div class='add'>+CHOSE_MENU_ITEM   EQU 1 ; pressed A</div><div class='add'>+CANCELLED_MENU    EQU 2 ; pressed B</div><div class='add'>+</div><div class='add'>+; menu exit method constants for two-option menus</div><div class='add'>+CHOSE_FIRST_ITEM  EQU 1</div><div class='add'>+CHOSE_SECOND_ITEM EQU 2</div><div class='add'>+</div><div class='add'>+; move mon constants</div><div class='add'>+BOX_TO_PARTY     EQU 0</div><div class='add'>+PARTY_TO_BOX     EQU 1</div><div class='add'>+DAYCARE_TO_PARTY EQU 2</div><div class='add'>+PARTY_TO_DAYCARE EQU 3</div><div class='add'>+</div><div class='add'>+; emotion bubbles</div><div class='add'>+EXCLAMATION_BUBBLE EQU 0</div><div class='add'>+QUESTION_BUBBLE    EQU 1</div><div class='add'>+SMILE_BUBBLE       EQU 2</div><div class='add'>+</div><div class='add'>+; slot symbols</div><div class='add'>+SLOTS7		EQU $0200</div><div class='add'>+SLOTSBAR	EQU $0604</div><div class='add'>+SLOTSCHERRY	EQU $0A08</div><div class='add'>+SLOTSFISH	EQU $0E0C</div><div class='add'>+SLOTSBIRD	EQU $1210</div><div class='add'>+SLOTSMOUSE	EQU $1614</div><div class='add'>+</div><div class='add'>+; party menu types</div><div class='add'>+NORMAL_PARTY_MENU    EQU 0</div><div class='add'>+USE_ITEM_PARTY_MENU  EQU 1</div><div class='add'>+BATTLE_PARTY_MENU    EQU 2</div><div class='add'>+TMHM_PARTY_MENU      EQU 3</div><div class='add'>+SWAP_MONS_PARTY_MENU EQU 4</div><div class='add'>+EVO_STONE_PARTY_MENU EQU 5</div><div class='add'>+</div><div class='add'>+; party memu message IDs</div><div class='add'>+ANTIDOTE_MSG     EQU $F0</div><div class='add'>+BURN_HEAL_MSG    EQU $F1</div><div class='add'>+ICE_HEAL_MSG     EQU $F2</div><div class='add'>+AWAKENING_MSG    EQU $F3</div><div class='add'>+PARALYZ_HEAL_MSG EQU $F4</div><div class='add'>+POTION_MSG       EQU $F5</div><div class='add'>+FULL_HEAL_MSG    EQU $F6</div><div class='add'>+REVIVE_MSG       EQU $F7</div><div class='add'>+RARE_CANDY_MSG   EQU $F8</div><div class='add'>+</div><div class='add'>+; naming screen types</div><div class='add'>+NAME_PLAYER_SCREEN EQU 0</div><div class='add'>+NAME_RIVAL_SCREEN  EQU 1</div><div class='add'>+NAME_MON_SCREEN    EQU 2</div><div class='add'>+</div><div class='ctx'> ; serial</div><div class='ctx'> </div><div class='ctx'> ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01</div></td></tr></table></div> <!-- class=content -->
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.2.3</a> (<a href='https://git-scm.com/'>git 2.25.1</a>) at 2025-08-10 01:26:34 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>
